summaryrefslogtreecommitdiffstats
path: root/configgen/src/test/java/com/yahoo/config/codegen/MakeConfigTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'configgen/src/test/java/com/yahoo/config/codegen/MakeConfigTest.java')
-rw-r--r--configgen/src/test/java/com/yahoo/config/codegen/MakeConfigTest.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/MakeConfigTest.java b/configgen/src/test/java/com/yahoo/config/codegen/MakeConfigTest.java
index 7486d464e43..2a2b65e97a7 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/MakeConfigTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/MakeConfigTest.java
@@ -46,18 +46,18 @@ public class MakeConfigTest {
System.setProperty("config.dumpTree", "true");
System.setProperty("config.useFramework", "true");
System.setProperty("config.dest", dest.getAbsolutePath());
- System.setProperty("config.spec", "src/test/resources/allfeatures.def");
+ System.setProperty("config.spec", "src/test/resources/configgen.allfeatures.def");
MakeConfigProperties p = new MakeConfigProperties();
assertEquals(p.destDir.getAbsolutePath(), dest.getAbsolutePath());
assertTrue(p.dumpTree);
assertTrue(p.generateFrameworkCode);
assertEquals(p.specFiles.length, 1);
- assertEquals(p.specFiles[0].getAbsolutePath(), new File("src/test/resources/allfeatures.def").getAbsolutePath());
+ assertEquals(p.specFiles[0].getAbsolutePath(), new File("src/test/resources/configgen.allfeatures.def").getAbsolutePath());
System.setProperty("config.dumpTree", "false");
System.setProperty("config.useFramework", "false");
System.setProperty("config.dest", dest.getAbsolutePath());
- System.setProperty("config.spec", "src/test/resources/allfeatures.def,src/test/resources/bar.foo.def");
+ System.setProperty("config.spec", "src/test/resources/configgen.allfeatures.def,src/test/resources/baz.bar.foo.def");
p = new MakeConfigProperties();
assertEquals(p.destDir.getAbsolutePath(), dest.getAbsolutePath());
assertFalse(p.dumpTree);
@@ -66,11 +66,11 @@ public class MakeConfigTest {
}
@Test
- public void testMake() throws IOException, InterruptedException {
+ public void testMake() throws IOException {
System.setProperty("config.dumpTree", "true");
System.setProperty("config.useFramework", "true");
System.setProperty("config.dest", dest.getAbsolutePath());
- System.setProperty("config.spec", "src/test/resources/allfeatures.def");
+ System.setProperty("config.spec", "src/test/resources/configgen.allfeatures.def");
MakeConfig.main(new String[]{});
}