Disable unstable CliFallbackAndLookupTest

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3490
Change-Id: I48f502125c3fb23f880f7c318f540b4396b5754e

diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/CliConfigurationImpl.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/CliConfigurationImpl.java
index 3fcbd4f..f919e23 100644 (file)
--- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/CliConfigurationImpl.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/CliConfigurationImpl.java
@@ -32,7 +32,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
+import lombok.NoArgsConstructor;
 import org.onap.config.ConfigurationUtils;
 import org.onap.config.api.ConfigurationManager;
 import org.onap.config.api.Hint;
@@ -40,15 +40,13 @@ import org.onap.config.type.ConfigurationQuery;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@NoArgsConstructor
 public final class CliConfigurationImpl extends ConfigurationImpl implements ConfigurationManager {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CliConfigurationImpl.class);
     private static final List<String> KEYS_TO_FILTER = Arrays.asList(NAMESPACE_KEY, MODE_KEY, LOAD_ORDER_KEY);
 
-    public CliConfigurationImpl() {
-        super();
-    }
-
+    @Override
     public String getConfigurationValue(Map<String, Object> input) {
         return getConfigurationValue((ConfigurationQuery) getInput(input));
     }
@@ -62,7 +60,7 @@ public final class CliConfigurationImpl extends ConfigurationImpl implements Con
                     value = get(queryData.getTenant(), queryData.getNamespace(), queryData.getKey(), String[].class, hints);
                 } else {
                     value = getInternal(queryData.getTenant(), queryData.getNamespace(), queryData.getKey(), String[].class,
-                            hints);
+                        hints);
                 }
                 return ConfigurationUtils.getCommaSeparatedList(value);
             } catch (Exception exception) {
@@ -88,7 +86,7 @@ public final class CliConfigurationImpl extends ConfigurationImpl implements Con
             return toReturn;
         }
         try {
-            toReturn = Class.forName(input.get("ImplClass").toString()).newInstance();
+            toReturn = Class.forName(input.get("ImplClass").toString()).getDeclaredConstructor().newInstance();
             Method[] methods = toReturn.getClass().getMethods();
             for (Method method : methods) {
                 if (input.containsKey(method.getName())) {
@@ -101,6 +99,7 @@ public final class CliConfigurationImpl extends ConfigurationImpl implements Con
         return toReturn;
     }
 
+    @Override
     public Map<String, String> listConfiguration(Map<String, Object> input) {
         return listConfiguration((ConfigurationQuery) getInput(input));
     }
@@ -132,9 +131,9 @@ public final class CliConfigurationImpl extends ConfigurationImpl implements Con
             }
         } catch (Exception exception) {
             LOGGER.warn("Error occurred while searching for in-memory keys for namespace: '{}' and tenant: '{}'",
-                    namespace,
-                    tenant,
-                    exception
+                namespace,
+                tenant,
+                exception
             );
         }
         return keys;

diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/CliFallbackAndLookupTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/CliFallbackAndLookupTest.java
index 0d9da64..4d92889 100644 (file)
--- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/CliFallbackAndLookupTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/CliFallbackAndLookupTest.java
@@ -16,38 +16,40 @@
 
 package org.onap.config.test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.onap.config.api.ConfigurationManager;
 import org.onap.config.impl.CliConfigurationImpl;
 import org.onap.config.util.ConfigTestConstant;
 import org.onap.config.util.TestUtil;
 
-
 /**
  * Created by sheetalm on 10/18/2016.
  * Scenario 21, Scenario 23
  * 21 - Verify the CLI fetches only the current value unless the fallback option is specified
  * 23 - Fetch value using CLI for a key with underlying resource
  */
-public class CliFallbackAndLookupTest {
+@Disabled("Investigate instability (random failures)"
+    + "[ERROR]   CliFallbackAndLookupTest.testCliFallbackAndLookup:71 expected:<[{name:\"SCM\"}]> but was:<[@/home/jenkins/TestResources/GeneratorsList.json]>")
+class CliFallbackAndLookupTest {
 
     private static final String NAMESPACE = "CLIFallback";
     private static final String TENANT = "OPENECOMP";
 
-    @Before
-    public void setUp() throws IOException {
-        String data = "{name:\"SCM\"}";
-        TestUtil.writeFile(data);
+    @BeforeEach
+    public void setUp() throws Exception {
+        TestUtil.cleanUp();
     }
 
     @Test
-    public void testCliFallbackAndLookup() throws Exception {
+    void testCliFallbackAndLookup() throws Exception {
 
         //Verify without fallback
         Map<String, Object> input = new HashMap<>();
@@ -58,17 +60,17 @@ public class CliFallbackAndLookupTest {
 
         ConfigurationManager conf = new CliConfigurationImpl();
         String maxSizeWithNoFallback = conf.getConfigurationValue(input);
-        Assert.assertEquals("", maxSizeWithNoFallback);
+        assertEquals("", maxSizeWithNoFallback);
 
         //Verify underlying resource without lookup switch
         input.put("key", ConfigTestConstant.ARTIFACT_JSON_SCHEMA);
         String jsonSchema = conf.getConfigurationValue(input);
-        Assert.assertEquals("@" + System.getProperty("user.home") + "/TestResources/GeneratorsList.json", jsonSchema);
+        assertEquals("@" + System.getProperty("user.home") + "/TestResources/GeneratorsList.json", jsonSchema);
 
         //Verify underlying resource with lookup switch
         input.put("externalLookup", true);
         jsonSchema = conf.getConfigurationValue(input);
-        Assert.assertEquals("{name:\"SCM\"}", jsonSchema);
+        assertEquals("{name:\"SCM\"}", jsonSchema);
 
         //Verify with fallback
         Map<String, Object> fallbackInput = new HashMap<>();
@@ -79,10 +81,10 @@ public class CliFallbackAndLookupTest {
         fallbackInput.put("key", ConfigTestConstant.ARTIFACT_MAXSIZE);
 
         String maxSizeWithFallback = conf.getConfigurationValue(fallbackInput);
-        Assert.assertEquals("1024", maxSizeWithFallback);
+        assertEquals("1024", maxSizeWithFallback);
     }
 
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         TestUtil.cleanUp();
     }

diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/NodeSpecificCliTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/NodeSpecificCliTest.java
index e3f7833..cba1739 100644 (file)
--- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/NodeSpecificCliTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/NodeSpecificCliTest.java
@@ -39,7 +39,8 @@ import org.onap.config.util.TestUtil;
  * Created by sheetalm on 10/19/2016. Scenario 19 Pre-requisite - set -Dnode.config.location=${"user.home"}/TestResources/ while running test Verify
  * node specific override using CLI
  */
-@Disabled("Investigate instability (random failures)")
+@Disabled("Investigate instability (random failures)"
+    + "[ERROR]   NodeSpecificCliTest.testCliApi:73 » FileNotFound /home/jenkins/TestResources/c...")
 class NodeSpecificCliTest {
 
     private static final String NAMESPACE = "NodeCLI";

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 28611d4..3f19cec 100644 (file)
--- 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
@@ -56,10 +56,10 @@ public class TestUtil {
     public static void validateConfiguration(String nameSpace) {
         Configuration config = ConfigurationManager.lookup();
 
-        Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH), "14");
+        Assert.assertEquals("14", config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH));
 
         // First value from list is picked from Merge properties
-        Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_MAXSIZE), "1048576");
+        Assert.assertEquals("1048576", config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_MAXSIZE));
 
         List<String> expectedExtList = new ArrayList<>();
         expectedExtList.add("pdf");
@@ -77,9 +77,9 @@ public class TestUtil {
         List<String> encList = config.getAsStringValues(nameSpace, ConfigTestConstant.ARTIFACT_ENC);
         Assert.assertEquals(expectedEncList, encList);
 
-        Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_NAME_UPPER), "a-zA-Z_0-9");
-        Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_NAME_LOWER), "a-zA-Z");
-        Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_STATUS), "deleted");
+        Assert.assertEquals("a-zA-Z_0-9", config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_NAME_UPPER));
+        Assert.assertEquals("a-zA-Z", config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_NAME_LOWER));
+        Assert.assertEquals("deleted", config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_STATUS));
 
         List<String> expectedLocList = new ArrayList<>();
         expectedLocList.add("/opt/spool");
@@ -87,8 +87,8 @@ public class TestUtil {
         List<String> locList = config.getAsStringValues(nameSpace, ConfigTestConstant.ARTIFACT_LOC);
         Assert.assertEquals(expectedLocList, locList);
 
-        Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_JSON_SCHEMA),
-                "@GeneratorList.json");
+        Assert.assertEquals("@GeneratorList.json",
+                config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_JSON_SCHEMA));
 
         Assert.assertEquals("@" + getenv(ConfigTestConstant.PATH) + "/myschema.json",
                 config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_XML_SCHEMA));
@@ -97,9 +97,9 @@ public class TestUtil {
         Assert.assertEquals(config.getAsStringValues(nameSpace, ConfigTestConstant.ARTIFACT_CONSUMER_APPC),
                 artifactConsumer);
 
-        Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_NAME_MINLENGTH), "6");
-        Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_MANDATORY_NAME), "true");
-        Assert.assertEquals(config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_ENCODED), "true");
+        Assert.assertEquals("6", config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_NAME_MINLENGTH));
+        Assert.assertEquals("true", config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_MANDATORY_NAME));
+        Assert.assertEquals("true", config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_ENCODED));
     }
 
     /**