diff options
23 files changed, 32 insertions, 22 deletions
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/CliTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/CliTest.java index 065f32e148..18c136013c 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/CliTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/CliTest.java @@ -77,7 +77,7 @@ public class CliTest { Assert.assertEquals("14", outputMap.get(ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH)); Assert.assertEquals("pdf,zip,xml,pdf,tgz,xls", outputMap.get(ConfigTestConstant.ARTIFACT_EXT)); Assert.assertEquals("Base64,MD5", outputMap.get(ConfigTestConstant.ARTIFACT_ENC)); - Assert.assertEquals("@" + System.getenv("Path") + "/myschema.json", + Assert.assertEquals("@" + TestUtil.getenv(ConfigTestConstant.PATH) + "/myschema.json", outputMap.get(ConfigTestConstant.ARTIFACT_XML_SCHEMA)); Assert.assertEquals("a-zA-Z_0-9", outputMap.get(ConfigTestConstant.ARTIFACT_NAME_UPPER)); Assert.assertEquals("/opt/spool," + System.getProperty("user.home") + "/asdc", diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java index 7c93af0cf1..e8fe363dfd 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java @@ -67,7 +67,7 @@ public class ModeAsConfigPropTest { List<String> locList = config.getAsStringValues(NAMESPACE, ConfigTestConstant.ARTIFACT_LOC); Assert.assertEquals(expectedLocList, locList); - Assert.assertEquals("@"+System.getenv("Path")+"/myschema.json",config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_XML_SCHEMA)); + Assert.assertEquals("@"+TestUtil.getenv(ConfigTestConstant.PATH)+"/myschema.json",config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_XML_SCHEMA)); List<String> artifactConsumer = config.getAsStringValues(NAMESPACE, ConfigTestConstant.ARTIFACT_CONSUMER ); Assert.assertEquals(config.getAsStringValues(NAMESPACE, ConfigTestConstant.ARTIFACT_CONSUMER_APPC ), artifactConsumer); diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/util/ConfigTestConstant.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/util/ConfigTestConstant.java index 1d4dead7d2..828c92ea73 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/util/ConfigTestConstant.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/util/ConfigTestConstant.java @@ -18,6 +18,7 @@ public class ConfigTestConstant { public static final String ARTIFACT_NAME_MINLENGTH = "artifact.name.minlength"; public static final String ARTIFACT_ENCODED = "artifact.encoded"; + public static final String PATH = "PATH"; public static final String ONBOARDING_NAMESPACE = "onboarding"; } diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/util/TestUtil.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/util/TestUtil.java index c6601fd8ee..514f52899a 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/util/TestUtil.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/util/TestUtil.java @@ -84,7 +84,7 @@ public class TestUtil { Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_JSON_SCHEMA ), "@GeneratorList.json"); - Assert.assertEquals("@"+System.getenv("Path")+"/myschema.json",config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_XML_SCHEMA)); + Assert.assertEquals("@"+getenv(ConfigTestConstant.PATH)+"/myschema.json",config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_XML_SCHEMA)); List<String> artifactConsumer = config.getAsStringValues(nameSpace, ConfigTestConstant.ARTIFACT_CONSUMER ); Assert.assertEquals(config.getAsStringValues(nameSpace, ConfigTestConstant.ARTIFACT_CONSUMER_APPC ), artifactConsumer); @@ -93,4 +93,13 @@ public class TestUtil { Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_MANDATORY_NAME ), "true"); Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_ENCODED ), "true"); } + + /** + * This to make the behavior of tests consistent with "env:X" in configuration files + * when environment variable X is not defined. + */ + public static String getenv(String name) { + String value = System.getenv(name); + return value == null ? "" : value; + } } 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 @@ <status>Deleted</status> <persistLocation>/opt/spool,${sys:user.home}/asdc</persistLocation> <jsonSchema>@GeneratorList.json</jsonSchema> - <xmlSchema>@${env:path}/myschema.json</xmlSchema> + <xmlSchema>@${env:PATH}/myschema.json</xmlSchema> <consumerAPPC>${artifact.consumer}</consumerAPPC> </artifact> <_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 |