1 files changed, 8 insertions, 4 deletions

diff --git a/validation/src/test/java/org/onap/cli/validation/OnapCliMainTest.java b/validation/src/test/java/org/onap/cli/validation/OnapCliMainTest.java
index 836505d7..779978f9 100644
--- a/validation/src/test/java/org/onap/cli/validation/OnapCliMainTest.java
+++ b/validation/src/test/java/org/onap/cli/validation/OnapCliMainTest.java
@@ -17,16 +17,14 @@
 package org.onap.cli.validation;
 
 import java.io.IOException;
-import java.util.Map;
-import java.util.Set;
 
 import org.aspectj.lang.annotation.After;
 import org.junit.Test;
 import org.onap.cli.fw.OnapCommandRegistrar;
 import org.onap.cli.fw.error.OnapCommandException;
 import org.onap.cli.fw.utils.ExternalSchema;
-import org.onap.cli.fw.utils.OnapCommandUtils;
 import org.onap.cli.main.OnapCli;
+import org.onap.cli.moco.OnapCommandHttpMocoServer;
 
 public class OnapCliMainTest {
 
@@ -50,7 +48,7 @@ public class OnapCliMainTest {
     }
 
     @Test
-    public void validateCommands() throws IOException, OnapCommandException {
+    public void validateCommandSchemas() throws IOException, OnapCommandException {
         OnapCommandRegistrar.getRegistrar().setEnabledProductVersion("cli-1.0");
         for (ExternalSchema sch : OnapCommandRegistrar.getRegistrar().listCommandInfo()) {
             System.out.println(
@@ -76,4 +74,10 @@ public class OnapCliMainTest {
         }
     }
 
+    @Test
+    public void validateCommands() throws OnapCommandException {
+        OnapCommandHttpMocoServer server = new OnapCommandHttpMocoServer();
+        server.verifySamples();
+    }
+
  }