Reduce usage of assertThat that is deprecated in junit 4.13.2

11 files changed, 109 insertions, 125 deletions

diff --git a/config-lib/src/test/java/com/yahoo/config/ConfigInstanceBuilderTest.java b/config-lib/src/test/java/com/yahoo/config/ConfigInstanceBuilderTest.java
index 7b2c2757b56..613cfe1cced 100644
--- a/config-lib/src/test/java/com/yahoo/config/ConfigInstanceBuilderTest.java
+++ b/config-lib/src/test/java/com/yahoo/config/ConfigInstanceBuilderTest.java
@@ -26,14 +26,10 @@ import static com.yahoo.test.FunctionTestConfig.RootStruct;
 import static com.yahoo.test.FunctionTestConfig.MyStructMap;
 import static com.yahoo.foo.MaptypesConfig.Innermap;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.startsWith;
 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;
 
 /**
@@ -51,8 +47,8 @@ public class ConfigInstanceBuilderTest
                 .gender(FEMALE);
 
         StructtypesConfig config = builder.build();
-        assertThat(config.simple().name(), is("myname"));
-        assertThat(config.simple().gender(), is(FEMALE));
+        assertEquals("myname", config.simple().name());
+        assertEquals(FEMALE, config.simple().gender());
     }
 
     @Test
@@ -65,8 +61,8 @@ public class ConfigInstanceBuilderTest
         builder.intmap(newMap);
 
         MaptypesConfig config = new MaptypesConfig(builder);
-        assertThat(config.intmap("one"), is(1));
-        assertThat(config.intmap("two"), is(2));
+        assertEquals(1, config.intmap("one"));
+        assertEquals(2, config.intmap("two"));
     }
 
     @Test
@@ -80,8 +76,8 @@ public class ConfigInstanceBuilderTest
         builder.innermap(newMap);
 
         MaptypesConfig config = new MaptypesConfig(builder);
-        assertThat(config.innermap("one").foo(), is(1));
-        assertThat(config.innermap("two").foo(), is(2));
+        assertEquals(1, config.innermap("one").foo());
+        assertEquals(2, config.innermap("two").foo());
     }
 
     @Test
@@ -262,12 +258,12 @@ public class ConfigInstanceBuilderTest
         assertEquals("etc", config.fileVal().value());
         assertEquals(1, config.boolarr().size());
         assertEquals(1, config.boolarr().size());  // new api with accessor for a List of the original Java type
-        assertEquals(false, config.boolarr().get(0));  // new List api
-        assertEquals(false, config.boolarr(0));        // short-hand
+        assertFalse(config.boolarr().get(0));  // new List api
+        assertFalse(config.boolarr(0));        // short-hand
         assertEquals(0, config.intarr().size());
         assertEquals(2, config.longarr().size());
         assertEquals(Long.MAX_VALUE, config.longarr(0));
-        assertThat(config.longarr().get(1), is(Long.MIN_VALUE));
+        assertEquals(Long.MIN_VALUE, config.longarr().get(1).longValue());
         assertEquals(2, config.doublearr().size());
         assertEquals(1, config.stringarr().size());
         assertEquals(1, config.enumarr().size());
@@ -279,25 +275,25 @@ public class ConfigInstanceBuilderTest
         assertEquals("parent:", config.refarr(2));
         assertEquals("bin", config.fileArr(0).value());
 
-        assertThat(config.intMap("one"), is(1));
-        assertThat(config.intMap("two"), is(2));
-        assertThat(config.stringMap("one"), is("first"));
-        assertThat(config.filemap("f1").value(), is("/var"));
-        assertThat(config.filemap("f2").value(), is("/store"));
+        assertEquals(1, config.intMap("one"));
+        assertEquals(2, config.intMap("two"));
+        assertEquals("first", config.stringMap("one"));
+        assertEquals("/var", config.filemap("f1").value());
+        assertEquals("/store", config.filemap("f2").value());
         assertEquals("basicFoo", config.basicStruct().foo());
         assertEquals(3, config.basicStruct().bar());  // new List api
         assertEquals(2, config.basicStruct().intArr().size());
-        assertThat(config.basicStruct().intArr().get(0), is(310));  // new List api
-        assertThat(config.basicStruct().intArr().get(1), is(311));  // new List api
+        assertEquals(310, config.basicStruct().intArr().get(0).intValue());  // new List api
+        assertEquals(311, config.basicStruct().intArr().get(1).intValue());  // new List api
         assertEquals(310, config.basicStruct().intArr(0));          // short-hand
         assertEquals("inner0", config.rootStruct().inner0().name());  // new List api
         assertEquals(11, config.rootStruct().inner0().index());
         assertEquals("inner1", config.rootStruct().inner1().name());
         assertEquals(12, config.rootStruct().inner1().index());
         assertEquals(2, config.rootStruct().innerArr().size());
-        assertEquals(true, config.rootStruct().innerArr(0).boolVal());
+        assertTrue(config.rootStruct().innerArr(0).boolVal());
         assertEquals("deep", config.rootStruct().innerArr(0).stringVal());
-        assertEquals(false, config.rootStruct().innerArr(1).boolVal());
+        assertFalse(config.rootStruct().innerArr(1).boolVal());
         assertEquals("blue a=\"escaped\"", config.rootStruct().innerArr(1).stringVal());
 
         assertEquals(2, config.myarray().size());  // new List api
@@ -311,12 +307,12 @@ public class ConfigInstanceBuilderTest
         assertEquals(-1, config.myarray(1).myStruct().a());
         assertEquals(-2, config.myarray(1).myStruct().b());
 
-        assertThat(config.myStructMap("one").myInt(), is(1));
-        assertThat(config.myStructMap("one").myString(), is("bull"));
-        assertThat(config.myStructMap("one").myIntDef(), is(2));
-        assertThat(config.myStructMap("one").myStringDef(), is("bear"));
-        assertThat(config.myStructMap("one").anotherMap("anotherOne").anInt(), is(3));
-        assertThat(config.myStructMap("one").anotherMap("anotherOne").anIntDef(), is(4));
+        assertEquals(1, config.myStructMap("one").myInt());
+        assertEquals("bull", config.myStructMap("one").myString());
+        assertEquals(2, config.myStructMap("one").myIntDef());
+        assertEquals("bear", config.myStructMap("one").myStringDef());
+        assertEquals(3, config.myStructMap("one").anotherMap("anotherOne").anInt());
+        assertEquals(4, config.myStructMap("one").anotherMap("anotherOne").anIntDef());
     }
 
     private boolean callContainsFieldsFlaggedWithRestart(Class<?> configClass)
@@ -372,9 +368,8 @@ public class ConfigInstanceBuilderTest
         report = callGetChangesRequiringRestart(function1, function2);
         assertTrue(report.needsRestart());
         assertEquals("function-test", report.getName());
-        assertThat(
-                report.toString(),
-                startsWith(
+        assertTrue(
+                report.toString().startsWith(
                     "# An int value\n" +
                     "# Also test that multiline comments\n" +
                     "# work.\n" +
@@ -398,9 +393,8 @@ public class ConfigInstanceBuilderTest
                 )
         );
 
-        assertThat(
-                report.toString(),
-                containsString(
+        assertTrue(
+                report.toString().contains(
                      "function-test.myStructMap{one}.myInt has changed from 1 to 42\n" +
                      "function-test.myStructMap{new} was added with value \n"
                 )
@@ -410,9 +404,8 @@ public class ConfigInstanceBuilderTest
         FunctionTestConfig function3 = new FunctionTestConfig(funcBuilder);
         report = callGetChangesRequiringRestart(function2, function3);
         assertEquals(1, report.getReportLines().size());
-        assertThat(
-                report.toString(),
-                containsString("function-test.myStructMap{one} with value \n")
+        assertTrue(
+                report.toString().contains("function-test.myStructMap{one} with value \n")
         );
     }
 }
diff --git a/config-lib/src/test/java/com/yahoo/config/ConfigInstanceEqualsTest.java b/config-lib/src/test/java/com/yahoo/config/ConfigInstanceEqualsTest.java
index 1ca33b8628a..536c18786da 100644
--- a/config-lib/src/test/java/com/yahoo/config/ConfigInstanceEqualsTest.java
+++ b/config-lib/src/test/java/com/yahoo/config/ConfigInstanceEqualsTest.java
@@ -14,10 +14,8 @@ import static com.yahoo.test.FunctionTestConfig.Enum_val;
 import static com.yahoo.test.FunctionTestConfig.Enumarr;
 import static com.yahoo.test.FunctionTestConfig.Myarray;
 import static com.yahoo.test.FunctionTestConfig.RootStruct;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 
 public class ConfigInstanceEqualsTest {
     FunctionTestConfig config1;
@@ -33,90 +31,90 @@ public class ConfigInstanceEqualsTest {
 
     @Test
     public void require_same_hashCode_for_equal_instances() {
-        assertThat(config1.hashCode(), is(config2.hashCode()));
+        assertEquals(config1.hashCode(), config2.hashCode());
     }
 
     @Test
     public void require_true_for_equal_instances() {
-        assertThat(config1, is(config2));
+        assertEquals(config1, config2);
     }
 
     @Test
     public void require_false_for_null() {
-        assertThat(config1, not((FunctionTestConfig) null));
+        assertNotEquals(null, config1);
 
     }
 
     @Test
     public void require_false_for_different_subclass() {
-        assertFalse(config1.equals(new AppConfig(new AppConfig.Builder())));
+        assertNotEquals(config1, new AppConfig(new AppConfig.Builder()));
     }
 
     @Test
     public void require_false_for_different_scalars_at_root_node() {
-        assertThat(config1, not(new FunctionTestConfig(newBuilder().bool_val(true))));
-        assertThat(config1, not(new FunctionTestConfig(newBuilder().int_val(0))));
-        assertThat(config1, not(new FunctionTestConfig(newBuilder().long_val(0L))));
-        assertThat(config1, not(new FunctionTestConfig(newBuilder().double_val(0.0))));
-        assertThat(config1, not(new FunctionTestConfig(newBuilder().string_val(""))));
-        assertThat(config1, not(new FunctionTestConfig(newBuilder().enum_val(Enum_val.FOO))));
-        assertThat(config1, not(new FunctionTestConfig(newBuilder().refval(""))));
-        assertThat(config1, not(new FunctionTestConfig(newBuilder().fileVal(""))));
+        assertNotEquals(config1, new FunctionTestConfig(newBuilder().bool_val(true)));
+        assertNotEquals(config1, new FunctionTestConfig(newBuilder().int_val(0)));
+        assertNotEquals(config1, new FunctionTestConfig(newBuilder().long_val(0L)));
+        assertNotEquals(config1, new FunctionTestConfig(newBuilder().double_val(0.0)));
+        assertNotEquals(config1, new FunctionTestConfig(newBuilder().string_val("")));
+        assertNotEquals(config1, new FunctionTestConfig(newBuilder().enum_val(Enum_val.FOO)));
+        assertNotEquals(config1, new FunctionTestConfig(newBuilder().refval("")));
+        assertNotEquals(config1, new FunctionTestConfig(newBuilder().fileVal("")));
     }
 
     @Test
     public void require_false_for_different_leaf_array_at_root_node() {
         builder2.longarr.set(0, 0L);
-        assertThat(config1, not(new FunctionTestConfig(builder2)));
+        assertNotEquals(config1, new FunctionTestConfig(builder2));
     }
 
     @Test
     public void require_false_for_different_scalar_in_struct() {
         builder2.basicStruct(new BasicStruct.Builder(config1.basicStruct()).bar(0));
-        assertThat(config1, not(new FunctionTestConfig(builder2)));
+        assertNotEquals(config1, new FunctionTestConfig(builder2));
     }
 
     @Test
     public void require_false_for_different_scalar_in_inner_array() {
         builder2.myarray.get(0).intval(0);
-        assertThat(config1, not(new FunctionTestConfig(builder2)));
+        assertNotEquals(config1, new FunctionTestConfig(builder2));
     }
 
     @Test
     public void require_false_for_different_leaf_array_in_inner_array() {
         builder2.myarray.get(0).stringval.set(0, "");
-        assertThat(config1, not(new FunctionTestConfig(builder2)));
+        assertNotEquals(config1, new FunctionTestConfig(builder2));
     }
 
     @Test
     public void require_equal_structs_for_equal_configs() {
-        assertThat(config1.basicStruct(), is(config2.basicStruct()));
-        assertThat(config1.rootStruct(), is(config2.rootStruct()));
-        assertThat(config1.rootStruct().inner0(), is(config2.rootStruct().inner0()));
+        assertEquals(config1.basicStruct(), config2.basicStruct());
+        assertEquals(config1.rootStruct(), config2.rootStruct());
+        assertEquals(config1.rootStruct().inner0(), config2.rootStruct().inner0());
     }
 
     @Test
     public void require_equal_inner_arrays_for_equal_configs() {
-        assertThat(config1.myarray(), is(config2.myarray()));
-        assertThat(config1.myarray(0).anotherarray(), is(config2.myarray(0).anotherarray()));
+        assertEquals(config1.myarray(), config2.myarray());
+        assertEquals(config1.myarray(0).anotherarray(), config2.myarray(0).anotherarray());
     }
 
     @Test
     public void require_equal_inner_array_elements_for_equal_configs() {
-        assertThat(config1.myarray(0), is(config2.myarray(0)));
-        assertThat(config1.myarray(0).anotherarray(0), is(config2.myarray(0).anotherarray(0)));
+        assertEquals(config1.myarray(0), config2.myarray(0));
+        assertEquals(config1.myarray(0).anotherarray(0), config2.myarray(0).anotherarray(0));
     }
 
     @Test
     public void require_equal_leaf_arrays_for_equal_configs() {
-        assertThat(config1.intarr(), is(config2.intarr()));
-        assertThat(config1.boolarr(), is(config2.boolarr()));
-        assertThat(config1.longarr(), is(config2.longarr()));
-        assertThat(config1.doublearr(), is(config2.doublearr()));
-        assertThat(config1.stringarr(), is(config2.stringarr()));
-        assertThat(config1.enumarr(), is(config2.enumarr()));
-        assertThat(config1.refarr(), is(config2.refarr()));
-        assertThat(config1.fileArr(), is(config2.fileArr()));
+        assertEquals(config1.intarr(), config2.intarr());
+        assertEquals(config1.boolarr(), config2.boolarr());
+        assertEquals(config1.longarr(), config2.longarr());
+        assertEquals(config1.doublearr(), config2.doublearr());
+        assertEquals(config1.stringarr(), config2.stringarr());
+        assertEquals(config1.enumarr(), config2.enumarr());
+        assertEquals(config1.refarr(), config2.refarr());
+        assertEquals(config1.fileArr(), config2.fileArr());
     }
 
     private static FunctionTestConfig.Builder newBuilder() {
diff --git a/config-lib/src/test/java/com/yahoo/config/EnumNodeTest.java b/config-lib/src/test/java/com/yahoo/config/EnumNodeTest.java
index b9ebaf1f4dd..fac765f40aa 100644
--- a/config-lib/src/test/java/com/yahoo/config/EnumNodeTest.java
+++ b/config-lib/src/test/java/com/yahoo/config/EnumNodeTest.java
@@ -3,8 +3,10 @@ package com.yahoo.config;
 
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author Ulf Lilleengen
@@ -31,10 +33,10 @@ public class EnumNodeTest {
     public void testEnumNode() {
         MyNode n = new MyNode();
         assertNull(n.getValue());
-        assertThat(n.toString(), is("(null)"));
+        assertEquals("(null)", n.toString());
         assertTrue(n.doSetValue("ONE"));
-        assertThat(n.getValue(), is("ONE"));
-        assertThat(n.toString(), is("ONE"));
+        assertEquals("ONE", n.getValue());
+        assertEquals("ONE", n.toString());
         assertFalse(n.doSetValue("THREE"));
     }
 }
diff --git a/config-lib/src/test/java/com/yahoo/config/FileNodeTest.java b/config-lib/src/test/java/com/yahoo/config/FileNodeTest.java
index 67edf5e9631..56dd7dd116d 100644
--- a/config-lib/src/test/java/com/yahoo/config/FileNodeTest.java
+++ b/config-lib/src/test/java/com/yahoo/config/FileNodeTest.java
@@ -3,9 +3,7 @@ package com.yahoo.config;
 
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -16,11 +14,11 @@ public class FileNodeTest {
     @Test
     public void testSetValue() {
         FileNode n = new FileNode();
-        assertThat(n.toString(), is("(null)"));
+        assertEquals("(null)", n.toString());
         assertTrue(n.doSetValue("foo.txt"));
-        assertThat(n.value().value(), is("foo.txt"));
+        assertEquals("foo.txt", n.value().value());
         assertTrue(n.doSetValue("\"foo.txt\""));
-        assertThat(n.value().value(), is("foo.txt"));
-        assertThat(n.toString(), is("\"foo.txt\""));
+        assertEquals("foo.txt", n.value().value());
+        assertEquals("\"foo.txt\"", n.toString());
     }
 }
diff --git a/config-lib/src/test/java/com/yahoo/config/IntegerNodeTest.java b/config-lib/src/test/java/com/yahoo/config/IntegerNodeTest.java
index c8404b8791e..899e34edce4 100644
--- a/config-lib/src/test/java/com/yahoo/config/IntegerNodeTest.java
+++ b/config-lib/src/test/java/com/yahoo/config/IntegerNodeTest.java
@@ -3,9 +3,8 @@ package com.yahoo.config;
 
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.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;
 
 /**
@@ -18,6 +17,6 @@ public class IntegerNodeTest {
         IntegerNode n = new IntegerNode();
         assertFalse(n.setValue("invalid"));
         assertTrue(n.setValue("10"));
-        assertThat(n.value(), is(10));
+        assertEquals(10, n.value().intValue());
     }
 }
diff --git a/config-lib/src/test/java/com/yahoo/config/LongNodeTest.java b/config-lib/src/test/java/com/yahoo/config/LongNodeTest.java
index c3f9ff9ae8f..fc603ba65ac 100644
--- a/config-lib/src/test/java/com/yahoo/config/LongNodeTest.java
+++ b/config-lib/src/test/java/com/yahoo/config/LongNodeTest.java
@@ -3,9 +3,8 @@ package com.yahoo.config;
 
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -18,6 +17,6 @@ public class LongNodeTest {
         LongNode n = new LongNode();
         assertFalse(n.setValue("invalid"));
         assertTrue(n.setValue("10"));
-        assertThat(n.value(), is(10l));
+        assertEquals(10L, n.value().longValue());
     }
 }
diff --git a/config-lib/src/test/java/com/yahoo/config/NodeVectorTest.java b/config-lib/src/test/java/com/yahoo/config/NodeVectorTest.java
index cb9bd65c406..9637ab25278 100644
--- a/config-lib/src/test/java/com/yahoo/config/NodeVectorTest.java
+++ b/config-lib/src/test/java/com/yahoo/config/NodeVectorTest.java
@@ -5,9 +5,8 @@ import org.junit.Test;
 
 import java.util.Arrays;
 
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -61,10 +60,10 @@ public class NodeVectorTest {
         StringNode val = new StringNode("foo");
         TestNodeVector v = new TestNodeVector(val.getValue());
         assertFalse(v.isEmpty());
-        assertThat(v.indexOf(val), is(0));
-        assertThat(v.indexOf(barNode()), is(-1));
-        assertThat(v.lastIndexOf(val), is(0));
-        assertThat(v.lastIndexOf(barNode()), is(-1));
+        assertEquals(0, v.indexOf(val));
+        assertEquals(-1, v.indexOf(barNode()));
+        assertEquals(0, v.lastIndexOf(val));
+        assertEquals(-1, v.lastIndexOf(barNode()));
     }
 
     @Test
@@ -82,11 +81,11 @@ public class NodeVectorTest {
     public void require_that_sublisting_works() {
         String val = "foo";
         TestNodeVector v = new TestNodeVector(val, val, val);
-        assertThat(v.subList(0, 1).size(), is(1));
-        assertThat(v.subList(0, 2).size(), is(2));
-        assertThat(v.subList(0, 3).size(), is(3));
+        assertEquals(1, v.subList(0, 1).size());
+        assertEquals(2, v.subList(0, 2).size());
+        assertEquals(3, v.subList(0, 3).size());
         StringNode[] vals = v.toArray(new StringNode[0]);
-        assertThat(vals.length, is(3));
+        assertEquals(3, vals.length);
     }
 
     private StringNode barNode() { return new StringNode("bar");}
diff --git a/config-lib/src/test/java/com/yahoo/config/PathNodeTest.java b/config-lib/src/test/java/com/yahoo/config/PathNodeTest.java
index 7bb465f203b..37313bbcdf3 100644
--- a/config-lib/src/test/java/com/yahoo/config/PathNodeTest.java
+++ b/config-lib/src/test/java/com/yahoo/config/PathNodeTest.java
@@ -5,8 +5,7 @@ import org.junit.Test;
 
 import java.io.File;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author gjoranv
@@ -17,10 +16,10 @@ public class PathNodeTest {
     @Test
     public void testSetValue() {
         PathNode n = new PathNode();
-        assertThat(n.toString(), is("(null)"));
+        assertEquals("(null)", n.toString());
 
         n = new PathNode(new FileReference("foo.txt"));
-        assertThat(n.value(), is(new File("foo.txt").toPath()));
+        assertEquals(new File("foo.txt").toPath(), n.value());
     }
 
 }
diff --git a/config-lib/src/test/java/com/yahoo/config/StringNodeTest.java b/config-lib/src/test/java/com/yahoo/config/StringNodeTest.java
index 05b9361865c..5d606e12454 100644
--- a/config-lib/src/test/java/com/yahoo/config/StringNodeTest.java
+++ b/config-lib/src/test/java/com/yahoo/config/StringNodeTest.java
@@ -3,8 +3,7 @@ package com.yahoo.config;
 
 import org.junit.Test;
 
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author hmusum
@@ -15,11 +14,11 @@ public class StringNodeTest {
     @Test
     public void testUnescapeQuotedString() {
         String a = "\"Hei\"";
-        assertThat(StringNode.unescapeQuotedString(a), is("Hei"));
-        assertThat(StringNode.unescapeQuotedString("foo\"bar\""), is("foo\"bar\""));
-        assertThat(StringNode.unescapeQuotedString("foo\\\"bar\\\""), is("foo\"bar\""));
-        assertThat(StringNode.unescapeQuotedString("a\\rb\\tc\\fd"), is("a\rb\tc\fd"));
-        assertThat(StringNode.unescapeQuotedString("\\x55"), is("U"));
+        assertEquals("Hei", StringNode.unescapeQuotedString(a));
+        assertEquals("foo\"bar\"", StringNode.unescapeQuotedString("foo\"bar\""));
+        assertEquals("foo\"bar\"", StringNode.unescapeQuotedString("foo\\\"bar\\\""));
+        assertEquals("a\rb\tc\fd", StringNode.unescapeQuotedString("a\\rb\\tc\\fd"));
+        assertEquals("U", StringNode.unescapeQuotedString("\\x55"));
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -30,17 +29,17 @@ public class StringNodeTest {
     @Test
     public void testToString() {
         StringNode n = new StringNode();
-        assertThat(n.toString(), is("(null)"));
+        assertEquals("(null)", n.toString());
         n.setValue("foo");
-        assertThat(n.toString(), is("\"foo\""));
+        assertEquals("\"foo\"", n.toString());
     }
 
     @Test
     public void testSetValue() {
         StringNode n = new StringNode();
         n.setValue("\"foo\"");
-        assertThat(n.getValue(), is("foo"));
+        assertEquals("foo", n.getValue());
         n.setValue("foo");
-        assertThat(n.getValue(), is("foo"));
+        assertEquals("foo", n.getValue());
     }
 }
diff --git a/config-lib/src/test/java/com/yahoo/config/UrlNodeTest.java b/config-lib/src/test/java/com/yahoo/config/UrlNodeTest.java
index 040e3304a66..abf04c34bb8 100644
--- a/config-lib/src/test/java/com/yahoo/config/UrlNodeTest.java
+++ b/config-lib/src/test/java/com/yahoo/config/UrlNodeTest.java
@@ -3,8 +3,7 @@ package com.yahoo.config;
 
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author lesters
@@ -14,13 +13,13 @@ public class UrlNodeTest {
     @Test
     public void testSetValue() {
         UrlNode url = new UrlNode();
-        assertThat(url.toString(), is("(null)"));
+        assertEquals("(null)", url.toString());
 
         url = new UrlNode(new UrlReference("https://docs.vespa.ai/"));
-        assertThat(url.getUrlReference().value(), is("https://docs.vespa.ai/"));
+        assertEquals("https://docs.vespa.ai/", url.getUrlReference().value());
 
         url = new UrlNode(new UrlReference("pom.xml"));
-        assertThat(url.getValue(), is("pom.xml"));
+        assertEquals("pom.xml", url.getValue());
     }
 
 }
diff --git a/config-lib/src/test/java/com/yahoo/config/codegen/NamespaceAndPackageTest.java b/config-lib/src/test/java/com/yahoo/config/codegen/NamespaceAndPackageTest.java
index 066b5383621..54e2271f7dc 100644
--- a/config-lib/src/test/java/com/yahoo/config/codegen/NamespaceAndPackageTest.java
+++ b/config-lib/src/test/java/com/yahoo/config/codegen/NamespaceAndPackageTest.java
@@ -6,8 +6,7 @@ import com.github.myproject.PackageConfig;
 import com.yahoo.my.namespace.NamespaceConfig;
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author gjoranv
@@ -18,17 +17,17 @@ public class NamespaceAndPackageTest {
 
     @Test
     public void namespace_is_set_from_def_file() {
-        assertThat(NamespaceConfig.CONFIG_DEF_NAMESPACE, is(NAMESPACE));
+        assertEquals(NAMESPACE, NamespaceConfig.CONFIG_DEF_NAMESPACE);
     }
 
     @Test
     public void package_is_used_as_namespace_when_namespace_is_not_set_explicitly() {
-        assertThat(PackageConfig.CONFIG_DEF_NAMESPACE, is(PACKAGE));
+        assertEquals(PACKAGE, PackageConfig.CONFIG_DEF_NAMESPACE);
     }
 
     @Test
     public void package_does_not_override_namespace() {
-        assertThat(NamespaceAndPackageConfig.CONFIG_DEF_NAMESPACE, is(NAMESPACE));
+        assertEquals(NAMESPACE, NamespaceAndPackageConfig.CONFIG_DEF_NAMESPACE);
 
     }
 }