diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-11-30 14:47:38 -0800 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-11-30 14:47:38 -0800 |
commit | cf6da96964eb010e79117a680199916d946dfc22 (patch) | |
tree | 665fb956723c3abd141d7d1b519a92fced83bf3d /configgen/src/test/java/com/yahoo/config | |
parent | c0513ac34d2c438e9f97e699659855029e1f06e8 (diff) |
Add build() method to config builders
Diffstat (limited to 'configgen/src/test/java/com/yahoo/config')
-rw-r--r-- | configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java | 16 | ||||
-rw-r--r-- | configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java | 1 |
2 files changed, 13 insertions, 4 deletions
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 744f8c9b1a2..381d587e3c3 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java @@ -8,6 +8,7 @@ import java.io.IOException; import java.io.StringReader; import java.nio.file.FileSystems; import java.nio.file.Files; +import java.util.List; import static com.yahoo.config.codegen.ConfiggenUtil.createClassName; import static com.yahoo.config.codegen.JavaClassBuilder.createUniqueSymbol; @@ -15,12 +16,14 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * @author gjoranv * @author ollivir */ public class JavaClassBuilderTest { + private static final String TEST_DIR = "target/test-classes/"; private static final String DEF_NAME = TEST_DIR + "allfeatures.def"; private static final String REFERENCE_NAME = TEST_DIR + "allfeatures.reference"; @@ -103,14 +106,19 @@ public class JavaClassBuilderTest { @Test public void verify_generated_class_against_reference() throws IOException { - final String testDefinition = String.join("\n", Files.readAllLines(FileSystems.getDefault().getPath(DEF_NAME))); - final String referenceClass = String.join("\n", Files.readAllLines(FileSystems.getDefault().getPath(REFERENCE_NAME))) + "\n"; + String testDefinition = String.join("\n", Files.readAllLines(FileSystems.getDefault().getPath(DEF_NAME))); + List<String> referenceClassLines = Files.readAllLines(FileSystems.getDefault().getPath(REFERENCE_NAME)); DefParser parser = new DefParser("allfeatures", new StringReader(testDefinition)); InnerCNode root = parser.getTree(); JavaClassBuilder builder = new JavaClassBuilder(root, parser.getNormalizedDefinition(), null, null); - String configClass = builder.getConfigClass("AllfeaturesConfig"); + String[] configClassLines = builder.getConfigClass("AllfeaturesConfig").split("\n"); - assertEquals(referenceClass, configClass); + for (int i = 0; i < referenceClassLines.size(); i++) { + if (configClassLines.length <= i) + fail("Missing lines i generated comnfig class. First missing line:\n" + referenceClassLines.get(i)); + assertEquals("Line " + i, referenceClassLines.get(i), configClassLines[i]); + } } + } 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 0d8135e67de..cbb0d9c4082 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java @@ -73,4 +73,5 @@ public class NormalizedDefinitionTest { assertNotNull(fileReader); fileReader.close(); } + } |