Revert "Revert "Reduce the use of hamcrest when normal assertEquals/assertTrue does a…""

2 files changed, 3 insertions, 9 deletions

diff --git a/chain/pom.xml b/chain/pom.xml
index 2ead24a89b7..67ee1a4c0e7 100755
--- a/chain/pom.xml
+++ b/chain/pom.xml
@@ -26,11 +26,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>provided-dependencies</artifactId>
       <version>${project.version}</version>
diff --git a/chain/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java b/chain/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java
index 2a22b5afbf7..7cef03bbb06 100644
--- a/chain/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java
+++ b/chain/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java
@@ -11,8 +11,7 @@ import java.util.Set;
 
 import static com.yahoo.container.core.ChainsConfig.Components;
 import static com.yahoo.container.core.ChainsConfig.Chains;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -23,7 +22,7 @@ public class ChainsModelBuilderTest {
     @Test
     public void components_are_added_to_componentModels() throws Exception {
         ChainsModel model = chainsModel();
-        assertThat(model.allComponents().size(), is(2));
+        assertEquals(2, model.allComponents().size());
         assertTrue(model.componentModels().containsKey(new ComponentId("componentA")));
     }
 
@@ -38,7 +37,7 @@ public class ChainsModelBuilderTest {
     public void inherited_chains_are_added_to_chainSpecification() throws Exception {
         ChainsModel model = chainsModel();
         ChainSpecification inheritsChain1 = model.chainSpecifications().get(new ComponentId("inheritsChain1")).model();
-        assertThat(model.allChainsFlattened().size(), is(2));
+        assertEquals(2, model.allChainsFlattened().size());
         assertTrue(getComponentsByName(inheritsChain1.inheritance.chainSpecifications).containsKey("chain1"));
         assertTrue(getComponentsByName(inheritsChain1.inheritance.excludedComponents).containsKey("componentA"));
      }