1 files changed, 5 insertions, 54 deletions

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);
         }
     }