Merge changes I816a1dbb,Ice38da57,I1217d391,I07d22e81,I0ddcdc1c, ...

* changes:
  Add integration support
  Update framework
  Add vf model add artifact command
  Add service model artifact add command
  Add VF model checkout command
  Add VF checkin command
  Add sdc service resource property set
  Add sdc consumer-show command
  Add sdc consumer create command
  Add ID output in service-model commands
  Update open-cli.properties
  Update the sample command OCS YAML
  Add product into service and schema list
  Update the version format
  Update the README
  Set SNAPSHOT versioning
  clean-up stale onap profiles
  Ignore python build artifacts from git

1 files changed, 0 insertions, 28 deletions

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");
-    }
 }