Minor unification of tests.

3 files changed, 31 insertions, 32 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java
index f776db6f942..0f9de516a4b 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java
@@ -13,8 +13,7 @@ import org.junit.Test;
 import org.w3c.dom.Element;
 
 import static com.yahoo.collections.CollectionUtil.first;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 /**
@@ -24,7 +23,7 @@ public class FilterBindingsTest extends DomBuilderTest {
 
     private static final String MY_CHAIN_BINDING = "http://*/my-chain-binding";
 
-    private Http buildHttp(Element xml) throws Exception {
+    private Http buildHttp(Element xml) {
         Http http = new HttpBuilder().build(root.getDeployState(), root, xml);
         root.freezeModelTopology();
         http.validate();
@@ -50,8 +49,8 @@ public class FilterBindingsTest extends DomBuilderTest {
         Http http = buildHttp(xml);
 
         Binding binding = first(http.getBindings());
-        assertThat(binding.filterId().getName(), is("my-request-chain"));
-        assertThat(binding.binding(), is(MY_CHAIN_BINDING));
+        assertEquals("my-request-chain", binding.filterId().getName());
+        assertEquals(MY_CHAIN_BINDING, binding.binding());
 
         Chain<Filter> myChain = http.getFilterChains().allChains().getComponent("my-request-chain");
         assertNotNull("Missing chain", myChain);
@@ -70,15 +69,15 @@ public class FilterBindingsTest extends DomBuilderTest {
         Http http = buildHttp(xml);
 
         Binding binding = first(http.getBindings());
-        assertThat(binding.filterId().getName(), is("my-response-chain"));
-        assertThat(binding.binding(), is(MY_CHAIN_BINDING));
+        assertEquals("my-response-chain", binding.filterId().getName());
+        assertEquals(MY_CHAIN_BINDING, binding.binding());
 
         Chain<Filter> myChain = http.getFilterChains().allChains().getComponent("my-response-chain");
         assertNotNull("Missing chain", myChain);
     }
 
     @Test
-    public void bindings_are_added_to_config_for_all_http_servers_with_jetty() throws Exception {
+    public void bindings_are_added_to_config_for_all_http_servers_with_jetty() {
         final Element xml = parse(
                 "<container version='1.0'>",
                 "  <http>",
@@ -95,15 +94,15 @@ public class FilterBindingsTest extends DomBuilderTest {
 
         {
             final ServerConfig config = root.getConfig(ServerConfig.class, "container/http/jdisc-jetty/server1");
-            assertThat(config.filter().size(), is(1));
-            assertThat(config.filter(0).id(), is("my-request-chain"));
-            assertThat(config.filter(0).binding(), is(MY_CHAIN_BINDING));
+            assertEquals(1, config.filter().size());
+            assertEquals("my-request-chain", config.filter(0).id());
+            assertEquals(MY_CHAIN_BINDING, config.filter(0).binding());
         }
         {
             final ServerConfig config = root.getConfig(ServerConfig.class, "container/http/jdisc-jetty/server2");
-            assertThat(config.filter().size(), is(1));
-            assertThat(config.filter(0).id(), is("my-request-chain"));
-            assertThat(config.filter(0).binding(), is(MY_CHAIN_BINDING));
+            assertEquals(1, config.filter().size());
+            assertEquals("my-request-chain", config.filter(0).id());
+            assertEquals(MY_CHAIN_BINDING, config.filter(0).binding());
         }
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
index a2d13439f4e..b2f9c805be1 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
@@ -20,11 +20,13 @@ import static com.yahoo.test.Matchers.hasItemWithMethod;
 import static com.yahoo.vespa.model.container.search.ContainerSearch.QUERY_PROFILE_REGISTRY_CLASS;
 import static com.yahoo.vespa.model.container.xml.ContainerModelBuilder.SEARCH_HANDLER_BINDING;
 import static com.yahoo.vespa.model.container.xml.ContainerModelBuilder.SEARCH_HANDLER_CLASS;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 /**
  * @author gjoranv
@@ -46,7 +48,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
         createModel(root, clusterElem);
 
         String discBindingsConfig = root.getConfig(JdiscBindingsConfig.class, "default").toString();
-        assertThat(discBindingsConfig, containsString(GUIHandler.BINDING));
+        assertTrue(discBindingsConfig.contains(GUIHandler.BINDING));
 
         ApplicationContainerCluster cluster = (ApplicationContainerCluster)root.getChildren().get("default");
 
@@ -56,7 +58,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
                 guiHandler = (GUIHandler) handler;
             }
         }
-        if (guiHandler == null) fail();
+        assertNotNull(guiHandler);
     }
 
     @Test
@@ -73,9 +75,9 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
         createModel(root, clusterElem);
 
         String discBindingsConfig = root.getConfig(JdiscBindingsConfig.class, "default").toString();
-        assertThat(discBindingsConfig, containsString(".serverBindings[0] \"binding0\""));
-        assertThat(discBindingsConfig, containsString(".serverBindings[1] \"binding1\""));
-        assertThat(discBindingsConfig, not(containsString("/search/*")));
+        assertTrue(discBindingsConfig.contains(".serverBindings[0] \"binding0\""));
+        assertTrue(discBindingsConfig.contains(".serverBindings[1] \"binding1\""));
+        assertFalse(discBindingsConfig.contains("/search/*"));
     }
 
     @Test
@@ -91,7 +93,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
         createModel(root, clusterElem);
 
         String discBindingsConfig = root.getConfig(JdiscBindingsConfig.class, "default").toString();
-        assertThat(discBindingsConfig, not(containsString("/search/*")));
+        assertFalse(discBindingsConfig.contains("/search/*"));
     }
 
     @Test
@@ -109,8 +111,8 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
         createModel(root, clusterElem);
 
         var discBindingsConfig = root.getConfig(JdiscBindingsConfig.class, "default");
-        assertThat(discBindingsConfig.handlers(myHandler).serverBindings(0), is(SEARCH_HANDLER_BINDING));
-        assertThat(discBindingsConfig.handlers(SEARCH_HANDLER_CLASS), is(nullValue()));
+        assertEquals(SEARCH_HANDLER_BINDING, discBindingsConfig.handlers(myHandler).serverBindings(0));
+        assertNull(discBindingsConfig.handlers(SEARCH_HANDLER_CLASS));
     }
 
     // TODO: remove test when all containers are named 'container'
@@ -118,7 +120,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
     public void cluster_with_only_search_gets_qrserver_as_service_name() {
         createClusterWithOnlyDefaultChains();
         ApplicationContainerCluster cluster = (ApplicationContainerCluster)root.getChildren().get("default");
-        assertThat(cluster.getContainers().get(0).getServiceName(), is(QRSERVER.serviceName));
+        assertEquals(QRSERVER.serviceName, cluster.getContainers().get(0).getServiceName());
     }
 
     @Test
@@ -162,7 +164,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
             createModel(root, clusterElem);
             fail("Expected exception");
         } catch (Exception e) {
-            assertThat(e.getMessage(), containsString("Setting up com.yahoo.search.handler.SearchHandler manually is not supported"));
+            assertTrue(e.getMessage().contains("Setting up com.yahoo.search.handler.SearchHandler manually is not supported"));
         }
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
index 0a97bcc700f..27c88ad2d1f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
@@ -40,12 +40,10 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
-import static com.yahoo.test.PatternMatcher.matchesPattern;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -796,7 +794,7 @@ public class ContentClusterTest extends ContentBaseTest {
     private static void assertPrepareRestartCommand(ContentCluster cluster) {
         Optional<String> command = cluster.getSearch().getSearchNodes().get(0).getPreShutdownCommand();
         assertTrue(command.isPresent());
-        assertThat(command.get(), matchesPattern(".*vespa-proton-cmd [0-9]+ prepareRestart"));
+        assertTrue(command.get().matches(".*vespa-proton-cmd [0-9]+ prepareRestart"));
     }
 
     private static void assertNoPreShutdownCommand(ContentCluster cluster) {