motiejus
/
jgit
1
Fork 0
Code Releases Activity

ProtocolV2ParserTest: Fix incorrect usage of ExpectedException 

There should only be one statement after the expect(...) method.

Any additional statements after the statement that is expected to
throw will never be executed in a passing test. This can lead to
inappropriately passing tests where later incorrect assertions are
skipped by the thrown exception.

See https://errorprone.info/bugpattern/ExpectedExceptionChecker

Change-Id: I0d6350fafb281b6bdb04289f4cd5eb4bb159628b
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2018-09-22 19:28:50 +09:00
parent c0f89747b6
commit 0717639485
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ProtocolV2ParserTest.java
View File

@ -264,25 +264,26 @@ public void testFetchWithBlobSizeFilter() throws IOException {
@Test
public void testFetchMustNotHaveMultipleFilters() throws IOException {
thrown.expect(PackProtocolException.class);
PacketLineIn pckIn = formatAsPacketLine(PacketLineIn.DELIM,
"filter blob:none",
"filter blob:limit=12",
PacketLineIn.END);
ProtocolV2Parser parser = new ProtocolV2Parser(
ConfigBuilder.start().allowFilter().done());
FetchV2Request request = parser.parseFetchRequest(pckIn,
thrown.expect(PackProtocolException.class);
parser.parseFetchRequest(pckIn,
testRepo.getRepository().getRefDatabase());
assertEquals(0, request.getFilterBlobLimit());
}
@Test
public void testFetchFilterWithoutAllowFilter() throws IOException {
thrown.expect(PackProtocolException.class);
PacketLineIn pckIn = formatAsPacketLine(PacketLineIn.DELIM,
"filter blob:limit=12", PacketLineIn.END);
ProtocolV2Parser parser = new ProtocolV2Parser(
ConfigBuilder.getDefault());
thrown.expect(PackProtocolException.class);
parser.parseFetchRequest(pckIn,
testRepo.getRepository().getRefDatabase());
}
@ -315,9 +316,6 @@ public void testFetchWithRefInWant() throws Exception {
@Test
public void testFetchWithRefInWantUnknownRef() throws Exception {
thrown.expect(PackProtocolException.class);
thrown.expectMessage(containsString("refs/heads/branchC"));
PacketLineIn pckIn = formatAsPacketLine(PacketLineIn.DELIM,
"want e4980cdc48cfa1301493ca94eb70523f6788b819",
"want-ref refs/heads/branchC",
@ -330,6 +328,8 @@ public void testFetchWithRefInWantUnknownRef() throws Exception {
testRepo.update("branchA", one);
testRepo.update("branchB", two);
thrown.expect(PackProtocolException.class);
thrown.expectMessage(containsString("refs/heads/branchC"));
parser.parseFetchRequest(pckIn,
testRepo.getRepository().getRefDatabase());
}