diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-09-10 21:49:55 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-09-10 21:49:55 +0200 |
commit | c993e6371ebad1ff117ff2e5ed62fae42f732186 (patch) | |
tree | 982530d8564522b25cb84f56c0e0f2fd7dcf9210 /config | |
parent | 9b948718144e5d556cc6ea49d2ff6bbf05f00b0e (diff) |
Fix file names
Diffstat (limited to 'config')
-rw-r--r-- | config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java | 2 | ||||
-rw-r--r-- | config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java | 2 | ||||
-rw-r--r-- | config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java | 2 | ||||
-rw-r--r-- | config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java | 2 | ||||
-rw-r--r-- | config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java | 6 | ||||
-rw-r--r-- | config/src/test/resources/configs/def-files-nogen/foo.bar.app.def (renamed from config/src/test/resources/configs/def-files-nogen/mynamespace.foo.bar.app.def) | 0 | ||||
-rw-r--r-- | config/src/tests/functiontest/CMakeLists.txt | 2 |
7 files changed, 8 insertions, 8 deletions
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) |