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

14 files changed, 124 insertions, 131 deletions

diff --git a/document/src/test/java/com/yahoo/document/DocumentIdTestCase.java b/document/src/test/java/com/yahoo/document/DocumentIdTestCase.java
index a0c5da52ff7..fea3b265b6d 100644
--- a/document/src/test/java/com/yahoo/document/DocumentIdTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentIdTestCase.java
@@ -16,8 +16,10 @@ import java.io.UnsupportedEncodingException;
 import java.util.regex.Pattern;
 import java.util.Arrays;
 
+import static org.hamcrest.Matchers.containsString;
 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;
 
@@ -225,7 +227,7 @@ public class DocumentIdTestCase {
             new DocumentId(strId);
             fail("Expected an IllegalArgumentException to be thrown");
         } catch (IllegalArgumentException ex) {
-            assertTrue(ex.getMessage().contains(exceptionMsg));
+            assertThat(ex.getMessage(), containsString(exceptionMsg));
         }
     }
 
@@ -252,7 +254,7 @@ public class DocumentIdTestCase {
             DocumentId.createFromSerialized(strId);
             fail("Expected an IllegalArgumentException to be thrown");
         } catch (IllegalArgumentException ex) {
-            assertTrue(ex.getMessage().contains("illegal zero byte code point"));
+            assertThat(ex.getMessage(), containsString("illegal zero byte code point"));
         }
     }
 
diff --git a/document/src/test/java/com/yahoo/document/DocumentRemoveTestCase.java b/document/src/test/java/com/yahoo/document/DocumentRemoveTestCase.java
index 31093e8617b..8b84dc5f46b 100644
--- a/document/src/test/java/com/yahoo/document/DocumentRemoveTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentRemoveTestCase.java
@@ -3,10 +3,10 @@ package com.yahoo.document;
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertThat;
 
 /**
  * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
@@ -18,7 +18,7 @@ public class DocumentRemoveTestCase {
     public void requireThatToStringWorks() {
         DocumentId docId = new DocumentId("id:this:is::a:test");
         DocumentRemove r = new DocumentRemove(docId);
-        assertTrue(r.toString().contains(docId.toString()));
+        assertThat(r.toString().contains(docId.toString()), is(true));
     }
 
     @Test
@@ -27,18 +27,18 @@ public class DocumentRemoveTestCase {
         DocumentRemove r2 = new DocumentRemove(new DocumentId("id:this:is::a:test"));
         DocumentRemove r3 = new DocumentRemove(new DocumentId("id:this:is::nonequal"));
 
-        assertEquals(r1, r1);
-        assertEquals(r1, r2);
-        assertEquals(r2, r1);
-        assertEquals(r1.hashCode(), r2.hashCode());
+        assertThat(r1, equalTo(r1));
+        assertThat(r1, equalTo(r2));
+        assertThat(r2, equalTo(r1));
+        assertThat(r1.hashCode(), equalTo(r2.hashCode()));
 
-        assertNotEquals(r1, r3);
-        assertNotEquals(r3, r1);
-        assertNotEquals(r2, r3);
-        assertNotEquals(r3, r2);
-        assertNotEquals(r1.hashCode(), r3.hashCode());
+        assertThat(r1, not(equalTo(r3)));
+        assertThat(r3, not(equalTo(r1)));
+        assertThat(r2, not(equalTo(r3)));
+        assertThat(r3, not(equalTo(r2)));
+        assertThat(r1.hashCode(), not(equalTo(r3.hashCode())));
 
-        assertNotEquals(r1, new Object());
-        assertFalse(r1.equals("banana"));
+        assertThat(r1, not(equalTo(new Object())));
+        assertThat(r1.equals("banana"), is(false));
     }
 }
diff --git a/document/src/test/java/com/yahoo/document/DocumentTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTestCase.java
index df1a56cf8e1..be6544563ed 100644
--- a/document/src/test/java/com/yahoo/document/DocumentTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentTestCase.java
@@ -18,8 +18,10 @@ import com.yahoo.document.datatypes.Raw;
 import com.yahoo.document.datatypes.StringFieldValue;
 import com.yahoo.document.datatypes.Struct;
 import com.yahoo.document.datatypes.WeightedSet;
+import com.yahoo.document.serialization.DocumentDeserializer;
 import com.yahoo.document.serialization.DocumentDeserializerFactory;
 import com.yahoo.document.serialization.DocumentReader;
+import com.yahoo.document.serialization.DocumentSerializer;
 import com.yahoo.document.serialization.DocumentSerializerFactory;
 import com.yahoo.document.serialization.XmlDocumentWriter;
 import com.yahoo.io.GrowableByteBuffer;
@@ -31,13 +33,15 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
-import java.util.Arrays;
 import java.util.Map;
 
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.instanceOf;
 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;
 
@@ -1079,14 +1083,15 @@ public class DocumentTestCase extends DocumentTestCaseBase {
         Map<String, Object> parsed = new ObjectMapper().readValue(json, new TypeReference<Map<String, Object>>() {
         });
         assertEquals(parsed.get("id"), "id:ns:sertest::foobar");
-        assertTrue(parsed.get("fields") instanceof Map);
+        assertThat(parsed.get("fields"), instanceOf(Map.class));
         Object fieldMap = parsed.get("fields");
         if (fieldMap instanceof Map) {
             Map<?, ?> fields = (Map<?, ?>) fieldMap;
             assertEquals(fields.get("mailid"), "emailfromalicetobob");
             assertEquals(fields.get("date"), -2013512400);
-            assertTrue(fields.get("docindoc") instanceof Map);
-            assertTrue(fields.keySet().containsAll(Arrays.asList("mailid", "date", "attachmentcount", "rawfield", "weightedfield", "docindoc", "mapfield", "myboolfield")));
+            assertThat(fields.get("docindoc"), instanceOf(Map.class));
+            assertThat(fields.keySet(),
+                    containsInAnyOrder("mailid", "date", "attachmentcount", "rawfield", "weightedfield", "docindoc", "mapfield", "myboolfield"));
         }
     }
 
diff --git a/document/src/test/java/com/yahoo/document/DocumentTypeIdTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTypeIdTestCase.java
index c425ebea2c2..16f757d4379 100644
--- a/document/src/test/java/com/yahoo/document/DocumentTypeIdTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentTypeIdTestCase.java
@@ -3,10 +3,10 @@ package com.yahoo.document;
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertThat;
 
 /**
  * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
@@ -17,7 +17,7 @@ public class DocumentTypeIdTestCase {
     @Test
     public void requireThatToStringWorks() {
         DocumentTypeId r = new DocumentTypeId(123);
-        assertTrue(r.toString().contains("123"));
+        assertThat(r.toString().contains("123"), is(true));
     }
 
     @Test
@@ -26,24 +26,24 @@ public class DocumentTypeIdTestCase {
         DocumentTypeId r2 = new DocumentTypeId(123);
         DocumentTypeId r3 = new DocumentTypeId(456);
 
-        assertEquals(r1, r1);
-        assertEquals(r1, r2);
-        assertEquals(r2, r1);
-        assertEquals(r1.hashCode(), r2.hashCode());
+        assertThat(r1, equalTo(r1));
+        assertThat(r1, equalTo(r2));
+        assertThat(r2, equalTo(r1));
+        assertThat(r1.hashCode(), equalTo(r2.hashCode()));
 
-        assertNotEquals(r1, r3);
-        assertNotEquals(r3, r1);
-        assertNotEquals(r2, r3);
-        assertNotEquals(r3, r2);
-        assertNotEquals(r1.hashCode(), r3.hashCode());
+        assertThat(r1, not(equalTo(r3)));
+        assertThat(r3, not(equalTo(r1)));
+        assertThat(r2, not(equalTo(r3)));
+        assertThat(r3, not(equalTo(r2)));
+        assertThat(r1.hashCode(), not(equalTo(r3.hashCode())));
 
-        assertNotEquals(r1, new Object());
-        assertFalse(r1.equals("foobar"));
+        assertThat(r1, not(equalTo(new Object())));
+        assertThat(r1.equals("foobar"), is(false));
     }
 
     @Test
     public void requireThatAccessorsWork() {
         DocumentTypeId r1 = new DocumentTypeId(123);
-        assertEquals(123, r1.getId());
+        assertThat(r1.getId(), equalTo(123));
     }
 }
diff --git a/document/src/test/java/com/yahoo/document/FieldPathEntryTestCase.java b/document/src/test/java/com/yahoo/document/FieldPathEntryTestCase.java
index 791310ee6f2..059d65f88f8 100644
--- a/document/src/test/java/com/yahoo/document/FieldPathEntryTestCase.java
+++ b/document/src/test/java/com/yahoo/document/FieldPathEntryTestCase.java
@@ -3,8 +3,9 @@ package com.yahoo.document;
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertThat;
 
 /**
  * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
@@ -19,19 +20,19 @@ public class FieldPathEntryTestCase {
         FieldPathEntry.KeyParseResult result4 = new FieldPathEntry.KeyParseResult("banana", 3);
 
 
-        assertEquals(result1, result2);
-        assertEquals(result2, result1);
-        assertEquals(result1.hashCode(), result2.hashCode());
-        assertEquals(result1.toString(), result2.toString());
+        assertThat(result1, equalTo(result2));
+        assertThat(result2, equalTo(result1));
+        assertThat(result1.hashCode(), equalTo(result2.hashCode()));
+        assertThat(result1.toString(), equalTo(result2.toString()));
 
-        assertNotEquals(result1, result3);
-        assertNotEquals(result3, result1);
-        assertNotEquals(result1.hashCode(), result3.hashCode());
-        assertNotEquals(result1.toString(), result3.toString());
+        assertThat(result1, not(equalTo(result3)));
+        assertThat(result3, not(equalTo(result1)));
+        assertThat(result1.hashCode(), not(equalTo(result3.hashCode())));
+        assertThat(result1.toString(), not(equalTo(result3.toString())));
 
-        assertNotEquals(result1, result4);
-        assertNotEquals(result4, result1);
-        assertNotEquals(result1.hashCode(), result4.hashCode());
-        assertNotEquals(result1.toString(), result4.toString());
+        assertThat(result1, not(equalTo(result4)));
+        assertThat(result4, not(equalTo(result1)));
+        assertThat(result1.hashCode(), not(equalTo(result4.hashCode())));
+        assertThat(result1.toString(), not(equalTo(result4.toString())));
     }
 }
diff --git a/document/src/test/java/com/yahoo/document/NumericDataTypeTestCase.java b/document/src/test/java/com/yahoo/document/NumericDataTypeTestCase.java
index 28f6f682755..05f68570e60 100644
--- a/document/src/test/java/com/yahoo/document/NumericDataTypeTestCase.java
+++ b/document/src/test/java/com/yahoo/document/NumericDataTypeTestCase.java
@@ -5,9 +5,8 @@ import com.yahoo.document.datatypes.FieldValue;
 import com.yahoo.document.datatypes.IntegerFieldValue;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.fail;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
 
 /**
  * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
@@ -19,8 +18,8 @@ public class NumericDataTypeTestCase {
     public void basic() {
         NumericDataType type = new NumericDataType("foo", 0, FieldValue.class, IntegerFieldValue.getFactory());
         NumericDataType clonedType = type.clone();
-        assertEquals(type,clonedType);
-        assertNotSame(type, clonedType);
+        assertThat(type, equalTo(clonedType));
+        assertThat(type, not(sameInstance(clonedType)));
     }
 
     @Test
diff --git a/document/src/test/java/com/yahoo/document/TemporaryDataTypeTestCase.java b/document/src/test/java/com/yahoo/document/TemporaryDataTypeTestCase.java
index 663ea96f40f..4a4895b7e78 100644
--- a/document/src/test/java/com/yahoo/document/TemporaryDataTypeTestCase.java
+++ b/document/src/test/java/com/yahoo/document/TemporaryDataTypeTestCase.java
@@ -4,8 +4,9 @@ package com.yahoo.document;
 import com.yahoo.document.datatypes.StringFieldValue;
 import org.junit.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
 
 /**
  * @author Einar M R Rosenvinge
@@ -15,10 +16,10 @@ public class TemporaryDataTypeTestCase {
     @Test
     public void requireNulls() {
         TemporaryDataType type = new TemporaryDataType(0, "");
-        assertNull(type.createFieldValue(new Object()));
-        assertNull(type.createFieldValue());
-        assertNull(type.getValueClass());
-        assertFalse(type.isValueCompatible(new StringFieldValue("")));
+        assertThat(type.createFieldValue(new Object()), nullValue());
+        assertThat(type.createFieldValue(), nullValue());
+        assertThat(type.getValueClass(), nullValue());
+        assertThat(type.isValueCompatible(new StringFieldValue("")), is(false));
     }
 
 }
diff --git a/document/src/test/java/com/yahoo/document/TemporaryStructuredDataTypeTestCase.java b/document/src/test/java/com/yahoo/document/TemporaryStructuredDataTypeTestCase.java
index 431d4d9746c..d785faa146a 100644
--- a/document/src/test/java/com/yahoo/document/TemporaryStructuredDataTypeTestCase.java
+++ b/document/src/test/java/com/yahoo/document/TemporaryStructuredDataTypeTestCase.java
@@ -3,8 +3,9 @@ package com.yahoo.document;
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertThat;
 
 /**
  * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
@@ -14,10 +15,10 @@ public class TemporaryStructuredDataTypeTestCase {
     @Test
     public void basic() {
         TemporaryStructuredDataType type = TemporaryStructuredDataType.create("banana");
-        assertEquals("banana", type.getName());
+        assertThat(type.getName(), equalTo("banana"));
         int originalId = type.getId();
         type.setName("apple");
-        assertEquals("apple", type.getName());
-        assertNotEquals(originalId, type.getId());
+        assertThat(type.getName(), equalTo("apple"));
+        assertThat(originalId, not(equalTo(type.getId())));
     }
 }
diff --git a/document/src/test/java/com/yahoo/document/annotation/Bug4475379TestCase.java b/document/src/test/java/com/yahoo/document/annotation/Bug4475379TestCase.java
index 3d2a1fd2d90..6ca076ad3c6 100755
--- a/document/src/test/java/com/yahoo/document/annotation/Bug4475379TestCase.java
+++ b/document/src/test/java/com/yahoo/document/annotation/Bug4475379TestCase.java
@@ -13,7 +13,8 @@ import org.junit.Test;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
 
 /**
  * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
@@ -31,7 +32,7 @@ public class Bug4475379TestCase {
         annotate(manager, doc);
 
         Document anotherDoc = doc.clone();
-        assertEquals(doc, anotherDoc);
+        assertThat(doc, equalTo(anotherDoc));
     }
 
     public void annotate(DocumentTypeManager manager, Document document) {
diff --git a/document/src/test/java/com/yahoo/document/annotation/DummySpanNodeTestCase.java b/document/src/test/java/com/yahoo/document/annotation/DummySpanNodeTestCase.java
index 3566117b33d..d2c35f45ad8 100644
--- a/document/src/test/java/com/yahoo/document/annotation/DummySpanNodeTestCase.java
+++ b/document/src/test/java/com/yahoo/document/annotation/DummySpanNodeTestCase.java
@@ -3,10 +3,9 @@ package com.yahoo.document.annotation;
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
 
 /**
  * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
@@ -17,14 +16,14 @@ public class DummySpanNodeTestCase {
     @Test
     public void basic() {
         DummySpanNode node = DummySpanNode.INSTANCE;
-        assertEquals(0, node.getFrom());
-        assertEquals(0, node.getTo());
-        assertEquals(0, node.getLength());
-        assertNull(node.getText("baba"));
-        assertTrue(node.isLeafNode());
-        assertFalse(node.childIterator().hasNext());
-        assertFalse(node.childIterator().hasPrevious());
-        assertFalse(node.childIteratorRecursive().hasNext());
-        assertFalse(node.childIteratorRecursive().hasPrevious());
+        assertThat(node.getFrom(), is(0));
+        assertThat(node.getTo(), is(0));
+        assertThat(node.getLength(), is(0));
+        assertThat(node.getText("baba"), nullValue());
+        assertThat(node.isLeafNode(), is(true));
+        assertThat(node.childIterator().hasNext(), is(false));
+        assertThat(node.childIterator().hasPrevious(), is(false));
+        assertThat(node.childIteratorRecursive().hasNext(), is(false));
+        assertThat(node.childIteratorRecursive().hasPrevious(), is(false));
     }
 }
diff --git a/document/src/test/java/com/yahoo/document/annotation/IndexKeySpanTreeTestCase.java b/document/src/test/java/com/yahoo/document/annotation/IndexKeySpanTreeTestCase.java
index 8c5a481764d..3b403680577 100644
--- a/document/src/test/java/com/yahoo/document/annotation/IndexKeySpanTreeTestCase.java
+++ b/document/src/test/java/com/yahoo/document/annotation/IndexKeySpanTreeTestCase.java
@@ -3,8 +3,8 @@ package com.yahoo.document.annotation;
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
 
 /**
  * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
@@ -14,27 +14,27 @@ public class IndexKeySpanTreeTestCase {
     @Test
     public void testIndexKeys() throws Exception {
         SpanTree tree = new SpanTree("something");
-        assertTrue(tree.getCurrentIndexes().isEmpty());
+        assertThat(tree.getCurrentIndexes().isEmpty(), is(true));
 
         tree.createIndex(SpanTree.IndexKey.SPAN_NODE);
-        assertEquals(1, tree.getCurrentIndexes().size());
-        assertEquals(SpanTree.IndexKey.SPAN_NODE, tree.getCurrentIndexes().iterator().next());
+        assertThat(tree.getCurrentIndexes().size(), is(1));
+        assertThat(tree.getCurrentIndexes().iterator().next(), is(SpanTree.IndexKey.SPAN_NODE));
 
         tree.clearIndexes();
-        assertTrue(tree.getCurrentIndexes().isEmpty());
+        assertThat(tree.getCurrentIndexes().isEmpty(), is(true));
 
         tree.createIndex(SpanTree.IndexKey.ANNOTATION_TYPE);
-        assertEquals(1, tree.getCurrentIndexes().size());
-        assertEquals(SpanTree.IndexKey.ANNOTATION_TYPE, tree.getCurrentIndexes().iterator().next());
+        assertThat(tree.getCurrentIndexes().size(), is(1));
+        assertThat(tree.getCurrentIndexes().iterator().next(), is(SpanTree.IndexKey.ANNOTATION_TYPE));
 
         tree.clearIndexes();
-        assertTrue(tree.getCurrentIndexes().isEmpty());
+        assertThat(tree.getCurrentIndexes().isEmpty(), is(true));
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testSwitchIndexes()  {
         SpanTree tree = new SpanTree("something");
-        assertTrue(tree.getCurrentIndexes().isEmpty());
+        assertThat(tree.getCurrentIndexes().isEmpty(), is(true));
         tree.createIndex(SpanTree.IndexKey.SPAN_NODE);
         tree.createIndex(SpanTree.IndexKey.ANNOTATION_TYPE);
     }
@@ -42,7 +42,7 @@ public class IndexKeySpanTreeTestCase {
     @Test(expected = IllegalArgumentException.class)
     public void testSwitchIndexes2()  {
         SpanTree tree = new SpanTree("something");
-        assertTrue(tree.getCurrentIndexes().isEmpty());
+        assertThat(tree.getCurrentIndexes().isEmpty(), is(true));
         tree.createIndex(SpanTree.IndexKey.ANNOTATION_TYPE);
         tree.createIndex(SpanTree.IndexKey.SPAN_NODE);
     }
@@ -50,7 +50,7 @@ public class IndexKeySpanTreeTestCase {
     @Test
     public void testSwitchIndexes3()  {
         SpanTree tree = new SpanTree("something");
-        assertTrue(tree.getCurrentIndexes().isEmpty());
+        assertThat(tree.getCurrentIndexes().isEmpty(), is(true));
         tree.createIndex(SpanTree.IndexKey.ANNOTATION_TYPE);
         tree.clearIndex(SpanTree.IndexKey.SPAN_NODE);
     }
diff --git a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
index 522176d7504..c191851acbe 100644
--- a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
+++ b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
@@ -79,10 +79,13 @@ import static com.yahoo.document.json.readers.SingleValueReader.UPDATE_DIVIDE;
 import static com.yahoo.document.json.readers.SingleValueReader.UPDATE_INCREMENT;
 import static com.yahoo.document.json.readers.SingleValueReader.UPDATE_MULTIPLY;
 import static com.yahoo.test.json.JsonTestHelper.inputJson;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -794,8 +797,8 @@ public class JsonReaderTestCase {
         d = r.next();
         DocumentUpdate update = (DocumentUpdate) d;
         checkSimpleArrayAdd(update);
-        assertTrue(update.getCreateIfNonExistent());
-        assertEquals("bla", update.getCondition().getSelection());
+        assertThat(update.getCreateIfNonExistent(), is(true));
+        assertThat(update.getCondition().getSelection(), is("bla"));
 
         d = r.next();
         DocumentRemove remove = (DocumentRemove) d;
@@ -830,8 +833,8 @@ public class JsonReaderTestCase {
         for (int x = 0; x < documentsCreated; x++) {
             DocumentUpdate update = (DocumentUpdate) r.next();
             checkSimpleArrayAdd(update);
-            assertTrue(update.getCreateIfNonExistent());
-            assertEquals("bla", update.getCondition().getSelection());
+            assertThat(update.getCreateIfNonExistent(), is(true));
+            assertThat(update.getCondition().getSelection(), is("bla"));
 
         }
 
@@ -1777,7 +1780,7 @@ public class JsonReaderTestCase {
     @Test
     public void requireThatUnknownDocTypeThrowsIllegalArgumentException() {
         exception.expect(IllegalArgumentException.class);
-        exception.expectMessage("Document type walrus does not exist");
+        exception.expectMessage(containsString("Document type walrus does not exist"));
 
         final String jsonData = inputJson(
                 "[",
@@ -1959,7 +1962,7 @@ public class JsonReaderTestCase {
     // NOTE: Do not call this method multiple times from a test method as it's using the ExpectedException rule
     private void assertParserErrorMatches(String expectedError, String... json) {
         exception.expect(JsonReaderException.class);
-        exception.expectMessage(expectedError);
+        exception.expectMessage(containsString(expectedError));
         String jsonData = inputJson(json);
         new JsonReader(types, jsonToInputStream(jsonData), parserFactory).next();
     }
diff --git a/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java b/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java
index feeac3d9da0..d1f02ae45e2 100644
--- a/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java
+++ b/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java
@@ -1,28 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.select;
 
-import com.yahoo.document.ArrayDataType;
-import com.yahoo.document.DataType;
-import com.yahoo.document.Document;
-import com.yahoo.document.DocumentGet;
-import com.yahoo.document.DocumentId;
-import com.yahoo.document.DocumentOperation;
-import com.yahoo.document.DocumentPut;
-import com.yahoo.document.DocumentRemove;
-import com.yahoo.document.DocumentType;
-import com.yahoo.document.DocumentTypeManager;
-import com.yahoo.document.DocumentUpdate;
-import com.yahoo.document.Field;
-import com.yahoo.document.MapDataType;
-import com.yahoo.document.StructDataType;
-import com.yahoo.document.WeightedSetDataType;
-import com.yahoo.document.datatypes.Array;
-import com.yahoo.document.datatypes.FloatFieldValue;
-import com.yahoo.document.datatypes.IntegerFieldValue;
-import com.yahoo.document.datatypes.MapFieldValue;
-import com.yahoo.document.datatypes.StringFieldValue;
-import com.yahoo.document.datatypes.Struct;
-import com.yahoo.document.datatypes.WeightedSet;
+import com.yahoo.document.*;
+import com.yahoo.document.datatypes.*;
 import com.yahoo.document.select.convert.SelectionExpressionConverter;
 import com.yahoo.document.select.parser.ParseException;
 import com.yahoo.document.select.parser.TokenMgrException;
@@ -52,7 +32,7 @@ public class DocumentSelectorTestCase {
     @Rule
     public final ExpectedException exceptionRule = ExpectedException.none();
 
-    private static final DocumentTypeManager manager = new DocumentTypeManager();
+    private static DocumentTypeManager manager = new DocumentTypeManager();
 
     @Before
     public void setUp() {
diff --git a/document/src/test/java/com/yahoo/vespaxmlparser/XMLNumericFieldErrorMsgTestCase.java b/document/src/test/java/com/yahoo/vespaxmlparser/XMLNumericFieldErrorMsgTestCase.java
index 3c93dc1429d..298960ff8ba 100644
--- a/document/src/test/java/com/yahoo/vespaxmlparser/XMLNumericFieldErrorMsgTestCase.java
+++ b/document/src/test/java/com/yahoo/vespaxmlparser/XMLNumericFieldErrorMsgTestCase.java
@@ -11,7 +11,8 @@ import org.junit.Test;
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
 /**
@@ -43,7 +44,7 @@ public class XMLNumericFieldErrorMsgTestCase {
             new Document(documentReader);
             fail("Sorry mac");
         } catch (DeserializationException e) {
-            assertTrue(e.getMessage().contains("Field 'floatfield': Invalid float \"\""));
+            assertThat(e.getMessage(), e.getMessage().contains("Field 'floatfield': Invalid float \"\""), is(true));
         }
     }
 
@@ -58,7 +59,7 @@ public class XMLNumericFieldErrorMsgTestCase {
             new Document(documentReader);
             fail("Sorry mac");
         } catch (DeserializationException e) {
-            assertTrue(e.getMessage().contains("Field 'doublefield': Invalid double \"\""));
+            assertThat(e.getMessage(), e.getMessage().contains("Field 'doublefield': Invalid double \"\""), is(true));
         }
     }
 
@@ -73,7 +74,7 @@ public class XMLNumericFieldErrorMsgTestCase {
             new Document(documentReader);
             fail("Sorry mac");
         } catch (DeserializationException e) {
-            assertTrue(e.getMessage().contains("Field 'longfield': Invalid long \"\""));
+            assertThat(e.getMessage(), e.getMessage().contains("Field 'longfield': Invalid long \"\""), is(true));
         }
     }
 
@@ -88,7 +89,7 @@ public class XMLNumericFieldErrorMsgTestCase {
             new Document(documentReader);
             fail("Sorry mac");
         } catch (DeserializationException e) {
-            assertTrue(e.getMessage().contains("Field 'intfield': Invalid integer \"\""));
+            assertThat(e.getMessage(), e.getMessage().contains("Field 'intfield': Invalid integer \"\""), is(true));
         }
     }
 
@@ -103,7 +104,7 @@ public class XMLNumericFieldErrorMsgTestCase {
             new Document(documentReader);
             fail("Sorry mac");
         } catch (DeserializationException e) {
-            assertTrue(e.getMessage().contains("Field 'bytefield': Invalid byte \"\""));
+            assertThat(e.getMessage(), e.getMessage().contains("Field 'bytefield': Invalid byte \"\""), is(true));
         }
     }