diff options
Diffstat (limited to 'configgen/src/test/java/com')
4 files changed, 12 insertions, 4 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 53d02689fed..0e2f6cc4d05 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java @@ -121,6 +121,13 @@ public class DefLineParsingTest { assertEquals("url", l.getType().getName()); } + @Test + void testParseModels() { + DefLine l = new DefLine("modelVal model"); + + assertEquals("modelVal", l.getName()); + assertEquals("model", l.getType().getName()); + } @Test void testParseDefaultInt() { 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 4fbf01892cc..45d1f21763c 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java @@ -28,7 +28,7 @@ public class DefParserTest { CNode root = new DefParser("test", new FileReader(defFile)).getTree(); assertNotNull(root); CNode[] children = root.getChildren(); - assertEquals(34, children.length); + assertEquals(37, children.length); int numGrandChildren = 0; int numGreatGrandChildren = 0; @@ -70,7 +70,7 @@ public class DefParserTest { void testMd5Sum() throws IOException { File defFile = new File(DEF_NAME); CNode root = new DefParser("test", new FileReader(defFile)).getTree(); - assertEquals("f901bdc5c96e7005130399c63f247823", root.defMd5); + assertEquals("0501f9e2c4ecc8c283e100e0b1178ca4", root.defMd5); } @Test @@ -194,7 +194,7 @@ public class DefParserTest { @Test void testIllegalCharacterInName() { assertLineFails("a-b int", - "a-b contains unexpected character"); + "'a-b' contains an unexpected character"); } @Test 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 69a690b0e82..428576e340f 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java @@ -33,6 +33,7 @@ public class JavaClassBuilderTest { "pathArr[] path\n" + // "u url\n" + // "urlArr[] url\n" + // + "modelArr[] model\n" + // "f file\n" + // "fileArr[] file\n" + // "i int default=0\n" + // 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 61b5eb5a759..57b3ed962eb 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java @@ -70,7 +70,7 @@ public class NormalizedDefinitionTest { } assertNotNull(out); - assertEquals(72, out.size()); + assertEquals(75, out.size()); assertNotNull(fileReader); fileReader.close(); |