Avoid hamcrest/deprecated assertThat.

6 files changed, 71 insertions, 67 deletions

diff --git a/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java b/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java
index 05e2e7c6ff6..9cf363376cc 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java
@@ -1,11 +1,13 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.codegen;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
-
 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;
+
 /**
  * Tests parsing of a single line of a .def file
  *
@@ -225,9 +227,9 @@ public class DefLineParsingTest {
         DefLine i = new DefLine("i int range=[0, 100]");
         DefLine l = new DefLine("l long range=[-1e10, 0]");
         DefLine d = new DefLine("d double range=[0, 1.0]");
-        assertThat(i.getRange(), is("[0, 100]"));
-        assertThat(l.getRange(), is("[-1e10, 0]"));
-        assertThat(d.getRange(), is("[0, 1.0]"));
+        assertEquals("[0, 100]", i.getRange());
+        assertEquals("[-1e10, 0]", l.getRange());
+        assertEquals("[0, 1.0]", d.getRange());
     }
 
     @Test
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/DefParserNamespaceTest.java b/configgen/src/test/java/com/yahoo/config/codegen/DefParserNamespaceTest.java
index 97ee17cb6d5..7921a3aecbe 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/DefParserNamespaceTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/DefParserNamespaceTest.java
@@ -8,9 +8,8 @@ import java.io.IOException;
 import static com.yahoo.config.codegen.DefParserTest.assertLineFails;
 import static com.yahoo.config.codegen.DefParserTest.createDefTemplate;
 import static com.yahoo.config.codegen.DefParserTest.createParser;
-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 gjoranv
@@ -22,7 +21,7 @@ public class DefParserNamespaceTest {
     public void namespace_is_set_on_root_node() {
         DefParser parser = createParser("version=1\nnamespace=myproject.config\n");
         CNode root = parser.getTree();
-        assertThat(root.getNamespace(), is("myproject.config"));
+        assertEquals("myproject.config", root.getNamespace());
     }
 
     @Test
@@ -30,7 +29,7 @@ public class DefParserNamespaceTest {
         String PACKAGE = "com.github.myproject";
         DefParser parser = createParser("package=" + PACKAGE + "\n");
         CNode root = parser.getTree();
-        assertThat(root.getNamespace(), is(PACKAGE));
+        assertEquals(PACKAGE, root.getNamespace());
     }
 
     @Test(expected = CodegenRuntimeException.class)
@@ -48,7 +47,7 @@ public class DefParserNamespaceTest {
     public void spaces_are_allowed_around_equals_sign() {
         DefParser parser = createParser("version=1\nnamespace =  myproject.config\n");
         CNode root = parser.getTree();
-        assertThat(root.getNamespace(), is("myproject.config"));
+        assertEquals("myproject.config", root.getNamespace());
     }
 
     @Test
@@ -69,7 +68,7 @@ public class DefParserNamespaceTest {
         parser = createParser("version=1\nnamespace=myproject.config\n");
         CNode namespaceRoot = parser.getTree();
 
-        assertThat(root.defMd5, not(namespaceRoot.defMd5));
+        assertNotEquals(root.defMd5, namespaceRoot.defMd5);
     }
 
 
@@ -82,12 +81,12 @@ public class DefParserNamespaceTest {
     }
 
     @Test
-    public void number_is_not_allowed_as_namespace_start_char() throws IOException, DefParser.DefParserException {
+    public void number_is_not_allowed_as_namespace_start_char() {
         assertLineFails("namespace=2.a.b");
     }
 
     @Test
-    public void number_is_not_allowed_as_leading_char_in_namespace_token() throws IOException, DefParser.DefParserException {
+    public void number_is_not_allowed_as_leading_char_in_namespace_token() {
         assertLineFails("namespace=a.b.2c");
     }
 
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/DefParserPackageTest.java b/configgen/src/test/java/com/yahoo/config/codegen/DefParserPackageTest.java
index d995ab63886..cd7ca1a89b9 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/DefParserPackageTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/DefParserPackageTest.java
@@ -5,14 +5,12 @@ import org.junit.Test;
 
 import java.io.IOException;
 
-import static com.yahoo.config.codegen.DefParser.DEFAULT_PACKAGE_PREFIX;
 import static com.yahoo.config.codegen.DefParserTest.assertLineFails;
 import static com.yahoo.config.codegen.DefParserTest.createDefTemplate;
 import static com.yahoo.config.codegen.DefParserTest.createParser;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNull;
 
 /**
  * Tests setting explicit java package in the def file.
@@ -26,7 +24,7 @@ public class DefParserPackageTest {
     public void package_is_set_on_root_node() {
         DefParser parser = createParser("package=" + PACKAGE + "\n");
         CNode root = parser.getTree();
-        assertThat(root.getPackage(), is(PACKAGE));
+        assertEquals(PACKAGE, root.getPackage());
     }
 
     @Test
@@ -35,8 +33,8 @@ public class DefParserPackageTest {
         DefParser parser = createParser("package=" + PACKAGE +
                                                 "\nnamespace=" + namespace +"\n");
         CNode root = parser.getTree();
-        assertThat(root.getPackage(), is(PACKAGE));
-        assertThat(root.getNamespace(), is(namespace));
+        assertEquals(PACKAGE, root.getPackage());
+        assertEquals(namespace, root.getNamespace());
     }
 
     // Required by JavaClassBuilder ctor.
@@ -45,7 +43,7 @@ public class DefParserPackageTest {
         String namespace = "test.namespace";
         DefParser parser = createParser("namespace=" + namespace + "\n");
         CNode root = parser.getTree();
-        assertThat(root.getPackage(), nullValue());
+        assertNull(root.getPackage());
     }
 
     @Test(expected = CodegenRuntimeException.class)
@@ -57,7 +55,7 @@ public class DefParserPackageTest {
     public void spaces_are_allowed_around_equals_sign() {
         DefParser parser = createParser("package =  " + PACKAGE + "\n");
         CNode root = parser.getTree();
-        assertThat(root.getPackage(), is(PACKAGE));
+        assertEquals(PACKAGE, root.getPackage());
     }
 
     @Test
@@ -78,7 +76,7 @@ public class DefParserPackageTest {
         parser = createParser("package=" + PACKAGE + "\na string\n");
         CNode rootWithPackage = parser.getTree();
 
-        assertThat(root.defMd5, not(rootWithPackage.defMd5));
+        assertNotEquals(root.defMd5, rootWithPackage.defMd5);
     }
 
 
@@ -91,12 +89,12 @@ public class DefParserPackageTest {
     }
 
     @Test
-    public void number_is_not_allowed_as_package_start_char() throws IOException, DefParser.DefParserException {
+    public void number_is_not_allowed_as_package_start_char() {
         assertLineFails("package=2.a.b");
     }
 
     @Test
-    public void number_is_not_allowed_as_leading_char_in_package_token() throws IOException, DefParser.DefParserException {
+    public void number_is_not_allowed_as_leading_char_in_package_token() {
         assertLineFails("package=a.b.2c");
     }
 
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java b/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java
index 22ccf4105c1..e4d9f6cb3bd 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java
@@ -1,15 +1,18 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.codegen;
 
-import static org.junit.Assert.*;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
 import org.junit.Ignore;
 
-import static org.hamcrest.CoreMatchers.is;
-
-import java.io.*;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.StringReader;
 
 /**
  * Unit tests for DefParser.
@@ -28,7 +31,7 @@ public class DefParserTest {
         CNode root = new DefParser("test", new FileReader(defFile)).getTree();
         assertNotNull(root);
         CNode[] children = root.getChildren();
-        assertThat(children.length, is(34));
+        assertEquals(34, children.length);
 
         int numGrandChildren = 0;
         int numGreatGrandChildren = 0;
@@ -39,45 +42,45 @@ public class DefParserTest {
                 numGreatGrandChildren += grandChild.getChildren().length;
             }
         }
-        assertThat(numGrandChildren, is(14));
-        assertThat(numGreatGrandChildren, is(6));
+        assertEquals(14, numGrandChildren);
+        assertEquals(6, numGreatGrandChildren);
 
         // Verify that each array creates a sub-tree, and that defaults for leafs are handled correctly.
         CNode myArray = root.getChild("myArray");
-        assertThat(myArray.getChildren().length, is(5));
+        assertEquals(5, myArray.getChildren().length);
         // int within array
         LeafCNode myArrayInt = (LeafCNode) myArray.getChild("intVal");
-        assertThat(myArrayInt.getDefaultValue().getValue(), is("14"));
+        assertEquals("14", myArrayInt.getDefaultValue().getValue());
         // enum within array
         LeafCNode myArrayEnum = (LeafCNode) myArray.getChild("enumVal");
-        assertThat(myArrayEnum.getDefaultValue().getValue(), is("TYPE"));
+        assertEquals("TYPE", myArrayEnum.getDefaultValue().getValue());
 
         // Verify array within array and a default value for a leaf in the inner array.
         CNode anotherArray = myArray.getChild("anotherArray");
-        assertThat(anotherArray.getChildren().length, is(1));
+        assertEquals(1, anotherArray.getChildren().length);
         LeafCNode foo = (LeafCNode) anotherArray.getChild("foo");
-        assertThat(foo.getDefaultValue().getValue(), is("-4"));
+        assertEquals("-4", foo.getDefaultValue().getValue());
     }
 
     @Test
     public void testFileWithNamespaceInFilename() throws IOException {
         File defFile = new File(TEST_DIR + "baz.bar.foo.def");
         CNode root = new DefParser("test", new FileReader(defFile)).getTree();
-        assertThat(root.defMd5, is("31a0f9bda0e5ff929762a29569575a7e"));
+        assertEquals("31a0f9bda0e5ff929762a29569575a7e", root.defMd5);
     }
 
     @Test
     public void testMd5Sum() throws IOException {
         File defFile = new File(DEF_NAME);
         CNode root = new DefParser("test", new FileReader(defFile)).getTree();
-        assertThat(root.defMd5, is("f901bdc5c96e7005130399c63f247823"));
+        assertEquals("f901bdc5c96e7005130399c63f247823", root.defMd5);
     }
 
     @Test
     public void testMd5Sum2() {
         String def = "version=1\na string\n";
         CNode root = new DefParser("testMd5Sum2", new StringReader(def)).getTree();
-        assertThat(root.defMd5, is("a5e5fdbb2b27e56ba7d5e60e335c598b"));
+        assertEquals("a5e5fdbb2b27e56ba7d5e60e335c598b", root.defMd5);
     }
 
     @Test
@@ -104,7 +107,7 @@ public class DefParserTest {
 
     private void testExpectedVersion(String versionLine, String expectedVersion) {
         InnerCNode root = createParser(versionLine).getTree();
-        assertThat(root.defVersion, is(expectedVersion));
+        assertEquals(expectedVersion, root.defVersion);
     }
 
     @Test
@@ -146,7 +149,7 @@ public class DefParserTest {
 
     @Test(expected = CodegenRuntimeException.class)
     @Ignore("Not implemented yet")
-    public void testInvalidEnum() throws DefParser.DefParserException {
+    public void testInvalidEnum() {
         DefParser parser = createParser("version=1\nanEnum enum {A, B, A}\n");
         //parser.validateDef(def);
     }
@@ -171,7 +174,7 @@ public class DefParserTest {
         CNode root = parser.getTree();
         LeafCNode node = (LeafCNode) root.getChild("enum1");
         assertNotNull(node);
-        assertThat(node.getDefaultValue().getStringRepresentation(), is("A"));
+        assertEquals("A", node.getDefaultValue().getStringRepresentation());
     }
 
     @Test(expected = DefParser.DefParserException.class)
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java b/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java
index cce2d66b5f0..d69617ec5da 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java
@@ -12,9 +12,7 @@ import java.util.List;
 
 import static com.yahoo.config.codegen.ConfiggenUtil.createClassName;
 import static com.yahoo.config.codegen.JavaClassBuilder.createUniqueSymbol;
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -82,8 +80,8 @@ public class JavaClassBuilderTest {
                 "n int\n";
         InnerCNode root = new DefParser("test", new StringReader(testDefinition)).getTree();
 
-        assertThat(createUniqueSymbol(root, "foo"), is("f"));
-        assertThat(createUniqueSymbol(root, "name"), is("na"));
+        assertEquals("f", createUniqueSymbol(root, "foo"));
+        assertEquals("na", createUniqueSymbol(root, "name"));
         assertTrue(createUniqueSymbol(root, "m").startsWith(ReservedWords.INTERNAL_PREFIX + "m"));
 
         // The basis string is not a legal return value, even if unique, to avoid
@@ -93,12 +91,12 @@ public class JavaClassBuilderTest {
 
     @Test
     public void testCreateClassName() {
-        assertThat(createClassName("simple"), is("SimpleConfig"));
-        assertThat(createClassName("a"), is("AConfig"));
-        assertThat(createClassName("a-b-c"), is("ABCConfig"));
-        assertThat(createClassName("a-1-2b"), is("A12bConfig"));
-        assertThat(createClassName("my-app"), is("MyAppConfig"));
-        assertThat(createClassName("MyApp"), is("MyAppConfig"));
+        assertEquals("SimpleConfig", createClassName("simple"));
+        assertEquals("AConfig", createClassName("a"));
+        assertEquals("ABCConfig", createClassName("a-b-c"));
+        assertEquals("A12bConfig", createClassName("a-1-2b"));
+        assertEquals("MyAppConfig", createClassName("my-app"));
+        assertEquals("MyAppConfig", createClassName("MyApp"));
     }
 
     @Test(expected = CodegenRuntimeException.class)
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java b/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java
index 3c328721b6c..411ac0fe58a 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java
@@ -1,14 +1,18 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.codegen;
 
-import static org.junit.Assert.*;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.StringReader;
 import java.util.List;
 
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 
 /**
@@ -38,13 +42,13 @@ public class NormalizedDefinitionTest {
         }
 
         assertNotNull(out);
-        assertThat(out.size(), is(6));
-        assertThat(out.get(0), is ("version=1\n"));
-        assertThat(out.get(1), is ("aString string\n"));
-        assertThat(out.get(2), is ("anInt int\n"));
-        assertThat(out.get(3), is ("aStringCommentCharacterAfter string default=\"ab\"\n"));
-        assertThat(out.get(4), is ("aStringWithCommentCharacter string default=\"a#b\"\n"));
-        assertThat(out.get(5), is ("aStringWithEscapedQuote string default=\"a\"b\"\n"));
+        assertEquals(6, out.size());
+        assertEquals("version=1\n", out.get(0));
+        assertEquals("aString string\n", out.get(1));
+        assertEquals("anInt int\n", out.get(2));
+        assertEquals("aStringCommentCharacterAfter string default=\"ab\"\n", out.get(3));
+        assertEquals("aStringWithCommentCharacter string default=\"a#b\"\n", out.get(4));
+        assertEquals("aStringWithEscapedQuote string default=\"a\"b\"\n", out.get(5));
 
         reader.close();
     }
@@ -68,7 +72,7 @@ public class NormalizedDefinitionTest {
         }
 
         assertNotNull(out);
-        assertThat(out.size(), is(72));
+        assertEquals(72, out.size());
 
         assertNotNull(fileReader);
         fileReader.close();