Avoid deprecated APIs

2 files changed, 13 insertions, 19 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/handler/SearchHandlerTest.java b/container-search/src/test/java/com/yahoo/search/handler/SearchHandlerTest.java
index e1987aa50ca..b1354106f19 100644
--- a/container-search/src/test/java/com/yahoo/search/handler/SearchHandlerTest.java
+++ b/container-search/src/test/java/com/yahoo/search/handler/SearchHandlerTest.java
@@ -37,14 +37,11 @@ import java.net.URI;
 import java.util.concurrent.Executors;
 
 import static com.yahoo.yolean.Exceptions.uncheckInterrupted;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -222,9 +219,9 @@ public class SearchHandlerTest {
         RequestHandlerTestDriver.MockResponseHandler responseHandler =
                 testDriver.sendRequest("http://localhost/search/?query=status_code%3A0&hits=20&offset=-20");
         String response = responseHandler.readAll();
-        assertThat(responseHandler.getStatus(), is(400));
-        assertThat(response, containsString("offset"));
-        assertThat(response, containsString("\"code\":" + com.yahoo.container.protect.Error.ILLEGAL_QUERY.code));
+        assertEquals(400, responseHandler.getStatus());
+        assertTrue(response.contains("offset"));
+        assertTrue(response.contains("\"code\":" + com.yahoo.container.protect.Error.ILLEGAL_QUERY.code));
     }
 
     @Test
@@ -246,7 +243,7 @@ public class SearchHandlerTest {
                 driver.sendRequest("http://localhost/search/?query=web_service_status_code");
         String response = responseHandler.readAll();
         assertEquals(406, responseHandler.getStatus());
-        assertThat(response, containsString("\"code\":" + 406));
+        assertTrue(response.contains("\"code\":" + 406));
     }
 
     @Test
diff --git a/container-search/src/test/java/com/yahoo/search/handler/test/JSONSearchHandlerTestCase.java b/container-search/src/test/java/com/yahoo/search/handler/test/JSONSearchHandlerTestCase.java
index 48dfa98768a..7811336823d 100644
--- a/container-search/src/test/java/com/yahoo/search/handler/test/JSONSearchHandlerTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/handler/test/JSONSearchHandlerTestCase.java
@@ -31,13 +31,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static com.yahoo.jdisc.http.HttpRequest.Method.GET;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -102,9 +99,9 @@ public class JSONSearchHandlerTestCase {
         String json = "Not a valid JSON-string";
         RequestHandlerTestDriver.MockResponseHandler responseHandler = driver.sendRequest(uri, com.yahoo.jdisc.http.HttpRequest.Method.POST, json, JSON_CONTENT_TYPE);
         String response = responseHandler.readAll();
-        assertThat(responseHandler.getStatus(), is(400));
-        assertThat(response, containsString("errors"));
-        assertThat(response, containsString("\"code\":" + Error.ILLEGAL_QUERY.code));
+        assertEquals(400, responseHandler.getStatus());
+        assertTrue(response.contains("errors"));
+        assertTrue(response.contains("\"code\":" + Error.ILLEGAL_QUERY.code));
     }
 
     @Test
@@ -158,7 +155,7 @@ public class JSONSearchHandlerTestCase {
             json.put("yql", "selectz * from foo where bar > 1453501295");
             RequestHandlerTestDriver.MockResponseHandler responseHandler = newDriver.sendRequest(uri, com.yahoo.jdisc.http.HttpRequest.Method.POST, json.toString(), JSON_CONTENT_TYPE);
             responseHandler.readAll();
-            assertThat(responseHandler.getStatus(), is(400));
+            assertEquals(400, responseHandler.getStatus());
         }
     }
 
@@ -178,9 +175,9 @@ public class JSONSearchHandlerTestCase {
         RequestHandlerTestDriver.MockResponseHandler responseHandler =
                 testDriver.sendRequest(uri, com.yahoo.jdisc.http.HttpRequest.Method.POST, json.toString(), JSON_CONTENT_TYPE);
         String response = responseHandler.readAll();
-        assertThat(responseHandler.getStatus(), is(400));
-        assertThat(response, containsString("offset"));
-        assertThat(response, containsString("\"code\":" + com.yahoo.container.protect.Error.ILLEGAL_QUERY.code));
+        assertEquals(400, responseHandler.getStatus());
+        assertTrue(response.contains("offset"));
+        assertTrue(response.contains("\"code\":" + com.yahoo.container.protect.Error.ILLEGAL_QUERY.code));
     }
 
     @Test
@@ -212,8 +209,8 @@ public class JSONSearchHandlerTestCase {
         RequestHandlerTestDriver.MockResponseHandler responseHandler =
                 driver.sendRequest(uri, com.yahoo.jdisc.http.HttpRequest.Method.POST, json.toString(), JSON_CONTENT_TYPE);
         String response = responseHandler.readAll();
-        assertThat(responseHandler.getStatus(), is(406));
-        assertThat(response, containsString("\"code\":" + 406));
+        assertEquals(406, responseHandler.getStatus());
+        assertTrue(response.contains("\"code\":" + 406));
     }
 
     @Test