aboutsummaryrefslogtreecommitdiffstats
path: root/common/onap-common-configuration-management
diff options
context:
space:
mode:
authork.kedron <k.kedron@partner.samsung.com>2019-07-04 13:09:38 +0200
committerOfir Sonsino <ofir.sonsino@intl.att.com>2019-07-07 06:42:15 +0000
commit9eb80fdf47fb9be19e6238e223a3e43c402aa3f5 (patch)
tree890c9e426764c77120aeec4418cd02163ce2332f /common/onap-common-configuration-management
parent97b2d7ee46e604c2e6ec5846b3f330a1adca4dcc (diff)
Improved the ConfigurationRepositoryTest.
Checkstyle for CliConfigurationImpTest. Improved the ConfigurationRepositoryTest to not has an influence on other tests. Issue-ID: SDC-2327 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: I74b95617ad1b17c26a8d6237c7e7469ef2213596
Diffstat (limited to 'common/onap-common-configuration-management')
-rwxr-xr-xcommon/onap-common-configuration-management/onap-configuration-management-core/pom.xml6
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/CliConfigurationImpTest.java (renamed from common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/CliConfigurtationImpTest.java)62
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/impl/ConfigurationRepositoryTest.java11
3 files changed, 44 insertions, 35 deletions
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml
index 7f978bf930..5de500163c 100755
--- a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml
@@ -105,6 +105,12 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>2.0.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/CliConfigurtationImpTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/CliConfigurationImpTest.java
index 0d460a2bb1..3d12eac13d 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/CliConfigurtationImpTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/CliConfigurationImpTest.java
@@ -16,18 +16,18 @@
package org.onap.config;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Map;
+
import org.junit.Test;
import org.onap.config.api.ConfigurationManager;
import org.onap.config.impl.CliConfigurationImpl;
import org.onap.config.util.ConfigTestConstant;
import org.onap.config.util.TestImplementationConfiguration;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public class CliConfigurtationImpTest {
+public class CliConfigurationImpTest {
private static final String NAMESPACE = "CLIConfiguration";
private static final String TENANT = "OPENECOMP";
@@ -35,14 +35,15 @@ public class CliConfigurtationImpTest {
private static final String SERVICE_CONF = "testService";
@Test
- public void testGenerateAndPopulateMap() throws Exception {
+ public void testGenerateAndPopulateMap() {
// given
ConfigurationManager conf = new CliConfigurationImpl();
// when
- Map outputMap = conf.generateMap(TENANT, NAMESPACE, ConfigTestConstant.ARTIFACT);
- TestImplementationConfiguration testServiceImpl = conf.populateMap(TENANT, NAMESPACE, IMPL_KEY,
- TestImplementationConfiguration.class).get(SERVICE_CONF);
+ Map outputMap = conf.generateMap(TENANT, NAMESPACE, ConfigTestConstant.ARTIFACT);
+ TestImplementationConfiguration testServiceImpl =
+ conf.populateMap(TENANT, NAMESPACE, IMPL_KEY, TestImplementationConfiguration.class)
+ .get(SERVICE_CONF);
// then
validateCliMapConfig(outputMap);
@@ -50,43 +51,40 @@ public class CliConfigurtationImpTest {
assertEquals("org.junit.Test", testServiceImpl.getImplementationClass());
}
- private void validateCliMapConfig(Map outputMap){
- assertEquals("appc", outputMap.get(
- withoutArtifactPrefix(ConfigTestConstant.ARTIFACT_CONSUMER)));
- assertEquals("6", extract(outputMap,
- withoutArtifactPrefix(ConfigTestConstant.ARTIFACT_NAME_MINLENGTH)));
- assertEquals("true", outputMap.get(
- withoutArtifactPrefix(ConfigTestConstant.ARTIFACT_ENCODED)));
- assertEquals("14", extract(outputMap,
- withoutArtifactPrefix(ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH)));
- assertEquals("pdf", outputMap.get(
- withoutArtifactPrefix(ConfigTestConstant.ARTIFACT_EXT)));
- assertEquals("Base64", outputMap.get(
- withoutArtifactPrefix(ConfigTestConstant.ARTIFACT_ENC)));
- assertEquals("a-zA-Z_0-9", extract(outputMap,
- withoutArtifactPrefix(ConfigTestConstant.ARTIFACT_NAME_UPPER)));
- assertEquals("deleted", outputMap.get(
- withoutArtifactPrefix(ConfigTestConstant.ARTIFACT_STATUS)));
+ private void validateCliMapConfig(Map outputMap) {
+ assertEquals("appc",
+ outputMap.get(withoutArtifactPrefix(ConfigTestConstant.ARTIFACT_CONSUMER)));
+ assertEquals("6",
+ extract(outputMap, withoutArtifactPrefix(ConfigTestConstant.ARTIFACT_NAME_MINLENGTH)));
+ assertEquals("true",
+ outputMap.get(withoutArtifactPrefix(ConfigTestConstant.ARTIFACT_ENCODED)));
+ assertEquals("14",
+ extract(outputMap, withoutArtifactPrefix(ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH)));
+ assertEquals("pdf", outputMap.get(withoutArtifactPrefix(ConfigTestConstant.ARTIFACT_EXT)));
+ assertEquals("Base64",
+ outputMap.get(withoutArtifactPrefix(ConfigTestConstant.ARTIFACT_ENC)));
+ assertEquals("a-zA-Z_0-9",
+ extract(outputMap, withoutArtifactPrefix(ConfigTestConstant.ARTIFACT_NAME_UPPER)));
+ assertEquals("deleted",
+ outputMap.get(withoutArtifactPrefix(ConfigTestConstant.ARTIFACT_STATUS)));
}
- public String withoutArtifactPrefix(String key){
+ private String withoutArtifactPrefix(String key) {
return key.replace(ConfigTestConstant.ARTIFACT + ".", "");
}
- public String extract(Map map, String keys) {
+ private String extract(Map map, String keys) {
String[] keysList = keys.split("\\.");
Map recursive = (Map) map.get(keysList[0]);
for (int i = 1; i < keysList.length; i++) {
if (i == keysList.length - 1) {
- return (String) recursive.get(keysList[i]);
+ return (String) recursive.get(keysList[i]);
}
recursive = (Map) recursive.get(keysList[i]);
}
return null;
}
-
-
}
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/impl/ConfigurationRepositoryTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/impl/ConfigurationRepositoryTest.java
index 8a39d1bff0..c7cc96cfbe 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/impl/ConfigurationRepositoryTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/impl/ConfigurationRepositoryTest.java
@@ -30,8 +30,13 @@ import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.Configuration;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.onap.config.Constants;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(ConfigurationRepository.class)
public class ConfigurationRepositoryTest {
private static final String[] EMPTY_ARRAY_OF_STRING = new String[0];
@@ -71,9 +76,9 @@ public class ConfigurationRepositoryTest {
// when
repository.populateConfiguration(Constants.DEFAULT_TENANT + Constants.KEY_ELEMENTS_DELIMITER
- + Constants.DEFAULT_NAMESPACE, inputConfig);
- final Configuration outputConfig = repository.getConfigurationFor(Constants.DEFAULT_TENANT,
- Constants.DEFAULT_NAMESPACE);
+ + Constants.DEFAULT_NAMESPACE, inputConfig);
+ final Configuration outputConfig =
+ repository.getConfigurationFor(Constants.DEFAULT_TENANT, Constants.DEFAULT_NAMESPACE);
// then
assertEquals(inputConfig, outputConfig);