Browse Source

UploadPackTest: Fix unused parameter in checkUnadvertisedIfUnallowed

Change-Id: I6042c401fff55325128d47e7e9098fc7e60d501d
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
stable-5.6
David Pursehouse 5 years ago
parent
commit
f2ccc42132
  1. 18
      org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java

18
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java

@ -462,7 +462,9 @@ public class UploadPackTest {
assertThat(lines, containsInAnyOrder("ls-refs", "fetch", "server-option")); assertThat(lines, containsInAnyOrder("ls-refs", "fetch", "server-option"));
} }
private void checkUnadvertisedIfUnallowed(String fetchCapability) throws Exception { private void checkUnadvertisedIfUnallowed(String configSection,
String configName, String fetchCapability) throws Exception {
server.getConfig().setBoolean(configSection, null, configName, false);
ByteArrayInputStream recvStream = ByteArrayInputStream recvStream =
uploadPackV2Setup(null, PacketLineIn.end()); uploadPackV2Setup(null, PacketLineIn.end());
PacketLineIn pckIn = new PacketLineIn(recvStream); PacketLineIn pckIn = new PacketLineIn(recvStream);
@ -473,9 +475,9 @@ public class UploadPackTest {
String line; String line;
while (!PacketLineIn.isEnd((line = pckIn.readString()))) { while (!PacketLineIn.isEnd((line = pckIn.readString()))) {
if (line.startsWith("fetch=")) { if (line.startsWith("fetch=")) {
assertThat( List<String> fetchItems = Arrays.asList(line.substring(6).split(" "));
Arrays.asList(line.substring(6).split(" ")), assertThat(fetchItems, hasItems("shallow"));
hasItems("shallow")); assertFalse(fetchItems.contains(fetchCapability));
lines.add("fetch"); lines.add("fetch");
} else { } else {
lines.add(line); lines.add(line);
@ -487,7 +489,7 @@ public class UploadPackTest {
@Test @Test
public void testV2CapabilitiesAllowFilter() throws Exception { public void testV2CapabilitiesAllowFilter() throws Exception {
checkAdvertisedIfAllowed("uploadpack", "allowfilter", "filter"); checkAdvertisedIfAllowed("uploadpack", "allowfilter", "filter");
checkUnadvertisedIfUnallowed("filter"); checkUnadvertisedIfUnallowed("uploadpack", "allowfilter", "filter");
} }
@Test @Test
@ -497,7 +499,8 @@ public class UploadPackTest {
@Test @Test
public void testV2CapabilitiesRefInWantNotAdvertisedIfUnallowed() throws Exception { public void testV2CapabilitiesRefInWantNotAdvertisedIfUnallowed() throws Exception {
checkUnadvertisedIfUnallowed("ref-in-want"); checkUnadvertisedIfUnallowed("uploadpack", "allowrefinwant",
"ref-in-want");
} }
@Test @Test
@ -506,7 +509,8 @@ public class UploadPackTest {
true); true);
checkAdvertisedIfAllowed("uploadpack", "advertisesidebandall", checkAdvertisedIfAllowed("uploadpack", "advertisesidebandall",
"sideband-all"); "sideband-all");
checkUnadvertisedIfUnallowed("sideband-all"); checkUnadvertisedIfUnallowed("uploadpack", "advertisesidebandall",
"sideband-all");
} }
@Test @Test

Loading…
Cancel
Save