Simplify testing by sticking to assertEquals/True/False

11 files changed, 56 insertions, 85 deletions

diff --git a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java
index 2a70799ab3d..ec68ed73864 100644
--- a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java
+++ b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java
@@ -9,7 +9,6 @@ import com.yahoo.config.provision.Zone;
 import com.yahoo.io.IOUtils;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 
 import java.io.File;
@@ -17,10 +16,10 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.nio.file.Files;
 
-import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 /**
  * @author Ulf Lilleengen
@@ -30,9 +29,6 @@ public class FilesApplicationPackageTest {
     @Rule
     public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
-    @Rule
-    public ExpectedException expectedException = ExpectedException.none();
-
     @Test
     public void testPreprocessing() throws IOException {
         File appDir = temporaryFolder.newFolder();
@@ -112,9 +108,12 @@ public class FilesApplicationPackageTest {
         IOUtils.copyDirectory(new File("src/test/resources/multienvapp"), appDir);
         Files.delete(new File(appDir, "services.xml").toPath());
         FilesApplicationPackage app = FilesApplicationPackage.fromFile(appDir);
-        expectedException.expect(IllegalArgumentException.class);
-        expectedException.expectMessage(containsString("services.xml in application package is empty"));
-        app.preprocess(new Zone(Environment.dev, RegionName.defaultName()), new BaseDeployLogger());
+        try {
+            app.preprocess(new Zone(Environment.dev, RegionName.defaultName()), new BaseDeployLogger());
+            fail();
+        } catch (IllegalArgumentException e) {
+            assertTrue(e.getMessage().contains("services.xml in application package is empty"));
+        }
     }
 
 }
diff --git a/config-provisioning/pom.xml b/config-provisioning/pom.xml
index 12b31bd6370..5f0c93ceec5 100644
--- a/config-provisioning/pom.xml
+++ b/config-provisioning/pom.xml
@@ -64,11 +64,6 @@ Provisioning APIs.
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ApplicationIdTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ApplicationIdTest.java
index 27b9a7213cb..c82230f7edf 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/ApplicationIdTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ApplicationIdTest.java
@@ -7,8 +7,6 @@ import com.yahoo.cloud.config.ApplicationIdConfig;
 import com.yahoo.test.TotalOrderTester;
 import org.junit.Test;
 import com.google.common.testing.EqualsTester;
-import static org.junit.Assert.assertThat;
-import static org.hamcrest.Matchers.*;
 
 /**
  * @author Ulf Lilleengen
@@ -53,9 +51,9 @@ public class ApplicationIdTest {
         ApplicationId id1 = applicationId("foo");
         ApplicationId id2 = applicationId("bar");
         ApplicationId id3 = idFrom("tenant", "baz", "bim");
-        assertThat(id1.serializedForm(), is("default:foo:default"));
-        assertThat(id2.serializedForm(), is("default:bar:default"));
-        assertThat(id3.serializedForm(), is("tenant:baz:bim"));
+        assertEquals("default:foo:default", id1.serializedForm());
+        assertEquals("default:bar:default", id2.serializedForm());
+        assertEquals("tenant:baz:bim", id3.serializedForm());
     }
 
     @Test
@@ -63,20 +61,20 @@ public class ApplicationIdTest {
         ApplicationId id1 = applicationId("foo");
         ApplicationId id2 = idFrom("bar", "baz", "default");
         ApplicationId id3 = idFrom("tenant", "baz", "bim");
-        assertThat(id1.toShortString(), is("default.foo"));
-        assertThat(id1.toFullString(), is("default.foo.default"));
-        assertThat(id2.toShortString(), is("bar.baz"));
-        assertThat(id2.toFullString(), is("bar.baz.default"));
-        assertThat(id3.toShortString(), is("tenant.baz.bim"));
-        assertThat(id3.toFullString(), is("tenant.baz.bim"));
+        assertEquals("default.foo", id1.toShortString());
+        assertEquals("default.foo.default", id1.toFullString());
+        assertEquals("bar.baz", id2.toShortString());
+        assertEquals("bar.baz.default", id2.toFullString());
+        assertEquals("tenant.baz.bim", id3.toShortString());
+        assertEquals("tenant.baz.bim", id3.toFullString());
     }
 
     @Test
     public void require_that_idstring_can_be_parsed() {
         ApplicationId id = ApplicationId.fromSerializedForm("ten:foo:bim");
-        assertThat(id.tenant().value(), is("ten"));
-        assertThat(id.application().value(), is("foo"));
-        assertThat(id.instance().value(), is("bim"));
+        assertEquals("ten", id.tenant().value());
+        assertEquals("foo", id.application().value());
+        assertEquals("bim", id.instance().value());
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -87,8 +85,8 @@ public class ApplicationIdTest {
     @Test
     public void require_that_defaults_are_given() {
         ApplicationId id1 = applicationId("foo");
-        assertThat(id1.tenant().value(), is("default"));
-        assertThat(id1.instance().value(), is("default"));
+        assertEquals("default", id1.tenant().value());
+        assertEquals("default", id1.instance().value());
     }
 
     @Test
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/IdentifierTestBase.java b/config-provisioning/src/test/java/com/yahoo/config/provision/IdentifierTestBase.java
index 370bcd6cdf1..d4edb7a14eb 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/IdentifierTestBase.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/IdentifierTestBase.java
@@ -4,10 +4,9 @@ package com.yahoo.config.provision;
 import com.google.common.testing.EqualsTester;
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -29,8 +28,8 @@ public abstract class IdentifierTestBase<ID_TYPE> {
         assertTrue(isDefault(def));
         assertTrue(isDefault(def2));
         assertFalse(isDefault(notdef));
-        assertThat(def, is(def2));
-        assertThat(def2, is(not(notdef)));
+        assertEquals(def, def2);
+        assertNotEquals(def2, notdef);
     }
 
     @Test
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/TenantTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/TenantTest.java
index 8475c30c1f6..2bfcd183c85 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/TenantTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/TenantTest.java
@@ -4,8 +4,7 @@ package com.yahoo.config.provision;
 import com.yahoo.test.TotalOrderTester;
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author Ulf Lilleengen
@@ -29,7 +28,7 @@ public class TenantTest extends IdentifierTestBase<TenantName> {
 
     @Test
     public void testComparator() {
-        assertThat(TenantName.defaultName().compareTo(TenantName.defaultName()), is(0));
+        assertEquals(0, TenantName.defaultName().compareTo(TenantName.defaultName()));
 
         new TotalOrderTester<TenantName>()
                 .theseObjects(TenantName.from("a"), TenantName.from("a"))
diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml
index 90c9c056131..e98b2a08662 100644
--- a/container-search-and-docproc/pom.xml
+++ b/container-search-and-docproc/pom.xml
@@ -217,11 +217,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
diff --git a/container-search-and-docproc/src/test/java/com/yahoo/container/handler/observability/ApplicationStatusHandlerTest.java b/container-search-and-docproc/src/test/java/com/yahoo/container/handler/observability/ApplicationStatusHandlerTest.java
index 93668cf788d..317f5fc1329 100644
--- a/container-search-and-docproc/src/test/java/com/yahoo/container/handler/observability/ApplicationStatusHandlerTest.java
+++ b/container-search-and-docproc/src/test/java/com/yahoo/container/handler/observability/ApplicationStatusHandlerTest.java
@@ -5,7 +5,6 @@ import com.yahoo.component.ComponentId;
 import com.yahoo.component.chain.Chain;
 import com.yahoo.container.core.ApplicationMetadataConfig;
 import com.yahoo.container.jdisc.JdiscBindingsConfig;
-import com.yahoo.jdisc.Metric;
 import com.yahoo.jdisc.handler.RequestHandler;
 import com.yahoo.jdisc.service.ClientProvider;
 import com.yahoo.processing.Processor;
@@ -17,11 +16,9 @@ import org.junit.Test;
 import org.mockito.Mockito;
 
 import java.util.HashMap;
-import java.util.concurrent.Executors;
 
 import static com.yahoo.container.jdisc.JdiscBindingsConfig.Handlers;
-import static org.junit.Assert.assertThat;
-import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author gjoranv
@@ -30,7 +27,7 @@ import static org.hamcrest.CoreMatchers.containsString;
 public class ApplicationStatusHandlerTest {
 
     @Test
-    public void application_configs_are_rendered() throws Exception {
+    public void application_configs_are_rendered()  {
         ApplicationMetadataConfig metaConfig = new ApplicationMetadataConfig(
                 new ApplicationMetadataConfig.Builder()
                         .checksum("abc")
@@ -44,28 +41,28 @@ public class ApplicationStatusHandlerTest {
                         .version("v1"));
 
         String json = ApplicationStatusHandler.renderApplicationConfigs(metaConfig, userConfig).toString();
-        assertThat(json, containsString("version"));
-        assertThat(json, containsString("meta"));
-        assertThat(json, containsString("abc"));
-        assertThat(json, containsString("app"));
-        assertThat(json, containsString("/a/b/c"));
-        assertThat(json, containsString("3000"));
-        assertThat(json, containsString("donald"));
-
-        assertThat(json, containsString("v1"));
+        assertTrue(json.contains("version"));
+        assertTrue(json.contains("meta"));
+        assertTrue(json.contains("abc"));
+        assertTrue(json.contains("app"));
+        assertTrue(json.contains("/a/b/c"));
+        assertTrue(json.contains("3000"));
+        assertTrue(json.contains("donald"));
+
+        assertTrue(json.contains("v1"));
     }
 
     @Test
-    public void object_components_are_rendered() throws Exception {
+    public void object_components_are_rendered() {
         HashMap<ComponentId, Object> id2object = new HashMap<>();
         id2object.put(new ComponentId("myComponent"), new Object());
 
         String json = ApplicationStatusHandler.renderObjectComponents(id2object).toString();
-        assertThat(json, containsString("myComponent"));
+        assertTrue(json.contains("myComponent"));
     }
 
     @Test
-    public void request_handlers_are_rendered() throws Exception {
+    public void request_handlers_are_rendered() {
         final String id = "myHandler";
         final String serverBinding1 = "http://*/serverBinding";
         final String serverBinding2 = "http://*/anotherServerBinding";
@@ -81,14 +78,14 @@ public class ApplicationStatusHandlerTest {
                         .clientBindings(clientBinding))
         );
         String json = ApplicationStatusHandler.renderRequestHandlers(bindingsConfig, handlersById).toString();
-        assertThat(json, containsString("\"" + id + "\""));
-        assertThat(json, containsString(serverBinding1));
-        assertThat(json, containsString(serverBinding2));
-        assertThat(json, containsString(clientBinding));
+        assertTrue(json.contains("\"" + id + "\""));
+        assertTrue(json.contains(serverBinding1));
+        assertTrue(json.contains(serverBinding2));
+        assertTrue(json.contains(clientBinding));
     }
 
     @Test
-    public void client_providers_are_rendered() throws Exception {
+    public void client_providers_are_rendered() {
         final String id = "myClient";
         final String clientBinding = "http://*/clientBinding";
         final String clientBinding2 = "http://*/anotherClientBinding";
@@ -105,21 +102,21 @@ public class ApplicationStatusHandlerTest {
         );
         String json = ApplicationStatusHandler.renderRequestHandlers(bindingsConfig, clientsById).toString();
         System.out.println(json);
-        assertThat(json, containsString("\"" + id + "\""));
-        assertThat(json, containsString(clientBinding));
-        assertThat(json, containsString(clientBinding2));
-        assertThat(json, containsString(serverBinding));
+        assertTrue(json.contains("\"" + id + "\""));
+        assertTrue(json.contains(clientBinding));
+        assertTrue(json.contains(clientBinding2));
+        assertTrue(json.contains(serverBinding));
     }
 
     @Test
-    public void chains_are_rendered() throws Exception {
+    public void chains_are_rendered()  {
         ChainRegistry<Processor> chains = new ChainRegistry<>();
-        Chain<Processor> chain = new Chain<Processor>("myChain", new VoidProcessor(new ComponentId("voidProcessor")));
+        Chain<Processor> chain = new Chain<>("myChain", new VoidProcessor(new ComponentId("voidProcessor")));
         chains.register(new ComponentId("myChain"), chain);
 
         String json = ApplicationStatusHandler.StatusResponse.renderChains(chains).toString();
-        assertThat(json, containsString("myChain"));
-        assertThat(json, containsString("voidProcessor"));
+        assertTrue(json.contains("myChain"));
+        assertTrue(json.contains("voidProcessor"));
     }
 
     private static class VoidProcessor extends Processor {
diff --git a/node-admin/pom.xml b/node-admin/pom.xml
index 8fe5b2aecd1..b5808ebc699 100644
--- a/node-admin/pom.xml
+++ b/node-admin/pom.xml
@@ -86,12 +86,6 @@
 
         <!-- Test -->
         <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-junit</artifactId>
-            <version>2.0.0.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImplTest.java
index db33d0b300f..866b7d2877a 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImplTest.java
@@ -21,8 +21,6 @@ import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.List;
 
-import static org.hamcrest.Matchers.arrayContainingInAnyOrder;
-import static org.hamcrest.junit.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -138,8 +136,8 @@ public class ConfigServerApiImplTest {
             // ignore
         }
 
-        String[] log = mockLog.toString().split("  ");
-        assertThat(log, arrayContainingInAnyOrder("GET http://host1:666/path", "GET http://host2:666/path"));
+        List<String> log = List.of(mockLog.toString().split("  "));
+        assertTrue(log.containsAll(List.of("GET http://host1:666/path", "GET http://host2:666/path")));
     }
 
     @Test
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java
index 70987faa54d..5d15d4353e2 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java
@@ -23,10 +23,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
-import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
diff --git a/yolean/src/test/java/com/yahoo/yolean/chain/ChainBuilderTest.java b/yolean/src/test/java/com/yahoo/yolean/chain/ChainBuilderTest.java
index 349ba8998bd..1d5b6a6cac7 100644
--- a/yolean/src/test/java/com/yahoo/yolean/chain/ChainBuilderTest.java
+++ b/yolean/src/test/java/com/yahoo/yolean/chain/ChainBuilderTest.java
@@ -10,7 +10,6 @@ import java.util.List;
 import static com.yahoo.yolean.chain.Dependencies.after;
 import static com.yahoo.yolean.chain.Dependencies.before;
 import static com.yahoo.yolean.chain.Dependencies.provides;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;