aboutsummaryrefslogtreecommitdiffstats
path: root/config-lib/src/test/java/com/yahoo/config/ConfigInstanceBuilderTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'config-lib/src/test/java/com/yahoo/config/ConfigInstanceBuilderTest.java')
-rw-r--r--config-lib/src/test/java/com/yahoo/config/ConfigInstanceBuilderTest.java67
1 files changed, 30 insertions, 37 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")
);
}
}