Improve validation test cases

CLI-57

Change-Id: I1c44db4d71893af0093598ac4d539774360d1ab6
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

2 files changed, 6 insertions, 5 deletions

diff --git a/validate/validation/src/test/java/org/onap/cli/moco/OnapCommandHttpMocoServer.java b/validate/validation/src/test/java/org/onap/cli/moco/OnapCommandHttpMocoServer.java
index 7f84704c..a3e23a64 100644
--- a/validate/validation/src/test/java/org/onap/cli/moco/OnapCommandHttpMocoServer.java
+++ b/validate/validation/src/test/java/org/onap/cli/moco/OnapCommandHttpMocoServer.java
@@ -147,10 +147,9 @@ public class OnapCommandHttpMocoServer {
 
         String output = new String(bo.toByteArray());
 
-        //mrkanag uncomment following lines once moco server setup is done
-        //assert cli.getExitCode() == 0;
+        assert cli.getExitCode() == 0;
 
-        //assert sample.getOutput().equals(output);
+        assert sample.getOutput().equals(output);
     }
 
     public void verifySamples() throws OnapCommandException {
diff --git a/validate/validation/src/test/java/org/onap/cli/validation/OnapCliMainTest.java b/validate/validation/src/test/java/org/onap/cli/validation/OnapValidationTest.java
index cfccef62..f2c27fc7 100644
--- a/validate/validation/src/test/java/org/onap/cli/validation/OnapCliMainTest.java
+++ b/validate/validation/src/test/java/org/onap/cli/validation/OnapValidationTest.java
@@ -19,6 +19,7 @@ package org.onap.cli.validation;
 import java.io.IOException;
 
 import org.aspectj.lang.annotation.After;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.onap.cli.fw.OnapCommandRegistrar;
 import org.onap.cli.fw.error.OnapCommandException;
@@ -26,7 +27,7 @@ import org.onap.cli.fw.utils.ExternalSchema;
 import org.onap.cli.main.OnapCli;
 import org.onap.cli.moco.OnapCommandHttpMocoServer;
 
-public class OnapCliMainTest {
+public class OnapValidationTest {
 
     OnapCli cli = null;
 
@@ -58,7 +59,7 @@ public class OnapCliMainTest {
     }
 
     @Test
-    public void usageReadTheDocsTest() throws OnapCommandException {
+    public void genReadTheDocs() throws OnapCommandException {
         for (String version: OnapCommandRegistrar.getRegistrar().getAvailableProductVersions()) {
             OnapCommandRegistrar.getRegistrar().setEnabledProductVersion(version);
             System.out.println(version);
@@ -75,6 +76,7 @@ public class OnapCliMainTest {
         }
     }
 
+    @Ignore
     @Test
     public void validateCommands() throws OnapCommandException {
         OnapCommandHttpMocoServer server = new OnapCommandHttpMocoServer();