motiejus
/
jgit
1
Fork 0
Code Releases Activity

UploadPackReachabilityTest: Use assertThrows instead of thrown 

In https://git.eclipse.org/r/c/144009/ UploadPack tests moved from
thrown to assertThrows, but newly introduced tests are still using
the thrown.

Update test so all of them use assertThrows.

Change-Id: I0ff19a6f8ba9e978d8ffc7a912c0572d9f00c7fa
Signed-off-by: Ivan Frade <ifrade@google.com>
This commit is contained in:
Ivan Frade 2019-09-18 14:38:37 -07:00
parent 208ddab5ab
commit 83a6145f2f
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackReachabilityTest.java
View File

@ -63,7 +63,6 @@
import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException; import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
import org.eclipse.jgit.transport.resolver.UploadPackFactory; import org.eclipse.jgit.transport.resolver.UploadPackFactory;
import org.hamcrest.Matchers;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
@ -189,11 +188,11 @@ public void testFetchUnreachableBlobWithoutBitmap() throws Exception {
assertFalse(client.getObjectDatabase().has(blob.toObjectId())); assertFalse(client.getObjectDatabase().has(blob.toObjectId()));
try (Transport tn = testProtocol.open(uri, client, "server")) { try (Transport tn = testProtocol.open(uri, client, "server")) {
thrown.expect(TransportException.class); TransportException e = assertThrows(TransportException.class, () ->
thrown.expectMessage(Matchers
.containsString("want " + blob.name() + " not valid"));
tn.fetch(NullProgressMonitor.INSTANCE, tn.fetch(NullProgressMonitor.INSTANCE,
Collections.singletonList(new RefSpec(blob.name()))); Collections.singletonList(new RefSpec(blob.name()))));
assertThat(e.getMessage(),
containsString("want " + blob.name() + " not valid"));
} }
} }
@ -266,11 +265,11 @@ public void testFetchUnreachableCommitWithBitmap() throws Exception {
assertFalse(client.getObjectDatabase().has(commit.toObjectId())); assertFalse(client.getObjectDatabase().has(commit.toObjectId()));
try (Transport tn = testProtocol.open(uri, client, "server")) { try (Transport tn = testProtocol.open(uri, client, "server")) {
thrown.expect(TransportException.class); TransportException e = assertThrows(TransportException.class,
thrown.expectMessage(Matchers () -> tn.fetch(NullProgressMonitor.INSTANCE,
.containsString("want " + commit.name() + " not valid")); Collections.singletonList(new RefSpec(commit.name()))));
tn.fetch(NullProgressMonitor.INSTANCE, assertThat(e.getMessage(),
Collections.singletonList(new RefSpec(commit.name()))); containsString("want " + commit.name() + " not valid"));
} }
} }
@ -285,11 +284,11 @@ public void testFetchUnreachableCommitWithoutBitmap() throws Exception {
assertFalse(client.getObjectDatabase().has(commit.toObjectId())); assertFalse(client.getObjectDatabase().has(commit.toObjectId()));
try (Transport tn = testProtocol.open(uri, client, "server")) { try (Transport tn = testProtocol.open(uri, client, "server")) {
thrown.expect(TransportException.class); TransportException e = assertThrows(TransportException.class,
thrown.expectMessage(Matchers () -> tn.fetch(NullProgressMonitor.INSTANCE, Collections
.containsString("want " + commit.name() + " not valid")); .singletonList(new RefSpec(commit.name()))));
tn.fetch(NullProgressMonitor.INSTANCE, assertThat(e.getMessage(),
Collections.singletonList(new RefSpec(commit.name()))); containsString("want " + commit.name() + " not valid"));
} }
} }