Fix file names

12 files changed, 18 insertions, 18 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilderTest.java
index a62255c4c5c..6f876450a2d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilderTest.java
@@ -270,7 +270,7 @@ public class DomConfigPayloadBuilderTest {
                 "<longval>invalid</longval>" +
                 "</config>");
         DefParser defParser = new DefParser("simpletypes",
-                new FileReader(new File("src/test/resources/configdefinitions/simpletypes.def")));
+                new FileReader(new File("src/test/resources/configdefinitions/test.simpletypes.def")));
         ConfigDefinition def = ConfigDefinitionBuilder.createConfigDefinition(defParser.getTree());
         ConfigPayloadBuilder builder =  new DomConfigPayloadBuilder(def).build(configRoot);
         //assertThat(builder.warnings().size(), is(1));
diff --git a/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java b/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java
index c8693227920..1c36fdcfed3 100644
--- a/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java
@@ -33,7 +33,7 @@ public class CfgConfigPayloadBuilderTest {
                 "        ':parent',",
                 "        'parent:'",
                 "    ],",
-                "    'pathVal': 'src/test/resources/configs/def-files/function-test.def',",
+                "    'pathVal': 'src/test/resources/configs/def-files/foo.function-test.def',",
                 "    'string_val': 'foo',",
                 "    'myStructMap': {",
                 "        'one': {",
diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java
index 49fd25b6476..b031e3b985a 100644
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java
@@ -46,7 +46,7 @@ public class ConfigInstancePayloadTest {
                 refval(":parent:").
                 refwithdef(":parent:").
                 fileVal("etc").
-                pathVal(FileReference.mockFileReferenceForUnitTesting(new File("src/test/resources/configs/def-files/function-test.def"))).
+                pathVal(FileReference.mockFileReferenceForUnitTesting(new File("src/test/resources/configs/def-files/foo.function-test.def"))).
                 boolarr(false).
                 longarr(9223372036854775807L).
                 longarr(-9223372036854775808L).
diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java
index fa24988709a..8464a2a0067 100644
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java
@@ -94,7 +94,7 @@ public class ConfigInstanceUtilTest {
                 refval(":parent:").
                 refwithdef(":parent:").
                 fileVal("etc").
-                pathVal(FileReference.mockFileReferenceForUnitTesting(new File("src/test/resources/configs/def-files/function-test.def"))).
+                pathVal(FileReference.mockFileReferenceForUnitTesting(new File("src/test/resources/configs/def-files/foo.function-test.def"))).
                 boolarr(false).
                 longarr(9223372036854775807L).
                 longarr(-9223372036854775808L).
diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java
index 810b9f58829..42b7958161a 100644
--- a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.*;
 public class ConfigDefinitionBuilderTest {
 
     private static final String TEST_DIR = "src/test/resources/configs/def-files";
-    private static final String DEF_NAME = TEST_DIR + "/function-test.def";
+    private static final String DEF_NAME = TEST_DIR + "/foo.function-test.def";
 
 
     @Test
diff --git a/config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java b/config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java
index 190c7479ee7..821a351dd89 100644
--- a/config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java
@@ -187,7 +187,7 @@ public class ConfigUtilsTest {
     public void testCreateConfigDefinitionKeyFromDefFile() {
         ConfigDefinitionKey def = null;
         try {
-            def = ConfigUtils.createConfigDefinitionKeyFromDefFile(new File("src/test/resources/configs/def-files/app.def"));
+            def = ConfigUtils.createConfigDefinitionKeyFromDefFile(new File("src/test/resources/configs/def-files/foo.app.def"));
         } catch (IOException e) {
             e.printStackTrace();
             fail();
@@ -196,7 +196,7 @@ public class ConfigUtilsTest {
         assertThat(def.getNamespace(), is("foo"));
 
         try {
-            def = ConfigUtils.createConfigDefinitionKeyFromDefFile(new File("src/test/resources/configs/def-files/testnamespace.def"));
+            def = ConfigUtils.createConfigDefinitionKeyFromDefFile(new File("src/test/resources/configs/def-files/foo.testnamespace.def"));
         } catch (IOException e) {
             e.printStackTrace();
             fail();
@@ -205,7 +205,7 @@ public class ConfigUtilsTest {
         assertThat(def.getNamespace(), is("foo"));
 
         try {
-            byte[] content = IOUtils.readFileBytes(new File("src/test/resources/configs/def-files/app.def"));
+            byte[] content = IOUtils.readFileBytes(new File("src/test/resources/configs/def-files/foo.app.def"));
             def = ConfigUtils.createConfigDefinitionKeyFromDefContent("app", content);
         } catch (IOException e) {
             fail();
diff --git a/config/src/test/resources/configs/def-files-nogen/mynamespace.foo.bar.app.def b/config/src/test/resources/configs/def-files-nogen/foo.bar.app.def
index 6082072695a..6082072695a 100644
--- a/config/src/test/resources/configs/def-files-nogen/mynamespace.foo.bar.app.def
+++ b/config/src/test/resources/configs/def-files-nogen/foo.bar.app.def
diff --git a/config/src/tests/functiontest/CMakeLists.txt b/config/src/tests/functiontest/CMakeLists.txt
index 07fcefee5ac..d0674f1bafa 100644
--- a/config/src/tests/functiontest/CMakeLists.txt
+++ b/config/src/tests/functiontest/CMakeLists.txt
@@ -6,4 +6,4 @@ vespa_add_executable(config_functiontest_test_app TEST
     config_cloudconfig
 )
 vespa_add_test(NAME config_functiontest_test_app COMMAND config_functiontest_test_app)
-vespa_generate_config(config_functiontest_test_app ../../test/resources/configdefinitions/function-test.def)
+vespa_generate_config(config_functiontest_test_app ../../test/resources/configdefinitions/foo.function-test.def)
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();
         }