Fix file names

4 files changed, 9 insertions, 9 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 1c381e7c398..8e52c1b4ece 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java
@@ -20,7 +20,7 @@ import java.io.*;
 public class DefParserTest {
 
     private static final String TEST_DIR = "target/test-classes/";
-    private static final String DEF_NAME = TEST_DIR + "allfeatures.def";
+    private static final String DEF_NAME = TEST_DIR + "configgen.allfeatures.def";
 
     @Test
     public void testTraverseTree() throws IOException {
@@ -61,7 +61,7 @@ public class DefParserTest {
 
     @Test
     public void testFileWithNamespaceInFilename() throws IOException {
-        File defFile = new File(TEST_DIR + "bar.foo.def");
+        File defFile = new File(TEST_DIR + "baz.bar.foo.def");
         CNode root = new DefParser("test", new FileReader(defFile)).getTree();
         assertThat(root.defMd5, is("31a0f9bda0e5ff929762a29569575a7e"));
     }
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 11da88a12fa..66ebf38ed9a 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.fail;
 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 DEF_NAME = TEST_DIR + "configgen.allfeatures.def";
     private static final String REFERENCE_NAME = TEST_DIR + "allfeatures.reference";
 
     @Ignore
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[]{});
     }
     
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 9cda4cfbb1c..6ef9d06ed2c 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java
@@ -53,7 +53,7 @@ public class NormalizedDefinitionTest {
     public void testNormalizingFromFile() throws IOException {
         FileReader fileReader = null;
         try {
-            fileReader = new FileReader("src/test/resources/allfeatures.def");
+            fileReader = new FileReader("src/test/resources/configgen.  allfeatures.def");
         } catch (FileNotFoundException e) {
             e.printStackTrace();
         }