Update framework

Issue-ID: CLI-169

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

5 files changed, 18 insertions, 39 deletions

diff --git a/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockRequest.java b/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockRequest.java
index cbb2a26a..d1d8b08d 100644
--- a/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockRequest.java
+++ b/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockRequest.java
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.Map;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -61,8 +62,12 @@ public class MockRequest {
 
     public void setJson(String json) throws IOException {
         if (!json.isEmpty()) {
-            ObjectMapper objectMapper = new ObjectMapper();
-            this.json = objectMapper.readTree(json);
+            try {
+                ObjectMapper objectMapper = new ObjectMapper();
+                this.json = objectMapper.readTree(json);
+            } catch (Exception e) {
+                this.json = new ObjectMapper().readTree("{}");
+            }
         }
 
     }
diff --git a/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockResponse.java b/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockResponse.java
index 7e8cdca8..d7999bea 100644
--- a/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockResponse.java
+++ b/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockResponse.java
@@ -38,9 +38,13 @@ public class MockResponse {
     }
 
     public void setJson(String json) throws IOException {
-        if (json != null && !json.isEmpty()) {
-            ObjectMapper objectMapper = new ObjectMapper();
-            this.json = objectMapper.readTree(json);
+        if (!json.isEmpty()) {
+            try {
+                ObjectMapper objectMapper = new ObjectMapper();
+                this.json = objectMapper.readTree(json);
+            } catch (Exception e) {
+                this.json = new ObjectMapper().readTree("{}");
+            }
         }
     }
 }
diff --git a/validate/sample-mock-generator/src/test/java/org/onap/cli/http/mock/MockJsonGeneratorTest.java b/validate/sample-mock-generator/src/test/java/org/onap/cli/http/mock/MockJsonGeneratorTest.java
index 3b79057f..0e0c0f59 100644
--- a/validate/sample-mock-generator/src/test/java/org/onap/cli/http/mock/MockJsonGeneratorTest.java
+++ b/validate/sample-mock-generator/src/test/java/org/onap/cli/http/mock/MockJsonGeneratorTest.java
@@ -34,32 +34,4 @@ public class MockJsonGeneratorTest {
 
         MockJsonGenerator.generateMocking(mockRequest, mockResponse, "target/test");
     }
-
-    @Test(expected=IOException.class)
-    public void mocoGenerateFailedInvalidBodyTest() throws IOException {
-        MockRequest mockRequest = new MockRequest();
-        mockRequest.setJson("{\"value\" : \"234sdf-345\"");
-        mockRequest.setMethod("get");
-        mockRequest.setUri("http://1.1.1.1:80/getResource");
-
-        MockResponse mockResponse = new MockResponse();
-        mockResponse.setStatus(200);
-        mockResponse.setJson("{\"value\" : \"234sdf-345\"");
-
-        MockJsonGenerator.generateMocking(mockRequest, mockResponse, "target/test");
-    }
-
-    @Test(expected=IOException.class)
-    public void mocoGenerateFailedInvalidUrlTest() throws IOException {
-        MockRequest mockRequest = new MockRequest();
-        mockRequest.setJson("{\"value\" : \"234sdf-345\"");
-        mockRequest.setMethod("get");
-        mockRequest.setUri("http://1.1.1.1:80:invalid");
-
-        MockResponse mockResponse = new MockResponse();
-        mockResponse.setStatus(200);
-        mockResponse.setJson("{\"value\" : \"234sdf-345\"");
-
-        MockJsonGenerator.generateMocking(mockRequest, mockResponse, "target/test");
-    }
 }
diff --git a/validate/sample-yaml-generator/src/main/java/org/onap/cli/sample/yaml/SampleYamlGenerator.java b/validate/sample-yaml-generator/src/main/java/org/onap/cli/sample/yaml/SampleYamlGenerator.java
index 179eaa36..b2e2dc88 100644
--- a/validate/sample-yaml-generator/src/main/java/org/onap/cli/sample/yaml/SampleYamlGenerator.java
+++ b/validate/sample-yaml-generator/src/main/java/org/onap/cli/sample/yaml/SampleYamlGenerator.java
@@ -27,11 +27,9 @@ public class SampleYamlGenerator {
 
     static int nTab;
 
-    public static void generateSampleYaml(List<String> input, String output, String version,
+    public static void generateSampleYaml(String cmdName, List<String> input, String output, String version,
             String targetPath, boolean debug) throws IOException {
 
-        String cmdName = input.get(0);
-
         PrintWriter writer = new PrintWriter(targetPath, "UTF-8");
         writeKeyValuePair(writer, "open_cli_sample_version", "1.0");
         writeKeyValuePair(writer, "name", cmdName);
@@ -41,7 +39,7 @@ public class SampleYamlGenerator {
         writeKey(writer, "sample1");
 
         writeKeyValuePair(writer, "name", cmdName);
-        writeKeyValuePair(writer, "input", input.stream().skip(1).collect(Collectors.joining(" ")).trim());
+        writeKeyValuePair(writer, "input", input.stream().collect(Collectors.joining(" ")).trim());
         writeKeyValuePair(writer, "moco", new File(targetPath).getName().replaceAll("-sample.yaml", "-moco.json"));
         writeMultilineKeyValue(writer, "output", output.trim(), debug);
 
@@ -60,7 +58,7 @@ public class SampleYamlGenerator {
         writer.write(" |\n");
         nTab++;
         String[] lines = value.split("\n");
-        long skipLines = debug ? 11 : 0;
+        long skipLines = debug ? 0 : 0;
         Arrays.stream(lines).skip(skipLines ).forEach(line -> writer.write(printTabs() + line + "\n")); // NOSONAR
     }
 
diff --git a/validate/sample-yaml-generator/src/test/java/org/onap/cli/sample/yaml/SampleYamlGeneratorTest.java b/validate/sample-yaml-generator/src/test/java/org/onap/cli/sample/yaml/SampleYamlGeneratorTest.java
index 98c0ce9d..fba93e62 100644
--- a/validate/sample-yaml-generator/src/test/java/org/onap/cli/sample/yaml/SampleYamlGeneratorTest.java
+++ b/validate/sample-yaml-generator/src/test/java/org/onap/cli/sample/yaml/SampleYamlGeneratorTest.java
@@ -25,7 +25,7 @@ public class SampleYamlGeneratorTest {
 
     @Test
     public void testGenerateSampleYaml() throws IOException {
-        SampleYamlGenerator.generateSampleYaml(Arrays.asList("testcmd", "-a", "argument"),
+        SampleYamlGenerator.generateSampleYaml("testcmd", Arrays.asList("-a", "argument"),
                 "+--------+\n+val     +\n+argument+", "test-version-1.0", "target/test.yaml", false);
     }