Merge changes I7388da38,Idcccea23,Ie8a98a2a,I1f83cc9d,Idf2aa6f8

* changes:
  Verfiy Invalid samples
  Add UT for validating using moco
  Enhance validation with moco server
  Model onap-cli-sample in java class
  Fix registrar test command registration UT

2 files changed, 15 insertions, 5 deletions

diff --git a/framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java b/framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java
index 16c3f2f3..4f5c95e2 100644
--- a/framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java
@@ -60,19 +60,18 @@ public class OnapCommandRegistrarTest {
     public void registerTest() throws OnapCommandException {
         OnapCommand test = new OnapCommandTest();
         Class<OnapCommand> cmd = (Class<OnapCommand>) test.getClass();
-        registerar.register("Test", "cli-1.0", cmd);
-        OnapCommand cc = registerar.get("Test");
+        registerar.register("test", "cli-1.0", cmd);
+        OnapCommand cc = registerar.get("test");
         assertTrue(cmd == cc.getClass());
 
     }
 
     @Test
-    // For Coverage
     public void cmdTestSchema() throws OnapCommandException {
         OnapCommand test = new OnapCommandTest();
         Class<OnapCommand> cmd = (Class<OnapCommand>) test.getClass();
-        registerar.register("Test", "cli-1.0", cmd);
-        OnapCommand cc = registerar.get("Test");
+        registerar.register("test", "cli-1.0", cmd);
+        OnapCommand cc = registerar.get("test");
     }
 
     @Test
diff --git a/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java b/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java
index e56eac03..cc12cfc0 100644
--- a/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java
@@ -256,6 +256,17 @@ public class OnapCommandErrorTest {
     }
 
     @Test
+    public void onapCommandSampleInvalidTest() {
+        OnapCommandInvalidSample failed = new OnapCommandInvalidSample("Test", "error");
+
+        assertEquals("0xf001::Invalid command sample Test, error", failed.getMessage());
+
+        failed = new OnapCommandInvalidSample("Test", new Exception("error"));
+
+        assertEquals("0xf001::Invalid command sample Test, error", failed.getMessage());
+    }
+
+    @Test
     public void onapCommandServiceNotFoundTest() {
         OnapCommandServiceNotFound failed = new OnapCommandServiceNotFound("Service");