2 files changed, 62 insertions, 20 deletions

diff --git a/main/src/main/java/org/onap/cli/main/OnapCli.java b/main/src/main/java/org/onap/cli/main/OnapCli.java
index 36db86c3..57e39f20 100644
--- a/main/src/main/java/org/onap/cli/main/OnapCli.java
+++ b/main/src/main/java/org/onap/cli/main/OnapCli.java
@@ -71,10 +71,10 @@ public class OnapCli {
         System.out.println(throwable.getMessage());
         try {
             if (OnapCommandRegistrar.getRegistrar().isDevMode()) {
-                throwable.printStackTrace();
+                throwable.printStackTrace();  // NOSONAR
             }
         } catch (OnapCommandException e) {
-            //  NOSONAR
+            // pass // NOSONAR
         }
     }
 
@@ -144,7 +144,7 @@ public class OnapCli {
         }
     }
 
-    private String getDirectiveHelp() throws OnapCommandHelpFailed {
+    public static String getDirectiveHelp() throws OnapCommandHelpFailed {
         OnapCommandResult help = new OnapCommandResult();
         help.setType(ResultType.TABLE);
         help.setPrintDirection(PrintDirection.LANDSCAPE);
@@ -213,7 +213,7 @@ public class OnapCli {
                     if (!args.isEmpty() && this.args.get(0).equals(OnapCliConstants.PARAM_INTERACTIVE_USE)) {
                         if (args.size() == 1) {
                             this.print("Please input the product version to use, supported versions: " +
-                        OnapCommandRegistrar.getRegistrar().getAvailableProductVersions());
+                                    OnapCommandRegistrar.getRegistrar().getAvailableProductVersions());
                         } else {
                             try {
                                 OnapCommandRegistrar.getRegistrar().setEnabledProductVersion(args.get(1));
diff --git a/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java b/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java
index 05dd7d4c..0a84d268 100644
--- a/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java
+++ b/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java
@@ -16,12 +16,13 @@
 
 package org.onap.cli.main;
 
-import static org.junit.Assert.assertTrue;
-
-import jline.console.ConsoleReader;
-import mockit.Invocation;
-import mockit.Mock;
-import mockit.MockUp;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 import org.aspectj.lang.annotation.After;
 import org.junit.Ignore;
@@ -29,17 +30,14 @@ import org.junit.Test;
 import org.onap.cli.fw.OnapCommand;
 import org.onap.cli.fw.OnapCommandRegistrar;
 import org.onap.cli.fw.error.OnapCommandException;
+import org.onap.cli.fw.error.OnapCommandHelpFailed;
 import org.onap.cli.main.utils.OnapCliUtils;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import jline.console.ConsoleReader;
+import mockit.Invocation;
+import mockit.Mock;
+import mockit.MockUp;
+import static org.junit.Assert.fail;
 
 public class OnapCliMainTest {
 
@@ -89,6 +87,12 @@ public class OnapCliMainTest {
 
     @Ignore
     @Test
+    public void testHandleProfile() {
+        this.handle(new String[] { "-c", "test" });
+    }
+
+    @Ignore
+    @Test
     public void testAAICustomerList() {
         this.handle(new String[] { "customer-list", "-u", "AAI", "-p", "AAI", "-m", "https://192.168.17.12:8443" });
     }
@@ -144,6 +148,36 @@ public class OnapCliMainTest {
         } catch (Exception e) {
         }
 
+        mockConsole("set a=b");
+        try {
+            cli.handleInteractive();
+        } catch (Exception e) {
+        }
+
+        mockConsole("unset a");
+        try {
+            cli.handleInteractive();
+        } catch (Exception e) {
+        }
+
+        mockConsole("profile test");
+        try {
+            cli.handleInteractive();
+        } catch (Exception e) {
+        }
+
+        mockConsole("version");
+        try {
+            cli.handleInteractive();
+        } catch (Exception e) {
+        }
+
+        mockConsole("help");
+        try {
+            cli.handleInteractive();
+        } catch (Exception e) {
+        }
+
         mockConsoleReader();
         cli.handleInteractive();
 
@@ -166,7 +200,7 @@ public class OnapCliMainTest {
             public String readLine(Invocation inv) throws IOException {
                 if (isMock) {
                     isMock = false;
-                return input;
+                    return input;
                 } else {
                     return inv.proceed(input);
                 }
@@ -174,4 +208,12 @@ public class OnapCliMainTest {
         };
     }
 
+    @Test
+    public void testDirectiveHelp() {
+        try {
+            OnapCli.getDirectiveHelp();
+        } catch (OnapCommandHelpFailed e) {
+             fail("Directive help failed to run");
+        }
+    }
 }