Simplify testing by sticking to assertEquals/True/False

4 files changed, 20 insertions, 29 deletions

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"))