GC deprecated junit assertThat.

2 files changed, 8 insertions, 15 deletions

diff --git a/container-core/src/test/java/com/yahoo/container/handler/AccessLogRequestHandlerTest.java b/container-core/src/test/java/com/yahoo/container/handler/AccessLogRequestHandlerTest.java
index aad064bc82e..2eba4144b45 100644
--- a/container-core/src/test/java/com/yahoo/container/handler/AccessLogRequestHandlerTest.java
+++ b/container-core/src/test/java/com/yahoo/container/handler/AccessLogRequestHandlerTest.java
@@ -9,8 +9,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.concurrent.Executor;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 
 public class AccessLogRequestHandlerTest {
@@ -25,14 +24,14 @@ public class AccessLogRequestHandlerTest {
         keeper.addUri("foo");
         HttpResponse response = handler.handle(null);
         response.render(out);
-        assertThat(out.toString(), is("{\"entries\":[{\"url\":\"foo\"}]}"));
+        assertEquals("{\"entries\":[{\"url\":\"foo\"}]}", out.toString());
     }
 
     @Test
     public void testEmpty() throws IOException {
         HttpResponse response = handler.handle(null);
         response.render(out);
-        assertThat(out.toString(), is("{\"entries\":[]}"));
+        assertEquals("{\"entries\":[]}", out.toString());
     }
 
     @Test
@@ -41,7 +40,7 @@ public class AccessLogRequestHandlerTest {
         keeper.addUri("foo");
         HttpResponse response = handler.handle(null);
         response.render(out);
-        assertThat(out.toString(), is("{\"entries\":[{\"url\":\"foo\"},{\"url\":\"foo\"}]}"));
+        assertEquals("{\"entries\":[{\"url\":\"foo\"},{\"url\":\"foo\"}]}", out.toString());
     }
 
 }
diff --git a/container-core/src/test/java/com/yahoo/container/handler/test/MockServiceTest.java b/container-core/src/test/java/com/yahoo/container/handler/test/MockServiceTest.java
index 604fe9494d7..2efa717800d 100644
--- a/container-core/src/test/java/com/yahoo/container/handler/test/MockServiceTest.java
+++ b/container-core/src/test/java/com/yahoo/container/handler/test/MockServiceTest.java
@@ -12,8 +12,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.concurrent.Executor;
 
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author Ulf Lilleengen
@@ -37,7 +36,7 @@ public class MockServiceTest {
     @Test
     public void testNoHandlerFound() throws InterruptedException, IOException {
         HttpResponse response = runHandler(com.yahoo.jdisc.http.HttpRequest.Method.DELETE, "/foo/bar");
-        assertThat(response.getStatus(), is(404));
+        assertEquals(404, response.getStatus());
         assertResponseContents(response, "DELETE:/foo/bar was not found");
     }
 
@@ -52,19 +51,14 @@ public class MockServiceTest {
     }
 
     private void assertResponse(HttpResponse response, int expectedCode, String expectedMessage) throws IOException {
-        assertThat(response.getStatus(), is(expectedCode));
+        assertEquals(expectedCode, response.getStatus());
         assertResponseContents(response, expectedMessage);
     }
 
     private void assertResponseContents(HttpResponse response, String expected) throws IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         response.render(baos);
-        assertThat(baos.toString(), is(expected));
-    }
-
-    private void assertResponseOk(HttpResponse response) {
-        assertThat(response.getStatus(), is(200));
-        assertThat(response.getContentType(), is("text/plain"));
+        assertEquals(expected, baos.toString());
     }
 
     private HttpResponse runHandler(com.yahoo.jdisc.http.HttpRequest.Method method, String path) throws InterruptedException, IOException {