From 9f55f0516de6d61509c9b99771625e8322e73e12 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Wed, 30 Aug 2017 16:10:45 +0200 Subject: Revert "Revert "version in def files are deprecated"" --- configgen/src/test/resources/allfeatures.def | 1 - configgen/src/test/resources/bar.foo.def | 1 - 2 files changed, 2 deletions(-) (limited to 'configgen/src/test') diff --git a/configgen/src/test/resources/allfeatures.def b/configgen/src/test/resources/allfeatures.def index bedb8cb6dbf..e13e14c9e36 100644 --- a/configgen/src/test/resources/allfeatures.def +++ b/configgen/src/test/resources/allfeatures.def @@ -18,7 +18,6 @@ # - Have an array within a struct, to verify that we correctly recurse. # - Reuse type name further within to ensure that this works. -version=11 namespace=configgen # Some random bool without a default value. These comments exist to check # that comment parsing works.e diff --git a/configgen/src/test/resources/bar.foo.def b/configgen/src/test/resources/bar.foo.def index b22be0c62dc..e0084b792a5 100644 --- a/configgen/src/test/resources/bar.foo.def +++ b/configgen/src/test/resources/bar.foo.def @@ -1,4 +1,3 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 namespace=baz xyzzy int default=10 -- cgit v1.2.3 From 642708d27c63f525ca0a435993e78606e91a14a6 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Wed, 30 Aug 2017 16:15:45 +0200 Subject: Update test after removing version line --- .../test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configgen/src/test') 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 45070451392..0d8135e67de 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java @@ -68,8 +68,7 @@ public class NormalizedDefinitionTest { } assertNotNull(out); - assertThat(out.size(), is(70)); - assertThat(out.get(19), is ("version=11\n")); + assertThat(out.size(), is(69)); assertNotNull(fileReader); fileReader.close(); -- cgit v1.2.3