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>

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackReachabilityTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackReachabilityTest.java
index 1a855d1d9beddcd000ec1166e945477fdccc20f2..7122082d813cd44593718bb38cbc1fcd94f99ee3 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackReachabilityTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackReachabilityTest.java
@@ -63,7 +63,6 @@ import org.eclipse.jgit.transport.UploadPack.RequestPolicy;
 import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
 import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
 import org.eclipse.jgit.transport.resolver.UploadPackFactory;
-import org.hamcrest.Matchers;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -189,11 +188,11 @@ public class UploadPackReachabilityTest {
                assertFalse(client.getObjectDatabase().has(blob.toObjectId()));
 
                try (Transport tn = testProtocol.open(uri, client, "server")) {
-                       thrown.expect(TransportException.class);
-                       thrown.expectMessage(Matchers
-                                       .containsString("want " + blob.name() + " not valid"));
+                       TransportException e = assertThrows(TransportException.class, () ->
                        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 class UploadPackReachabilityTest {
                assertFalse(client.getObjectDatabase().has(commit.toObjectId()));
 
                try (Transport tn = testProtocol.open(uri, client, "server")) {
-                       thrown.expect(TransportException.class);
-                       thrown.expectMessage(Matchers
-                                       .containsString("want " + commit.name() + " not valid"));
-                       tn.fetch(NullProgressMonitor.INSTANCE,
-                                       Collections.singletonList(new RefSpec(commit.name())));
+                       TransportException e = assertThrows(TransportException.class,
+                                       () -> tn.fetch(NullProgressMonitor.INSTANCE,
+                                       Collections.singletonList(new RefSpec(commit.name()))));
+                       assertThat(e.getMessage(),
+                                       containsString("want " + commit.name() + " not valid"));
                }
        }
 
@@ -285,11 +284,11 @@ public class UploadPackReachabilityTest {
                assertFalse(client.getObjectDatabase().has(commit.toObjectId()));
 
                try (Transport tn = testProtocol.open(uri, client, "server")) {
-                       thrown.expect(TransportException.class);
-                       thrown.expectMessage(Matchers
-                                       .containsString("want " + commit.name() + " not valid"));
-                       tn.fetch(NullProgressMonitor.INSTANCE,
-                                       Collections.singletonList(new RefSpec(commit.name())));
+                       TransportException e = assertThrows(TransportException.class,
+                                       () -> tn.fetch(NullProgressMonitor.INSTANCE, Collections
+                                                       .singletonList(new RefSpec(commit.name()))));
+                       assertThat(e.getMessage(),
+                                       containsString("want " + commit.name() + " not valid"));
                }
        }