Minor unification of tests.

2 files changed, 7 insertions, 9 deletions

diff --git a/jaxrs_client_utils/src/test/java/com/yahoo/vespa/jaxrs/client/HttpPatchTest.java b/jaxrs_client_utils/src/test/java/com/yahoo/vespa/jaxrs/client/HttpPatchTest.java
index 8161602cdac..3270ac0141e 100644
--- a/jaxrs_client_utils/src/test/java/com/yahoo/vespa/jaxrs/client/HttpPatchTest.java
+++ b/jaxrs_client_utils/src/test/java/com/yahoo/vespa/jaxrs/client/HttpPatchTest.java
@@ -21,8 +21,7 @@ import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author bakksjo
@@ -57,8 +56,8 @@ public class HttpPatchTest extends JerseyTest {
         final Response response = target(TestResourceApi.PATH)
                 .request()
                 .method("PATCH", Entity.text(REQUEST_BODY));
-        assertThat(testResourceSingleton.invocation.get(60, TimeUnit.SECONDS), is(REQUEST_BODY));
-        assertThat(response.readEntity(String.class), is(REQUEST_BODY));
+        assertEquals(REQUEST_BODY, testResourceSingleton.invocation.get(60, TimeUnit.SECONDS));
+        assertEquals(REQUEST_BODY, response.readEntity(String.class));
     }
 
     @Test
@@ -76,8 +75,8 @@ public class HttpPatchTest extends JerseyTest {
         final String responseBody;
         responseBody = client.apply(api -> api.doPatch(REQUEST_BODY));
 
-        assertThat(testResourceSingleton.invocation.get(60, TimeUnit.SECONDS), is(REQUEST_BODY));
-        assertThat(responseBody, is(REQUEST_BODY));
+        assertEquals(REQUEST_BODY, testResourceSingleton.invocation.get(60, TimeUnit.SECONDS));
+        assertEquals(REQUEST_BODY, responseBody);
     }
 
     public interface TestResourceApi {
diff --git a/jaxrs_client_utils/src/test/java/com/yahoo/vespa/jaxrs/client/RetryingJaxRsStrategyTest.java b/jaxrs_client_utils/src/test/java/com/yahoo/vespa/jaxrs/client/RetryingJaxRsStrategyTest.java
index 4a78452c956..bc48ab1c5a6 100644
--- a/jaxrs_client_utils/src/test/java/com/yahoo/vespa/jaxrs/client/RetryingJaxRsStrategyTest.java
+++ b/jaxrs_client_utils/src/test/java/com/yahoo/vespa/jaxrs/client/RetryingJaxRsStrategyTest.java
@@ -20,9 +20,8 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static org.hamcrest.CoreMatchers.hasItem;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.atLeast;
@@ -72,7 +71,7 @@ public class RetryingJaxRsStrategyTest {
         assertEquals(REST_PORT, params.uri().getPort());
         assertEquals(API_PATH, params.uri().getPath());
         assertEquals("http", params.uri().getScheme());
-        assertThat(SERVER_HOSTS, hasItem(new HostName(params.uri().getHost())));
+        assertTrue(SERVER_HOSTS.contains(new HostName(params.uri().getHost())));
     }
 
     @Test