Merge changes I20ff8508,I00e014fd

* changes:
  CliProfileCmd unit test cases added
  sonar-smell add logic to this catch clause

2 files changed, 79 insertions, 53 deletions

diff --git a/profiles/command/src/test/java/org/onap/cli/fw/cmd/cmd/OpenCommandShellCmdTest.java b/profiles/command/src/test/java/org/onap/cli/fw/cmd/cmd/OpenCommandShellCmdTest.java
index bd7bcdce..04d24403 100644
--- a/profiles/command/src/test/java/org/onap/cli/fw/cmd/cmd/OpenCommandShellCmdTest.java
+++ b/profiles/command/src/test/java/org/onap/cli/fw/cmd/cmd/OpenCommandShellCmdTest.java
@@ -1,51 +1,77 @@
-/*

- * Copyright 2022 Samsung Electronics

- *

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- *     http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-

-package org.onap.cli.fw.cmd.cmd;

-

-import org.junit.Assert;

-import org.junit.Test;

-

-import java.util.*;

-

-public class OpenCommandShellCmdTest {

-    List<String> command = new ArrayList<>();

-    Map<String, String> envVariable = new HashMap<String, String>();

-    Map<String, String> resultMap = new IdentityHashMap<>();

-

-    @Test

-    public void setCmdTest() {

-        OpenCommandShellCmd cmdShell = new OpenCommandShellCmd();

-        command.add("test");

-        cmdShell.setCommand(command);

-        Assert.assertEquals("test", cmdShell.getCommand().get(0));

-    }

-

-    @Test

-    public void setCmdEnvVariable() {

-        OpenCommandShellCmd cmdShell = new OpenCommandShellCmd();

-        envVariable.put("variableOne","test");

-        cmdShell.setEnvs(envVariable);

-        Assert.assertEquals("test", cmdShell.getEnvs().get("variableOne"));

-    }

-

-    @Test

-    public void setCmdError() {

-        OpenCommandShellCmd cmdShell = new OpenCommandShellCmd();

-        cmdShell.setError("Timeout");

-        Assert.assertEquals("Timeout", cmdShell.getError());

-    }

-}

+/*
+ * Copyright 2022 Samsung Electronics
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onap.cli.fw.cmd.cmd;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.*;
+
+public class OpenCommandShellCmdTest {
+    List<String> command = new ArrayList<>();
+    Map<String, String> envVariable = new HashMap<String, String>();
+    Map<String, String> resultMap = new IdentityHashMap<>();
+
+    @Test
+    public void setCmdTest() {
+        OpenCommandShellCmd cmdShell = new OpenCommandShellCmd();
+        command.add("test");
+        cmdShell.setCommand(command);
+        Assert.assertEquals("test", cmdShell.getCommand().get(0));
+    }
+
+    @Test
+    public void setCmdEnvVariableTest() {
+        OpenCommandShellCmd cmdShell = new OpenCommandShellCmd();
+        envVariable.put("variableOne","test");
+        cmdShell.setEnvs(envVariable);
+        Assert.assertEquals("test", cmdShell.getEnvs().get("variableOne"));
+    }
+
+    @Test
+    public void setCmdErrorTest() {
+        OpenCommandShellCmd cmdShell = new OpenCommandShellCmd();
+        cmdShell.setError("Timeout");
+        Assert.assertEquals("Timeout", cmdShell.getError());
+    }
+
+    @Test
+    public void setResultMapTest() {
+        OpenCommandShellCmd cmdShell = new OpenCommandShellCmd();
+        Map<String, String> resultMap = new HashMap<>();
+        resultMap.put("var1","text1");
+        cmdShell.setResultMap(resultMap);
+        Assert.assertEquals("text1", cmdShell.getResultMap().get("var1"));
+    }
+
+    @Test
+    public void setCmdOutputTest() {
+        OpenCommandShellCmd cmdShell = new OpenCommandShellCmd();
+        cmdShell.setOutput("Timeout");
+        Assert.assertEquals("Timeout", cmdShell.getOutput());
+    }
+
+    @Test
+    public void setPassCodesTest() {
+        OpenCommandShellCmd cmdShell = new OpenCommandShellCmd();
+        List<Integer> resultMap = new ArrayList<Integer>();
+        resultMap.add(200);
+        cmdShell.setPassCodes(resultMap);
+        Assert.assertEquals(Optional.ofNullable(200), Optional.ofNullable(cmdShell.getPassCodes().get(0)));
+    }
+}
+
diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/cmd/OnapHttpCommand.java b/profiles/http/src/main/java/org/onap/cli/fw/http/cmd/OnapHttpCommand.java
index b4654cc8..d18090b1 100644
--- a/profiles/http/src/main/java/org/onap/cli/fw/http/cmd/OnapHttpCommand.java
+++ b/profiles/http/src/main/java/org/onap/cli/fw/http/cmd/OnapHttpCommand.java
@@ -218,7 +218,7 @@ public class OnapHttpCommand extends OnapCommand {
             if (isAuthRequired) {
                 this.authClient.logout();
             }
-        } catch (OnapCommandException e) {
+        } catch (OnapCommandException e) { //NOSONAR
             throw e;
         } finally {
             this.getResult().setDebugInfo(this.input.toString() + "\n" + this.output.toString());
@@ -262,7 +262,7 @@ public class OnapHttpCommand extends OnapCommand {
         try{
             generateJsonMock(this.getInput(), output, this.getSchemaName());
         } catch (OnapCommandFailedMocoGenerate e) {
-            //NO SONAR ignore it
+            //NOSONAR ignore it
         }
     }