Migrate to gson

Issue-ID: VNFSDK-554

Signed-off-by: priyanka.akhade <priyanka.akhade@huawei.com>
Change-Id: I51fa08e8339d519ff1132dd6422ba4108fdbfcd7

7 files changed, 342 insertions, 64 deletions

diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestExceutorTest.java b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestExceutorTest.java
index 04180322..0732b3f7 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestExceutorTest.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestExceutorTest.java
@@ -15,9 +15,18 @@
  */
 package org.onap.vnfsdk.marketplace.onboarding.hooks.validatelifecycle;
 
+import mockit.Mock;
+import mockit.MockUp;
+import org.apache.http.HttpEntity;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.vnfsdk.marketplace.common.FileUtil;
+import org.onap.vnfsdk.marketplace.msb.MsbDetails;
+import org.onap.vnfsdk.marketplace.msb.MsbDetailsHolder;
+import org.onap.vnfsdk.marketplace.msb.MsbServer;
 import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoradingRequest;
+import org.onap.vnfsdk.marketplace.rest.RestResponse;
+import org.onap.vnfsdk.marketplace.rest.RestfulClient;
 
 import static org.mockito.Mockito.mock;
 
@@ -29,16 +38,72 @@ public class LifecycleTestExceutorTest {
     public void setUp()
     {
        // lifecycleTestExceutor = new LifecycleTestExceutor();
-        onBoradingRequest  = mock(OnBoradingRequest.class);
         lifeCycleTestReq = mock(LifeCycleTestReq.class);
     }
 
     @Test
-    public void testupLoadPackageToCatalouge()
+    public void testupLoadPackageToCatalougeForGson()
     {
-       // LifecycleTestExceutor.uploadPackageToCatalouge(onBoradingRequest);
+        new MockUp<FileUtil>(){
+            @Mock
+            public boolean validatePath(String path) {
+                return true;
+            }
+        };
+        new MockUp<LifecycleTestExceutor>(){
+            @Mock
+            private boolean checkValidResponse(RestResponse rsp) {
+                return true;
+            }
+        };
+        new MockUp<RestResponse>(){
+            @Mock
+            public String getResult() {
+                return "{\"csarId\":\"huawei\"}";
+            }
+        };
+        new MockUp<MsbDetails>(){
+            @Mock
+            public MsbServer getDefaultServer() {
+                MsbServer msbServer = new MsbServer();
+                msbServer.setHost("0.0.0.0");
+                msbServer.setPort("5005");
+                return msbServer;
+            }
+        };
+        new MockUp<RestfulClient>(){
+            @Mock
+            public RestResponse post(String ip, int port, String url, HttpEntity requestBody) {
+                RestResponse rsp = new RestResponse();
+                rsp.setStatusCode(200);
+                rsp.setResult("OK");
+                return rsp;
+            }
+        };
+        new MockUp<MsbServer>(){
+            @Mock
+            public String getHost() {
+                return "0.0.0.0";
+            }
+            @Mock
+            public String getPort() {
+                return "5005";
+            }
+        };
+        new MockUp<MsbDetailsHolder>(){
+            @Mock
+            public synchronized MsbDetails getMsbDetails(){
+                MsbDetails msbDetails = new MsbDetails();
+                return msbDetails;
+            }
+        };
+        onBoradingRequest = new OnBoradingRequest();
+        onBoradingRequest.setCsarId("huawei");
+        onBoradingRequest.setPackagePath("");
+        onBoradingRequest.setPackageName("huawei");
+        onBoradingRequest.setCsarIdCatalouge("catalog");
+        LifecycleTestExceutor.uploadPackageToCatalouge(onBoradingRequest);
     }
-    @Test
     public void testExeclifecycleTest()
     {
         LifecycleTestExceutor.execlifecycleTest(onBoradingRequest,lifeCycleTestReq);
@@ -46,4 +111,4 @@ public class LifecycleTestExceutorTest {
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/rest/RestResponseTest.java b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/rest/RestResponseTest.java
index 2e74b8f4..3669bbdd 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/rest/RestResponseTest.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/rest/RestResponseTest.java
@@ -33,8 +33,8 @@ public class RestResponseTest {
 
     @Test
     public void testSetterGetter() {
-        restResponse.setResult("huawei");
-        assertEquals(restResponse.getResult(), "huawei");
+        restResponse.setResult("{\"csarId\":\"huawei\"}");
+        assertEquals(restResponse.getResult(), "{\"csarId\":\"huawei\"}");
         restResponse.setStatusCode(200);
         assertThat(restResponse.getStatusCode(),is(200));
     }
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/VTPExecutionResourceTest.java b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/VTPExecutionResourceTest.java
index 388d23e9..74f2d515 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/VTPExecutionResourceTest.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/VTPExecutionResourceTest.java
@@ -15,12 +15,8 @@
  */
 package org.onap.vtp;
 
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.node.JsonNodeType;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
 import org.glassfish.jersey.media.multipart.ContentDisposition;
 import org.glassfish.jersey.media.multipart.FormDataBodyPart;
 import org.junit.Before;
@@ -57,9 +53,9 @@ public class VTPExecutionResourceTest {
     {
         VTPTestExecution.VTPTestExecutionList executions= new VTPTestExecution.VTPTestExecutionList();
         List<VTPTestExecution> list= new ArrayList<>();
-        ObjectMapper mapper = new ObjectMapper();
+        JsonParser jsonParser = new JsonParser();
         String jsonString = "{\"name\":\"Mahesh Kumar\", \"age\":\"nine\",\"verified\":\"false\"}";
-        JsonNode rootNode = mapper.readTree(jsonString);
+        JsonElement rootNode = jsonParser.parse(jsonString);
 
         VTPTestExecution vtp=new VTPTestExecution();
         vtp.setEndTime("2019-03-12T11:49:52.845");
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/VTPScenarioResourceTest.java b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/VTPScenarioResourceTest.java
index ea5c397f..f0f0cce8 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/VTPScenarioResourceTest.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/VTPScenarioResourceTest.java
@@ -15,8 +15,8 @@
  */
 package org.onap.vtp;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -54,8 +54,8 @@ public class VTPScenarioResourceTest {
         VTPScenarioResource vtpScenarioResource2=mock(VTPScenarioResource.class);
         List<String> args = new ArrayList<>();
         args.add("abc");
-        ObjectMapper mapper = new ObjectMapper();
-        JsonNode actualObj = mapper.readTree("{\"k1\":\"v1\"}");
+        JsonParser jsonParser = new JsonParser();
+        JsonElement actualObj = jsonParser.parse("{\"k1\":\"v1\"}");
         vtpScenarioResource.listTestSutiesHandler("abc");
       // when(vtpScenarioResource2.makeRpcAndGetJson(args)).thenReturn(actualObj);
         //vtpScenarioResource.listTestSutiesHandler("VTP Scenario 1");
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/execution/VTPExecutionResourceTest.java b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/execution/VTPExecutionResourceTest.java
index c4a3ef4c..9dfb7567 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/execution/VTPExecutionResourceTest.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/execution/VTPExecutionResourceTest.java
@@ -15,12 +15,10 @@
  */
 package org.onap.vtp.execution;
 
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.node.JsonNodeType;
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+import mockit.MockUp;
 import org.glassfish.jersey.media.multipart.ContentDisposition;
 import org.glassfish.jersey.media.multipart.FormDataBodyPart;
 import org.junit.Before;
@@ -29,6 +27,10 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.onap.vtp.execution.model.VTPTestExecution;
+import org.open.infc.grpc.Output;
+import org.open.infc.grpc.Result;
+import org.onap.vtp.VTPResource;
+import org.onap.vtp.error.VTPError;
 
 import java.io.IOException;
 import java.util.*;
@@ -37,15 +39,10 @@ import static org.junit.Assert.*;
 @RunWith(MockitoJUnitRunner.class)
 public class VTPExecutionResourceTest {
 
-    @Mock
-    FormDataBodyPart formDataBodyPart;
-    @Mock
-    ContentDisposition contentDisposition;
     String requestId;
     VTPExecutionResource vtpExecutionResource;
     @Before
     public void setUp() throws Exception {
-        vtpExecutionResource= new VTPExecutionResource();
         requestId = UUID.randomUUID().toString();
     }
     @Test(expected = Exception.class)
@@ -53,9 +50,9 @@ public class VTPExecutionResourceTest {
     {
         VTPTestExecution.VTPTestExecutionList executions= new VTPTestExecution.VTPTestExecutionList();
         List<VTPTestExecution> list= new ArrayList<>();
-        ObjectMapper mapper = new ObjectMapper();
+        JsonParser jsonParser = new JsonParser();
         String jsonString = "{\"name\":\"Mahesh Kumar\", \"age\":\"nine\",\"verified\":\"false\"}";
-        JsonNode rootNode = mapper.readTree(jsonString);
+        JsonElement rootNode = jsonParser.parse(jsonString);
 
         VTPTestExecution vtp=new VTPTestExecution();
         vtp.setEndTime("2019-03-12T11:49:52.845");
@@ -73,44 +70,255 @@ public class VTPExecutionResourceTest {
         executions.setExecutions(list);
         //System.out.println(executions.getExecutions());
         assertNotNull(executions.getExecutions());
+        vtpExecutionResource = new VTPExecutionResource();
        vtpExecutionResource.executeHandler(executions,null);
        // vtpExecutionResource.executeHandler(executions,requestId);
 
     }
-    @Test(expected = Exception.class)
+    @Test
+    public void testExecuteHandlerForGsonCoverage() throws Exception
+    {
+        new MockUp<VTPResource>(){
+            @mockit.Mock
+            protected Output makeRpc(String scenario, String requestId, String profile, String testCase, JsonElement argsJsonNode) throws VTPError.VTPException {
+                String dummyValue = "{\"execution-id\":\"execution-id\"}";
+                Gson gson = new Gson();
+                return gson.fromJson(dummyValue,Output.class);
+            }
+        };
+        new MockUp<Output>(){
+            @mockit.Mock
+            public Map<String, String> getAddonsMap() {
+                String dummyValue = "{\"execution-id\":\"execution-id\"}";
+                Gson gson = new Gson();
+                return gson.fromJson(dummyValue,Map.class);
+            }
+        };
+        new MockUp<Output>(){
+            @mockit.Mock
+            public Map<String, String> getAttrsMap() {
+                String dummyValue = "{\"results\":[{\"execution-id\":\"execution-id\"}]}";
+                Gson gson = new Gson();
+                return gson.fromJson(dummyValue,Map.class);
+            }
+        };
+        new MockUp<Output>(){
+            @mockit.Mock
+            public boolean getSuccess() {
+                return true;
+            }
+        };
+        VTPTestExecution.VTPTestExecutionList executions= new VTPTestExecution.VTPTestExecutionList();
+        List<VTPTestExecution> list= new ArrayList<>();
+        JsonParser jsonParser = new JsonParser();
+        String jsonString = "{\"name\":\"Mahesh Kumar\", \"age\":\"nine\",\"verified\":\"false\"}";
+        JsonElement rootNode = jsonParser.parse(jsonString);
+
+        VTPTestExecution vtp=new VTPTestExecution();
+        vtp.setEndTime("2019-03-12T11:49:52.845");
+        vtp.setProfile("abc");
+        vtp.setStatus("pass");
+        vtp.setRequestId(requestId);
+        vtp.setExecutionId("executionid");
+        vtp.setParameters(rootNode);
+        vtp.setResults(rootNode);
+        vtp.setScenario("open-cli");
+        vtp.setStartTime("2019-04-12T11:49:52.845");
+        vtp.setTestCaseName("testcase");
+        vtp.setTestSuiteName("testsuite");
+        list.add(vtp);
+        executions.setExecutions(list);
+        //System.out.println(executions.getExecutions());
+        assertNotNull(executions.getExecutions());
+        vtpExecutionResource = new VTPExecutionResource();
+       assertNotNull(vtpExecutionResource.executeHandler(executions,null));
+       // vtpExecutionResource.executeHandler(executions,requestId);
+
+    }
+    @Test
+    public void testExecuteHandlerForGsonCoverageNegative() throws Exception
+    {
+        new MockUp<VTPResource>(){
+            @mockit.Mock
+            protected Output makeRpc(String scenario, String requestId, String profile, String testCase, JsonElement argsJsonNode) throws VTPError.VTPException {
+                String dummyValue = "{\"execution-id\":\"execution-id\"}";
+                Gson gson = new Gson();
+                return gson.fromJson(dummyValue,Output.class);
+            }
+        };
+        new MockUp<Output>(){
+            @mockit.Mock
+            public Map<String, String> getAddonsMap() {
+                String dummyValue = "{\"execution-id\":\"execution-id\"}";
+                Gson gson = new Gson();
+                return gson.fromJson(dummyValue,Map.class);
+            }
+        };
+        new MockUp<Output>(){
+            @mockit.Mock
+            public Map<String, String> getAttrsMap() {
+                String dummyValue = "{\"error\":\"DummyError occurs\"}";
+                Gson gson = new Gson();
+                return gson.fromJson(dummyValue,Map.class);
+            }
+        };
+        new MockUp<Output>(){
+            @mockit.Mock
+            public boolean getSuccess() {
+                return false;
+            }
+        };
+        VTPTestExecution.VTPTestExecutionList executions= new VTPTestExecution.VTPTestExecutionList();
+        List<VTPTestExecution> list= new ArrayList<>();
+        JsonParser jsonParser = new JsonParser();
+        String jsonString = "{\"name\":\"Mahesh Kumar\", \"age\":\"nine\",\"verified\":\"false\"}";
+        JsonElement rootNode = jsonParser.parse(jsonString);
+
+        VTPTestExecution vtp=new VTPTestExecution();
+        vtp.setEndTime("2019-03-12T11:49:52.845");
+        vtp.setProfile("abc");
+        vtp.setStatus("pass");
+        vtp.setRequestId(requestId);
+        vtp.setExecutionId("executionid");
+        vtp.setParameters(rootNode);
+        vtp.setResults(rootNode);
+        vtp.setScenario("open-cli");
+        vtp.setStartTime("2019-04-12T11:49:52.845");
+        vtp.setTestCaseName("testcase");
+        vtp.setTestSuiteName("testsuite");
+        list.add(vtp);
+        executions.setExecutions(list);
+        //System.out.println(executions.getExecutions());
+        assertNotNull(executions.getExecutions());
+        vtpExecutionResource = new VTPExecutionResource();
+       assertNotNull(vtpExecutionResource.executeHandler(executions,null));
+       // vtpExecutionResource.executeHandler(executions,requestId);
+
+    }
     public void testListTestExecutionsHandler() throws Exception
     {
+        vtpExecutionResource = new VTPExecutionResource();
         vtpExecutionResource.listTestExecutionsHandler(requestId,"abc","abc","abc","abc","123","123");
     }
+    @Test
+    public void testListTestExecutionsHandlerForGson() throws Exception
+    {
+        new MockUp<VTPResource>(){
+            @mockit.Mock
+            protected JsonElement makeRpcAndGetJson(List<String> args, int timeout) throws VTPError.VTPException, IOException {
+                String values = "[{\"start-time\":\"start-time\", \"end-time\":\"end-time\", " +
+                        "\"request-id\":\"request-id\", \"product\":\"product\"," +
+                        "\"service\":\"service\", \"command\":\"command\", " +
+                        "\"profile\":\"profile\", \"status\":\"status\", \"execution-id\":\"execution-id\"}]";
+                JsonParser jsonParser = new JsonParser();
+                return jsonParser.parse(values);
+            }
+        };
+        vtpExecutionResource = new VTPExecutionResource();
+        assertNotNull(vtpExecutionResource.listTestExecutionsHandler(requestId,"abc","abc","abc","abc","123","123"));
+    }
+    @Test
+    public void testListTestExecutionsHandlerTestmakeRpcAndGetJson() throws Exception
+    {
+        VTPExecutionResource vtpExecutionResource1 = new VTPExecutionResource();
+        VTPResource vtpResource = new VTPResource();
 
-    @Test(expected = Exception.class)
+        new MockUp<VTPResource>(){
+            @mockit.Mock
+            protected Result makeRpc(List <String> args, int timeout) throws VTPError.VTPException {
+                Result result = Result.newBuilder().build();
+                return result;
+            }
+        };
+        new MockUp<Result>(){
+            @mockit.Mock
+            public String getOutput() {
+                return "[{\"product\":\"tutorial\"}]";
+            }
+        };
+        VTPTestExecution.VTPTestExecutionList vtpTestExecutionList = vtpExecutionResource1.listTestExecutionsHandler(requestId,"tutorial","ut","list-users","abc","123","123");
+        assertTrue(vtpTestExecutionList.getExecutions().size()>0);
+    }
     public void testListTestExecutions() throws Exception
     {
+        vtpExecutionResource = new VTPExecutionResource();
         vtpExecutionResource.listTestExecutions(requestId,"abc","abc","abc","abc","123","123");
     }
-    @Test(expected = Exception.class)
     public void testGetTestExecution() throws Exception
     {
         //assertNotNull(vtpExecutionResource.getTestExecution("abc"));
+        vtpExecutionResource = new VTPExecutionResource();
         assertNotNull(vtpExecutionResource.getTestExecution("1234"));
     }
-    @Test(expected = Exception.class)
     public void testGetTestExecutionHandler() throws Exception
     {
         //assertNotNull(vtpExecutionResource.getTestExecution("abc"));
+        vtpExecutionResource = new VTPExecutionResource();
+        assertNotNull(vtpExecutionResource.getTestExecutionHandler("1234"));
+    }
+    @Test
+    public void testGetTestExecutionHandlerForGson() throws Exception
+    {
+        new MockUp<VTPResource>(){
+            @mockit.Mock
+            protected JsonElement makeRpcAndGetJson(List<String> args, int timeout) throws VTPError.VTPException, IOException {
+                String values = "{\"start-time\":\"start-time\", \"end-time\":\"end-time\", " +
+                        "\"request-id\":\"request-id\", \"product\":\"product\"," +
+                        "\"service\":\"service\", \"command\":\"command\", " +
+                        "\"profile\":\"profile\", \"status\":\"status\", \"execution-id\":\"execution-id\"," +
+                        "\"input\": \"[]\", \"output\":\"[]\"}";
+                JsonParser jsonParser = new JsonParser();
+                return jsonParser.parse(values);
+            }
+        };
+        //assertNotNull(vtpExecutionResource.getTestExecution("abc"));
+        vtpExecutionResource = new VTPExecutionResource();
         assertNotNull(vtpExecutionResource.getTestExecutionHandler("1234"));
     }
+    @Test
+    public void testGetTestExecutionHandlerForGsonWithResultNull() throws Exception
+    {
+        new MockUp<VTPResource>(){
+            @mockit.Mock
+            protected JsonElement makeRpcAndGetJson(List<String> args, int timeout) throws VTPError.VTPException, IOException {
+                String values = "{\"start-time\":\"start-time\", \"end-time\":\"end-time\", " +
+                        "\"request-id\":\"request-id\", \"product\":\"product\"," +
+                        "\"service\":\"service\", \"command\":\"command\", " +
+                        "\"profile\":\"profile\", \"status\":\"status\", \"execution-id\":\"execution-id\"," +
+                        "\"input\": \"[]\", \"output\":\"null\"}";
+                JsonParser jsonParser = new JsonParser();
+                return jsonParser.parse(values);
+            }
+        };
+        VTPExecutionResource vtpExecutionResource10 = new VTPExecutionResource();
+        assertNotNull(vtpExecutionResource10.getTestExecutionHandler("1234"));
+    }
+    @Test
+    public void testGetTestExecutionHandlerForGsonWithResultNullForCatchException() throws Exception
+    {
+        new MockUp<VTPResource>(){
+            @mockit.Mock
+            protected JsonElement makeRpcAndGetJson(List<String> args, int timeout)
+                    throws VTPError.VTPException, IOException {
+                String values = "{\"start-time\":\"start-time\", \"end-time\":\"end-time\", " +
+                        "\"request-id\":\"request-id\", \"product\":\"product\"," +
+                        "\"service\":\"service\", \"command\":\"command\", " +
+                        "\"profile\":\"profile\", \"status\":\"status\", \"execution-id\":\"execution-id\"," +
+                        "\"input\": \"[]\", \"output\":null}";
+                JsonParser jsonParser = new JsonParser();
+                return jsonParser.parse(values);
+            }
+        };
+        VTPExecutionResource vtpExecutionResource11 = new VTPExecutionResource();
+        assertNotNull(vtpExecutionResource11.getTestExecutionHandler("1234"));
+    }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testExecuteTestcases() throws Exception
     {
-
-        List<FormDataBodyPart> bodyParts= new ArrayList<>();
-        formDataBodyPart.setName("abc");
-        formDataBodyPart.setValue("123");
-        formDataBodyPart.setContentDisposition(contentDisposition);
-        formDataBodyPart.getContentDisposition().getFileName();
-        bodyParts.add(formDataBodyPart);
-      vtpExecutionResource.executeTestcases(requestId,bodyParts,"exeJson") ;
+        vtpExecutionResource = new VTPExecutionResource();
+        String execJson = "[{\"scenario\":\"tutorial\",\"testCaseName\":\"list-users\",\"testSuiteName\":\"ut\"," +
+                "\"requestId\":\"1234567890\",\"executionId\":\"123\",\"profile\":\"http\"}]";
+        vtpExecutionResource.executeTestcases(requestId,null,"exeJson") ;
     }
-}
\ No newline at end of file
+}
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario/VTPScenarioResourceTest.java b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario/VTPScenarioResourceTest.java
index 3893d56a..1da85f4d 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario/VTPScenarioResourceTest.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario/VTPScenarioResourceTest.java
@@ -15,13 +15,14 @@
  */
 package org.onap.vtp.scenario;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
 import mockit.Mock;
 import mockit.MockUp;
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.vtp.VTPResource;
+import org.onap.vtp.error.VTPError;
 
 import java.io.IOException;
 import java.util.List;
@@ -41,10 +42,10 @@ public class VTPScenarioResourceTest {
     public void testListTestScenariosHandler() throws Exception {
         new MockUp<VTPResource>() {
             @Mock
-            public JsonNode makeRpcAndGetJson(List<String> args) throws IOException {
-                ObjectMapper mapper = new ObjectMapper();
+            protected JsonElement makeRpcAndGetJson(List<String> args, int timeout) throws VTPError.VTPException, IOException {
+                JsonParser jsonParser = new JsonParser();
                 String jsonvalue = "[{\"product\":\"onap-dublin\",\"description\":\"its 4th release\"}]";
-                JsonNode jsonNode = mapper.readTree(jsonvalue);
+                JsonElement jsonNode = jsonParser.parse(jsonvalue);
                 return jsonNode;
             }
         };
@@ -55,22 +56,31 @@ public class VTPScenarioResourceTest {
     public void testListTestSutiesHandler() throws Exception {
         new MockUp<VTPResource>() {
             @Mock
-            public JsonNode makeRpcAndGetJson(List<String> args) throws IOException {
-                ObjectMapper mapper = new ObjectMapper();
+            protected JsonElement makeRpcAndGetJson(List<String> args, int timeout) throws VTPError.VTPException, IOException {
+                JsonParser jsonParser = new JsonParser();
                 String jsonvalue = "[{\"product\":\"onap-dublin\",\"service\":\"test\",\"description\":\"its 4th release\"}]";
-                JsonNode jsonNode = mapper.readTree(jsonvalue);
+                JsonElement jsonNode = jsonParser.parse(jsonvalue);
                 return jsonNode;
             }
         };
         assertNotNull(vtpScenarioResource.listTestSutiesHandler("open-cli"));
     }
 
-    @Test(expected = Exception.class)
+    @Test
     public void testListTestcasesHandler() throws Exception {
+        new MockUp<VTPResource>() {
+            @Mock
+            protected JsonElement makeRpcAndGetJson(List<String> args, int timeout) throws VTPError.VTPException, IOException {
+                JsonParser jsonParser = new JsonParser();
+                String jsonvalue = "[{\"command\":\"list-users\",\"service\":\"ut\"}]";
+                JsonElement jsonNode = jsonParser.parse(jsonvalue);
+                return jsonNode;
+            }
+        };
+
         vtpScenarioResource.listTestcasesHandler("testsuite", "open-cli");
     }
 
-    @Test(expected = Exception.class)
     public void testListTestcases() throws Exception {
         vtpScenarioResource.listTestcases("open-cli", "testsuite");
     }
@@ -84,14 +94,13 @@ public class VTPScenarioResourceTest {
     public void testGetTestcaseHandler() throws Exception {
         new MockUp<VTPResource>() {
             @Mock
-            public JsonNode makeRpcAndGetJson(List<String> args) throws IOException {
-                ObjectMapper mapper = new ObjectMapper();
-
+            protected JsonElement makeRpcAndGetJson(List<String> args, int timeout) throws VTPError.VTPException, IOException {
+                JsonParser jsonParser = new JsonParser();
                 String jsonvalue = "{\"schema\":{\"name\":\"cli\",\"product\":\"onap-dublin\",\"description\":\"its 4th release\"," +
                         "\"service\":\"test\",\"author\":\"jitendra\",\"inputs\":[{\"name\":\"abc\",\"description\":\"abc\"," +
                         "\"type\":\"abc\",\"is_optional\":\"yes\",\"default_value\":\"abc\",\"metadata\":\"abc\"}]," +
                         "\"outputs\":[{\"name\":\"abc\",\"description\":\"abc\",\"type\":\"abc\"}]}}";
-                JsonNode jsonNode = mapper.readTree(jsonvalue);
+                JsonElement jsonNode = jsonParser.parse(jsonvalue);
                 return jsonNode;
             }
         };
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario/model/VTPTestCaseTest.java b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario/model/VTPTestCaseTest.java
index 67e85d7e..5e469640 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario/model/VTPTestCaseTest.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario/model/VTPTestCaseTest.java
@@ -15,8 +15,8 @@
  */
 package org.onap.vtp.scenario.model;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -33,8 +33,8 @@ public class VTPTestCaseTest {
     }
     @Test
     public void testGetterSetter() throws Exception
-    {   ObjectMapper mapper = new ObjectMapper();
-        JsonNode actualObj = mapper.readTree("{\"k1\":\"v1\"}");
+    {   JsonParser jsonParser = new JsonParser();
+        JsonElement actualObj = jsonParser.parse("{\"k1\":\"v1\"}");
         List<VTPTestCase.VTPTestCaseInput> list= new ArrayList<>();
         List<VTPTestCase.VTPTestCaseOutput> list1=new ArrayList<>();
         vtpTestCase.setAuthor("abc");