diff options
author | vempo <vitaliy.emporopulo@amdocs.com> | 2018-10-25 11:47:10 +0300 |
---|---|---|
committer | Oren Kleks <orenkle@amdocs.com> | 2018-10-25 09:55:23 +0000 |
commit | 6e5e2e19ed43ed4f4b23b58a5c78f2350fe64d19 (patch) | |
tree | 36883069adebd6e5a7565b24c657ba8bb2f0d58c /common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/util/TestUtil.java | |
parent | 32320724e9fa45d18593cf81314ac068f02560dd (diff) |
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 <vitaliy.emporopulo@amdocs.com>
Diffstat (limited to 'common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/util/TestUtil.java')
-rw-r--r-- | common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/util/TestUtil.java | 11 |
1 files changed, 10 insertions, 1 deletions
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; + } } |