diff options
author | priyanka.akhade <priyanka.akhade@huawei.com> | 2020-03-06 14:51:01 +0000 |
---|---|---|
committer | priyanka.akhade <priyanka.akhade@huawei.com> | 2020-03-17 14:25:43 +0000 |
commit | 427fb7539233ece7759e27e04fa3b11d17b66ea7 (patch) | |
tree | 0682be21aed096c4cf75e78a14deee4b7ae6d1ec /vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario | |
parent | dd4a42d4d3eee7fe94dd057a8e734665156008f6 (diff) |
Migrate to gson
Issue-ID: VNFSDK-554
Signed-off-by: priyanka.akhade <priyanka.akhade@huawei.com>
Change-Id: I51fa08e8339d519ff1132dd6422ba4108fdbfcd7
Diffstat (limited to 'vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vtp/scenario')
2 files changed, 27 insertions, 18 deletions
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"); |