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/java/org/onap/config/test/CliTest.java | 2 +- .../test/java/org/onap/config/test/ModeAsConfigPropTest.java | 2 +- .../test/java/org/onap/config/util/ConfigTestConstant.java | 1 + .../src/test/java/org/onap/config/util/TestUtil.java | 11 ++++++++++- 4 files changed, 13 insertions(+), 3 deletions(-) (limited to 'common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap') 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 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 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 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; + } } -- cgit 1.2.3-korg