diff options
Diffstat (limited to 'configgen/src/test/java')
4 files changed, 19 insertions, 71 deletions
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 7921a3aecbe..2eb86546e51 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/DefParserNamespaceTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/DefParserNamespaceTest.java @@ -19,7 +19,7 @@ public class DefParserNamespaceTest { @Test public void namespace_is_set_on_root_node() { - DefParser parser = createParser("version=1\nnamespace=myproject.config\n"); + DefParser parser = createParser("namespace=myproject.config\n"); CNode root = parser.getTree(); assertEquals("myproject.config", root.getNamespace()); } @@ -34,18 +34,17 @@ public class DefParserNamespaceTest { @Test(expected = CodegenRuntimeException.class) public void uppercase_chars_are_not_allowed() { - createParser("version=1\nnamespace=Foo\n").getTree(); + createParser("namespace=Foo\n").getTree(); } @Test(expected = CodegenRuntimeException.class) public void explicit_com_yahoo_prefix_is_not_allowed() { - createParser("version=1\n" + - "namespace=com.yahoo.myproject.config\n").getTree(); + createParser("namespace=com.yahoo.myproject.config\n").getTree(); } @Test public void spaces_are_allowed_around_equals_sign() { - DefParser parser = createParser("version=1\nnamespace = myproject.config\n"); + DefParser parser = createParser("namespace = myproject.config\n"); CNode root = parser.getTree(); assertEquals("myproject.config", root.getNamespace()); } @@ -62,10 +61,10 @@ public class DefParserNamespaceTest { @Test public void namespace_alters_def_md5() { - DefParser parser = createParser("version=1\n"); + DefParser parser = createParser(""); CNode root = parser.getTree(); - parser = createParser("version=1\nnamespace=myproject.config\n"); + parser = createParser("namespace=myproject.config\n"); CNode namespaceRoot = parser.getTree(); assertNotEquals(root.defMd5, namespaceRoot.defMd5); 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 e4d9f6cb3bd..5ba2c01449b 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java @@ -78,7 +78,7 @@ public class DefParserTest { @Test public void testMd5Sum2() { - String def = "version=1\na string\n"; + String def = "a string\n"; CNode root = new DefParser("testMd5Sum2", new StringReader(def)).getTree(); assertEquals("a5e5fdbb2b27e56ba7d5e60e335c598b", root.defMd5); } @@ -89,59 +89,11 @@ public class DefParserTest { assertLineFails(line, "Could not create sting a"); } - // Note: Version is not used anymore, so will always be empty - @Test - public void testValidVersions() { - try { - testExpectedVersion("version=8", ""); - testExpectedVersion("version=8-1", ""); - testExpectedVersion("version =8", ""); - testExpectedVersion("version = 8", ""); - testExpectedVersion("version = 8 ", ""); - testExpectedVersion("version =\t8", ""); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - private void testExpectedVersion(String versionLine, String expectedVersion) { - InnerCNode root = createParser(versionLine).getTree(); - assertEquals(expectedVersion, root.defVersion); - } - - @Test - public void version_is_not_mandatory() { - try { - createParser("a string\n").parse(); - } catch (Exception e) { - fail("Should not get an exception here"); - } - } - static DefParser createParser(String def) { return new DefParser("test", new StringReader(def)); } @Test - public void testInvalidVersion() { - Class<?> exceptionClass = DefParser.DefParserException.class; - testInvalidVersion("version=a\n", exceptionClass, - "Error when parsing line 1: version=a\nversion=a"); - testInvalidVersion("version = a\n", exceptionClass, - "Error when parsing line 1: version = a\n a"); - } - - private void testInvalidVersion(String versionLine, Class<?> exceptionClass, String exceptionMessage) { - try { - createParser(versionLine).parse(); - fail("Didn't find expected exception of type " + exceptionClass); - } catch (Exception e) { - assertExceptionAndMessage(e, exceptionClass, exceptionMessage); - } - } - - @Test public void verify_fail_on_default_for_file() { assertLineFails("f file default=\"file1.txt\"", "Invalid default value"); @@ -150,7 +102,7 @@ public class DefParserTest { @Test(expected = CodegenRuntimeException.class) @Ignore("Not implemented yet") public void testInvalidEnum() { - DefParser parser = createParser("version=1\nanEnum enum {A, B, A}\n"); + DefParser parser = createParser("anEnum enum {A, B, A}\n"); //parser.validateDef(def); } @@ -191,7 +143,7 @@ public class DefParserTest { @Ignore //TODO: finish this! The numeric leaf nodes must contain their range. @Test public void testRanges() { - StringBuilder sb = new StringBuilder("version=1\n"); + StringBuilder sb = new StringBuilder(); sb.append("i int range=[0,10]"); sb.append("l long range=[-1e20,0]"); sb.append("d double range=[0,1]"); @@ -213,7 +165,7 @@ public class DefParserTest { fail("Didn't find expected exception of type " + exceptionClass); } catch (Exception e) { assertExceptionAndMessage(e, exceptionClass, - "Error when parsing line 4: " + duplicateLine + "b is already defined"); + "Error when parsing line 3: " + duplicateLine + "b is already defined"); } } @@ -292,7 +244,6 @@ public class DefParserTest { static StringBuilder createDefTemplate() { StringBuilder sb = new StringBuilder(); - sb.append("version=8\n"); // Add a comment line to check that we get correct line number with comments sb.append("# comment\n"); @@ -312,7 +263,7 @@ public class DefParserTest { fail("Didn't find expected exception of type " + exceptionClass); } catch (Exception e) { assertExceptionAndMessage(e, exceptionClass, - "Error when parsing line 3: " + line + "\n" + message); + "Error when parsing line 2: " + line + "\n" + message); } } 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 d69617ec5da..e6e86b2c2a3 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java @@ -29,7 +29,7 @@ public class JavaClassBuilderTest { @Ignore @Test public void visual_inspection_of_generated_class() { - final String testDefinition = "version=1\n" + // + final String testDefinition = "namespace=test\n" + // "p path\n" + // "pathArr[] path\n" + // @@ -74,7 +74,7 @@ public class JavaClassBuilderTest { @Test public void testCreateUniqueSymbol() { - final String testDefinition = "version=1\n" + // + final String testDefinition = "namespace=test\n" + // "m int\n" + // "n int\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 411ac0fe58a..d57210dd9ed 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java @@ -23,7 +23,6 @@ public class NormalizedDefinitionTest { @Test public void testNormalizingFromReader() { String def = - "version=1\n" + "aString string \n" + "anInt int #comment \n" + "aStringCommentCharacterAfter string default=\"ab\" #foo\n" + @@ -42,13 +41,12 @@ public class NormalizedDefinitionTest { } assertNotNull(out); - 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)); + assertEquals(5, out.size()); + assertEquals("aString string\n", out.get(0)); + assertEquals("anInt int\n", out.get(1)); + assertEquals("aStringCommentCharacterAfter string default=\"ab\"\n", out.get(2)); + assertEquals("aStringWithCommentCharacter string default=\"a#b\"\n", out.get(3)); + assertEquals("aStringWithEscapedQuote string default=\"a\"b\"\n", out.get(4)); reader.close(); } |