From 6e5e2e19ed43ed4f4b23b58a5c78f2350fe64d19 Mon Sep 17 00:00:00 2001 From: vempo Date: Thu, 25 Oct 2018 11:47:10 +0300 Subject: Fixed configuration tests to run on Linux On Linux, environment variables are case sensitive, while on Windows they are not. Change-Id: I49dfd68ab3596ff7ee4a7a53aeba906b606df81b Issue-ID: SDC-1867 Signed-off-by: vempo --- .../src/test/resources/CLI/config-NS.properties | 2 +- .../src/test/resources/CLIFallback/config-NS.properties | 2 +- .../src/test/resources/FallbackToGlobalNS/config-NS.properties | 2 +- .../src/test/resources/GlobalAndNSConfig/config.properties | 2 +- .../src/test/resources/JSONConfiguration/config.json | 2 +- .../src/test/resources/LoadOrderConfiguration/config.properties | 2 +- .../src/test/resources/MergeStrategyAsConfigProp/config.properties | 2 +- .../src/test/resources/NodeCLI/config.properties | 2 +- .../src/test/resources/SourceLocation/appjarconfig.properties | 2 +- .../src/test/resources/UnregisterNotification/config-NS.properties | 2 +- .../src/test/resources/ValidateNodeConfig/config-NS.properties | 2 +- .../src/test/resources/XMLConfiguration/config.xml | 2 +- .../src/test/resources/YAMLConfiguration/config.yaml | 2 +- .../src/test/resources/fallback/config-fallback.properties | 2 +- .../src/test/resources/java-properties/config.properties | 2 +- .../src/test/resources/multitenancy/config-at.properties | 2 +- .../src/test/resources/multitenancy/config-tf.properties | 2 +- .../src/test/resources/multitenancy/config-vf.properties | 2 +- .../src/test/resources/multitenancy/config.properties | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) (limited to 'common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources') diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLI/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLI/config-NS.properties index a50cabc151..67d23ab604 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLI/config-NS.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLI/config-NS.properties @@ -7,6 +7,6 @@ artifact.status=deleted artifact.status=Deleted artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc artifact.jsonSchema=@${sys:user.home}/TestResources/GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json +artifact.xmlSchema=@${env:PATH}/myschema.json artifact.consumerAPPC=${artifact.consumer} _config.namespace=OPENECOMP:CLI \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLIFallback/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLIFallback/config-NS.properties index 32da54ffbc..05bd844ae9 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLIFallback/config-NS.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/CLIFallback/config-NS.properties @@ -7,6 +7,6 @@ artifact.status=deleted artifact.status=Deleted artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc artifact.jsonSchema=@${sys:user.home}/TestResources/GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json +artifact.xmlSchema=@${env:PATH}/myschema.json artifact.consumerAPPC=${artifact.consumer} _config.namespace=OPENECOMP:CLIFallback \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/FallbackToGlobalNS/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/FallbackToGlobalNS/config-NS.properties index b7e985b90a..74edf55acb 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/FallbackToGlobalNS/config-NS.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/FallbackToGlobalNS/config-NS.properties @@ -8,6 +8,6 @@ artifact.status=deleted artifact.status=Deleted artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc artifact.jsonSchema=@GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json +artifact.xmlSchema=@${env:PATH}/myschema.json artifact.consumerAPPC=${artifact.consumer} _config.namespace=FallbackToGlobalNS \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/GlobalAndNSConfig/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/GlobalAndNSConfig/config.properties index 1a86f68a65..bd1d9fdfea 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/GlobalAndNSConfig/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/GlobalAndNSConfig/config.properties @@ -5,6 +5,6 @@ artifact.name.allowedChar=a-zA-Z artifact.status=Deleted artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc artifact.jsonSchema=@GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json +artifact.xmlSchema=@${env:PATH}/myschema.json artifact.consumerAPPC=${artifact.consumer} _config.namespace=GlobalAndNSConfig \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/JSONConfiguration/config.json b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/JSONConfiguration/config.json index 1bb4e330b1..bfbd13f1a9 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/JSONConfiguration/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/JSONConfiguration/config.json @@ -19,7 +19,7 @@ ], "persistLocation": "/opt/spool,${sys:user.home}/asdc", "jsonSchema": "@GeneratorList.json", - "xmlSchema": "@${env:path}/myschema.json", + "xmlSchema": "@${env:PATH}/myschema.json", "consumerAPPC": "${artifact.consumer}" }, "_config": { diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/LoadOrderConfiguration/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/LoadOrderConfiguration/config.properties index ae1f445efd..abab7891ca 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/LoadOrderConfiguration/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/LoadOrderConfiguration/config.properties @@ -9,6 +9,6 @@ artifact.status=deleted artifact.status=Deleted artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc artifact.jsonSchema=@GeneratorList.json -artifact.xmlSchema=@${env:path}/myschema.json +artifact.xmlSchema=@${env:PATH}/myschema.json artifact.consumerAPPC=${artifact.consumer} _config.namespace=LoadOrderConfiguration diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/MergeStrategyAsConfigProp/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/MergeStrategyAsConfigProp/config.properties index a82e6b23fe..0791aeb076 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/MergeStrategyAsConfigProp/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/MergeStrategyAsConfigProp/config.properties @@ -5,6 +5,6 @@ artifact.name.allowedChar=a-zA-Z artifact.status=Deleted artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc artifact.jsonSchema=@${sys:user.home}/TestResources/GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json +artifact.xmlSchema=@${env:PATH}/myschema.json artifact.consumerAPPC=${artifact.consumer} _config.namespace=ModeAsConfigProp \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NodeCLI/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NodeCLI/config.properties index 435f98ab39..ee7b4a55f7 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NodeCLI/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/NodeCLI/config.properties @@ -4,6 +4,6 @@ artifact.supportedEncryption=Base64 artifact.name.allowedChar=a-zA-Z artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc artifact.jsonSchema=@GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json +artifact.xmlSchema=@${env:PATH}/myschema.json artifact.consumerAPPC=${artifact.consumer} _config.namespace=NodeCLI \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/SourceLocation/appjarconfig.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/SourceLocation/appjarconfig.properties index 22c9840fad..26fcc599b7 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/SourceLocation/appjarconfig.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/SourceLocation/appjarconfig.properties @@ -9,6 +9,6 @@ artifact.status=deleted artifact.status=Deleted artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc artifact.jsonSchema=@GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json +artifact.xmlSchema=@${env:PATH}/myschema.json artifact.consumerAPPC=${artifact.consumer} _config.namespace=SourceLocation \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/UnregisterNotification/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/UnregisterNotification/config-NS.properties index 40b4518945..87e98be115 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/UnregisterNotification/config-NS.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/UnregisterNotification/config-NS.properties @@ -8,6 +8,6 @@ artifact.status=deleted artifact.status=Deleted artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc artifact.jsonSchema=@GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json +artifact.xmlSchema=@${env:PATH}/myschema.json artifact.consumerAPPC=${artifact.consumer} _config.namespace=UnregisterNotification \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/ValidateNodeConfig/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/ValidateNodeConfig/config-NS.properties index a782e25835..39b85f828c 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/ValidateNodeConfig/config-NS.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/ValidateNodeConfig/config-NS.properties @@ -8,6 +8,6 @@ artifact.status=deleted artifact.status=Deleted artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc artifact.jsonSchema=@GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json +artifact.xmlSchema=@${env:PATH}/myschema.json artifact.consumerAPPC=${artifact.consumer} _config.namespace=ValidateNodeConfig \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/XMLConfiguration/config.xml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/XMLConfiguration/config.xml index 5c6151f880..10c7c20620 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/XMLConfiguration/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/XMLConfiguration/config.xml @@ -16,7 +16,7 @@ Deleted /opt/spool,${sys:user.home}/asdc @GeneratorList.json - @${env:path}/myschema.json + @${env:PATH}/myschema.json ${artifact.consumer} <_config> diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/YAMLConfiguration/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/YAMLConfiguration/config.yaml index 706b22db5e..f483f36734 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/YAMLConfiguration/config.yaml +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/YAMLConfiguration/config.yaml @@ -21,7 +21,7 @@ artifact: Deleted persistLocation: "/opt/spool,${sys:user.home}/asdc" jsonSchema: "@GeneratorList.json" - xmlSchema: "@${env:path}/myschema.json" + xmlSchema: "@${env:PATH}/myschema.json" consumerAPPC: "${artifact.consumer}" _config: namespace: YAMLConfig \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/fallback/config-fallback.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/fallback/config-fallback.properties index 7839839258..0cd81fd212 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/fallback/config-fallback.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/fallback/config-fallback.properties @@ -9,5 +9,5 @@ artifact.status=deleted artifact.status=Deleted artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc artifact.jsonSchema=@GeneratorList.json -artifact.xmlSchema=@${env:path}/myschema.json +artifact.xmlSchema=@${env:PATH}/myschema.json artifact.consumerAPPC=${artifact.consumer} diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/java-properties/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/java-properties/config.properties index d9051f6ec4..7d6c84b2e9 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/java-properties/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/java-properties/config.properties @@ -9,6 +9,6 @@ artifact.status=deleted artifact.status=Deleted artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc artifact.jsonSchema=@GeneratorList.json -artifact.xmlSchema=@${env:path}/myschema.json +artifact.xmlSchema=@${env:PATH}/myschema.json artifact.consumerAPPC=${artifact.consumer} _config.namespace=javaProperties diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-at.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-at.properties index 3bc773369b..0c484a640b 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-at.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-at.properties @@ -6,6 +6,6 @@ artifact.name.allowedChar=a-zA-Z artifact.status=Deleted artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc artifact.jsonSchema=@GeneratorList.json -artifact.xmlSchema=@${env:path}/myschema.json +artifact.xmlSchema=@${env:PATH}/myschema.json artifact.consumerAPPC=${artifact.consumer} _config.namespace=OPENECOMP:tenancy diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-tf.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-tf.properties index 196bafe4e4..d39e688f4c 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-tf.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-tf.properties @@ -5,6 +5,6 @@ artifact.supportedEncryption=Base64 artifact.name.allowedChar=a-zA-Z artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc artifact.jsonSchema=@GeneratorList.json -artifact.xmlSchema=@${env:path}/myschema.json +artifact.xmlSchema=@${env:PATH}/myschema.json artifact.consumerAPPC=${artifact.consumer} _config.namespace=Telefonica:tenancy diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-vf.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-vf.properties index 4c0c6ad897..3fc228ed16 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-vf.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-vf.properties @@ -6,6 +6,6 @@ artifact.name.allowedChar=a-zA-Z artifact.status=Deleted artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc artifact.jsonSchema=@GeneratorList.json -artifact.xmlSchema=@${env:path}/myschema.json +artifact.xmlSchema=@${env:PATH}/myschema.json artifact.consumerAPPC=${artifact.consumer} _config.namespace=Vodafone:tenancy diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config.properties index 8ed2485dc2..cafafccb0a 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config.properties @@ -6,6 +6,6 @@ artifact.name.allowedChar=a-zA-Z artifact.status=Deleted artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc artifact.jsonSchema=@GeneratorList.json -artifact.xmlSchema=@${env:path}/myschema.json +artifact.xmlSchema=@${env:PATH}/myschema.json artifact.consumerAPPC=${artifact.consumer} _config.namespace=tenancy -- cgit 1.2.3-korg