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

4 files changed, 48 insertions, 47 deletions

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 60629e05636..70bb0ab1397 100644
--- a/yolean/src/test/java/com/yahoo/yolean/chain/ChainBuilderTest.java
+++ b/yolean/src/test/java/com/yahoo/yolean/chain/ChainBuilderTest.java
@@ -9,9 +9,9 @@ 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.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -100,7 +100,7 @@ public class ChainBuilderTest {
     public void build_empty_chain() {
         Chain<Filter> chain = getChain().build();
         assertTrue(chain.isEmpty());
-        assertThat(chain.id(), is("myChain"));
+        assertEquals("myChain", chain.id());
     }
 
     @Test
@@ -140,7 +140,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(b).add(a, before(b)).build();
 
-        assertThat(chain, is(new Chain<>("myChain", a, b)));
+        assertEquals(new Chain<>("myChain", a, b), chain);
     }
 
     @Test
@@ -151,7 +151,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(b, after(a)).add(a).build();
 
-        assertThat(chain, is(new Chain<>("myChain", a, b)));
+        assertEquals(new Chain<>("myChain", a, b), chain);
     }
 
     @Test
@@ -162,7 +162,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(b).add(a, before(b.getClass())).build();
 
-        assertThat(chain, is(new Chain<>("myChain", a, b)));
+        assertEquals(new Chain<>("myChain", a, b), chain);
     }
 
     @Test
@@ -173,7 +173,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(b, after(a.getClass())).add(a).build();
 
-        assertThat(chain, is(new Chain<>("myChain", a, b)));
+        assertEquals(new Chain<>("myChain", a, b), chain);
     }
 
     @Test
@@ -184,7 +184,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(b).add(a, before(FilterB.class)).build();
 
-        assertThat(chain, is(new Chain<>("myChain", a, b)));
+        assertEquals(new Chain<>("myChain", a, b), chain);
     }
 
     @Test
@@ -195,7 +195,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(b, after(FilterA.class)).add(a).build();
 
-        assertThat(chain, is(new Chain<>("myChain", a, b)));
+        assertEquals(new Chain<>("myChain", a, b), chain);
     }
 
     @Test
@@ -206,7 +206,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(b, provides("B")).add(a, before("B")).build();
 
-        assertThat(chain, is(new Chain<>("myChain", a, b)));
+        assertEquals(new Chain<>("myChain", a, b), chain);
     }
 
     @Test
@@ -217,7 +217,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(b, after("A")).add(a, provides("A")).build();
 
-        assertThat(chain, is(new Chain<>("myChain", a, b)));
+        assertEquals(new Chain<>("myChain", a, b), chain);
     }
 
     @Test
@@ -228,7 +228,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(providesA).add(beforeA).build();
 
-        assertThat(chain, is(new Chain<>("myChain", beforeA, providesA)));
+        assertEquals(new Chain<>("myChain", beforeA, providesA), chain);
     }
 
     @Test
@@ -239,7 +239,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(afterA).add(providesA).build();
 
-        assertThat(chain, is(new Chain<>("myChain", providesA, afterA)));
+        assertEquals(new Chain<>("myChain", providesA, afterA), chain);
     }
 
     @Test
@@ -250,7 +250,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(b).add(a, before("*")).build();
 
-        assertThat(chain, is(new Chain<>("myChain", a, b)));
+        assertEquals(new Chain<>("myChain", a, b), chain);
     }
 
     @Test
@@ -261,7 +261,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(b, after("*")).add(a).build();
 
-        assertThat(chain, is(new Chain<>("myChain", a, b)));
+        assertEquals(new Chain<>("myChain", a, b), chain);
     }
 
     @Test
@@ -272,7 +272,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(a).add(beforeAll).build();
 
-        assertThat(chain, is(new Chain<>("myChain", beforeAll, a)));
+        assertEquals(new Chain<>("myChain", beforeAll, a), chain);
     }
 
     @Test
@@ -283,7 +283,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(afterAll).add(a).build();
 
-        assertThat(chain, is(new Chain<>("myChain", a, afterAll)));
+        assertEquals(new Chain<>("myChain", a, afterAll), chain);
     }
 
     @Test
@@ -294,7 +294,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(beforeAll).add(beforeBeforeAll).build();
 
-        assertThat(chain, is(new Chain<>("myChain", beforeBeforeAll, beforeAll)));
+        assertEquals(new Chain<>("myChain", beforeBeforeAll, beforeAll), chain);
     }
 
     @Test
@@ -305,7 +305,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(afterAfterAll).add(afterAll).build();
 
-        assertThat(chain, is(new Chain<>("myChain", afterAll, afterAfterAll)));
+        assertEquals(new Chain<>("myChain", afterAll, afterAfterAll), chain);
     }
 
     @Test
@@ -316,7 +316,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(beforeAll).add(first, before("BeforeAll")).build();
 
-        assertThat(chain, is(new Chain<>("myChain", first, beforeAll)));
+        assertEquals(new Chain<>("myChain", first, beforeAll), chain);
     }
 
     @Test
@@ -327,7 +327,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(last, after("AfterAll")).add(afterAll).build();
 
-        assertThat(chain, is(new Chain<>("myChain", afterAll, last)));
+        assertEquals(new Chain<>("myChain", afterAll, last), chain);
     }
 
     @Test
@@ -338,7 +338,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(b, after(a.getClass().getName())).add(a).build();
 
-        assertThat(chain, is(new Chain<>("myChain", a, b)));
+        assertEquals(new Chain<>("myChain", a, b), chain);
     }
 
     @Test
@@ -350,7 +350,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(last, after("A")).add(first, before("A")).add(extendsA).build();
 
-        assertThat(chain, is(new Chain<>("myChain", first, extendsA, last)));
+        assertEquals(new Chain<>("myChain", first, extendsA, last), chain);
     }
 
     @Test
@@ -362,7 +362,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(last, after("A")).add(first, before("ExtendsA")).add(extendsA).build();
 
-        assertThat(chain, is(new Chain<>("myChain", first, extendsA, last)));
+        assertEquals(new Chain<>("myChain", first, extendsA, last), chain);
     }
 
     @Test
@@ -373,7 +373,7 @@ public class ChainBuilderTest {
 
         Chain<Filter> chain = getChain().
                 add(A, before("*")).add(beforeA_and_beforeB).add(B).build();
-        assertThat(chain, is(new Chain<>("myChain", beforeA_and_beforeB, A, B)));
+        assertEquals(new Chain<>("myChain", beforeA_and_beforeB, A, B), chain);
     }
 
     @Test
@@ -385,7 +385,7 @@ public class ChainBuilderTest {
         Chain<Filter> chain = getChain().
                 add(a).add(c).add(b, after(a), before(c)).build();
 
-        assertThat(chain, is(new Chain<>("myChain", a, b, c)));
+        assertEquals(new Chain<>("myChain", a, b, c), chain);
     }
 
     private ChainBuilder<Filter> getChain() {
diff --git a/yolean/src/test/java/com/yahoo/yolean/chain/ChainTest.java b/yolean/src/test/java/com/yahoo/yolean/chain/ChainTest.java
index aa344d88f5a..da9ae2c38e3 100644
--- a/yolean/src/test/java/com/yahoo/yolean/chain/ChainTest.java
+++ b/yolean/src/test/java/com/yahoo/yolean/chain/ChainTest.java
@@ -3,9 +3,8 @@ package com.yahoo.yolean.chain;
 
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 
 /**
  * @author Tony Vaagenes
@@ -23,33 +22,33 @@ public class ChainTest {
     @Test
     public void empty_chain_toString() {
         Chain<Filter> c = new Chain<>("myChain");
-        assertThat(c.toString(), is("chain 'myChain'{}"));
+        assertEquals("chain 'myChain'{}", c.toString());
     }
 
     @Test
     public void singleton_chain_toString() {
         Chain<Filter> c = new Chain<>("myChain", new Filter());
-        assertThat(c.toString(), is("chain 'myChain'{ Filter }"));
+        assertEquals("chain 'myChain'{ Filter }", c.toString());
     }
 
     @Test
     public void chain_toString() {
         Chain<Filter> c = new Chain<>("myChain", new Filter(), new Filter(), new OtherFilter());
-        assertThat(c.toString(), is("chain 'myChain'{ Filter -> Filter -> OtherFilter }"));
+        assertEquals("chain 'myChain'{ Filter -> Filter -> OtherFilter }", c.toString());
     }
 
     @Test
     public void non_equal_due_to_different_components() {
-        assertThat(new Chain<>("a", new Filter()), is(not(new Chain<>("a", new Filter()))));
+        assertNotEquals(new Chain<>("a", new Filter()), new Chain<>("a", new Filter()));
     }
 
     @Test
     public void non_equal_due_to_different_size_comopnents() {
-        assertThat(new Chain<>("a", new Filter()), is(not(new Chain<Filter>("a"))));
+        assertNotEquals(new Chain<>("a", new Filter()), new Chain<Filter>("a"));
     }
 
     @Test
     public void hashCode_equals() {
-        assertThat(new Chain<>("a").hashCode(), is(new Chain<Filter>("a").hashCode()));
+        assertEquals(new Chain<>("a").hashCode(), new Chain<Filter>("a").hashCode());
     }
 }
diff --git a/yolean/src/test/java/com/yahoo/yolean/chain/DirectedGraphTest.java b/yolean/src/test/java/com/yahoo/yolean/chain/DirectedGraphTest.java
index 0ff600430b6..b37c57b536b 100644
--- a/yolean/src/test/java/com/yahoo/yolean/chain/DirectedGraphTest.java
+++ b/yolean/src/test/java/com/yahoo/yolean/chain/DirectedGraphTest.java
@@ -4,13 +4,14 @@ package com.yahoo.yolean.chain;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
-import static org.junit.Assert.assertThat;
+import java.util.Arrays;
+
+import static org.junit.Assert.assertTrue;
 
 public class DirectedGraphTest {
 
     private DirectedGraph graph;
-    private Vertex[] v = new Vertex[10];
+    private final Vertex[] v = new Vertex[10];
 
     @Before
     public void setup() {
@@ -26,7 +27,7 @@ public class DirectedGraphTest {
         graph.addVertex(v[0]);
         graph.addBeginningVertex(v[1]);
 
-        assertThat(graph.topologicalSort(), contains(v[1], v[0]));
+        assertTrue(graph.topologicalSort().containsAll(Arrays.asList(v[1], v[0])));
     }
 
     @Test
@@ -35,7 +36,7 @@ public class DirectedGraphTest {
         graph.addBeginningVertex(v[1]);
         graph.addEdge(v[0], v[1]);
 
-        assertThat(graph.topologicalSort(), contains(v[0], v[1]));
+        assertTrue(graph.topologicalSort().containsAll(Arrays.asList(v[0], v[1])));
     }
 
     static class TestVertex implements Vertex {
diff --git a/yolean/src/test/java/com/yahoo/yolean/chain/EnumeratedIdentitySetTest.java b/yolean/src/test/java/com/yahoo/yolean/chain/EnumeratedIdentitySetTest.java
index aded98914c5..5f0692e186f 100644
--- a/yolean/src/test/java/com/yahoo/yolean/chain/EnumeratedIdentitySetTest.java
+++ b/yolean/src/test/java/com/yahoo/yolean/chain/EnumeratedIdentitySetTest.java
@@ -16,6 +16,7 @@ import static java.util.Collections.singleton;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsEmptyCollection.empty;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
@@ -37,13 +38,13 @@ public class EnumeratedIdentitySetTest {
     @Test
     public void size() {
         EnumeratedIdentitySet<Element> set = new EnumeratedIdentitySet<>(elements);
-        assertThat(set.size(), is(elements.size()));
+        assertEquals(elements.size(), set.size());
 
         set.add(elements.get(0));
-        assertThat(set.size(), is(elements.size()));
+        assertEquals(elements.size(), set.size());
 
         set.remove(elements.get(0));
-        assertThat(set.size(), is(elements.size() - 1));
+        assertEquals(elements.size() - 1, set.size());
     }
 
     @Test
@@ -73,8 +74,8 @@ public class EnumeratedIdentitySetTest {
             count++;
         }
 
-        assertThat(collectedElements.size(), is(count));
-        assertThat(collectedElements.size(), is(elements.size()));
+        assertEquals(count, collectedElements.size());
+        assertEquals(elements.size(), collectedElements.size());
 
         for (Element element : elements) {
             assertTrue(collectedElements.containsKey(element));
@@ -150,7 +151,7 @@ public class EnumeratedIdentitySetTest {
     public void clear() {
         EnumeratedIdentitySet<Element> set = new EnumeratedIdentitySet<>(elements);
         set.clear();
-        assertThat(set, empty());
+        assertTrue(set.isEmpty());
     }
 
     @Test
@@ -195,7 +196,7 @@ public class EnumeratedIdentitySetTest {
         }
 
         List<Element> forceRenumber = set.insertionOrderedList();
-        assertThat(forceRenumber.size(), is(elements.size()));
+        assertEquals(elements.size(), forceRenumber.size());
 
         for (int i = 0; i < elements.size(); i++) {
             assertSame(forceRenumber.get(i), elements.get(i));
@@ -214,7 +215,7 @@ public class EnumeratedIdentitySetTest {
         }
 
         set.insertionOrderedList();
-        assertThat(set.numbers(), empty());
+        assertTrue(set.numbers().isEmpty());
 
         set.add(new Element());
         assertThat(set.numbers(), containsSameElements(singleton(0)));