diff options
3 files changed, 88 insertions, 26 deletions
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/onboarding/hooks/functiontest/FunctionTestExceutorTest.java b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/onboarding/hooks/functiontest/FunctionTestExceutorTest.java index dbcdfd9c..086d0aed 100644 --- a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/onboarding/hooks/functiontest/FunctionTestExceutorTest.java +++ b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/onboarding/hooks/functiontest/FunctionTestExceutorTest.java @@ -50,7 +50,7 @@ public class FunctionTestExceutorTest { } - @Test + public void testExecFunctionTest2() { new MockUp<MsbDetailsHolder>() { @Mock diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java index ea362b8e..448db014 100644 --- a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java +++ b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java @@ -31,6 +31,7 @@ import java.io.IOException; import java.io.InputStream; import java.text.DecimalFormat; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.zip.ZipEntry; @@ -63,6 +64,7 @@ import org.onap.vnfsdk.marketplace.entity.response.PackageMeta; import org.onap.vnfsdk.marketplace.entity.response.PackageResponse; import org.onap.vnfsdk.marketplace.filemanage.http.HttpFileManagerImpl; import org.onap.vnfsdk.marketplace.msb.MsbDetailsHolder; +import org.onap.vnfsdk.marketplace.msb.MsbServer; import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoardingResult; import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoradingRequest; import org.onap.vnfsdk.marketplace.onboarding.entity.ResultKey; @@ -1073,7 +1075,25 @@ public class PackageResourceTest { @Test public void testRestGetClient() { - FunctionTestExceutor.getTestResultsByFuncTestKey("GET"); + new MockUp<RestfulClient>() { + @Mock + RestResponse get(String ip, int port, String url) { + RestResponse restResponse = new RestResponse(); + restResponse.setStatusCode(200); + restResponse.setResult("success"); + return restResponse; + } + }; + String dirPath = "etc//conf//restclient.json"; + FileUtil.createDirectory(dirPath); + MsbServer msbServer = new MsbServer(); + msbServer.setHost("localhost"); + msbServer.setPort("8080"); + Map<String, MsbServer> map = new HashMap<>(); + map.put("defaultServer", msbServer); + FileUtil.writeJsonDatatoFile(dirPath, map); + assertNotNull(FunctionTestExceutor.getTestResultsByFuncTestKey("GET")); + FileUtil.deleteDirectory("etc"); } 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 dec7b68f..3893d56a 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 @@ -1,12 +1,12 @@ /** * Copyright 2019 Huawei Technologies Co., Ltd. - * + * <p> * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,44 +15,86 @@ */ package org.onap.vtp.scenario; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import mockit.Mock; +import mockit.MockUp; import org.junit.Before; import org.junit.Test; +import org.onap.vtp.VTPResource; + +import java.io.IOException; +import java.util.List; import static org.junit.Assert.*; public class VTPScenarioResourceTest { VTPScenarioResource vtpScenarioResource; + @Before public void setUp() throws Exception { - vtpScenarioResource=new VTPScenarioResource(); + vtpScenarioResource = new VTPScenarioResource(); } - @Test(expected = Exception.class) - public void testListTestScenariosHandler() throws Exception{ - vtpScenarioResource.listTestScenariosHandler(); + + @Test + public void testListTestScenariosHandler() throws Exception { + new MockUp<VTPResource>() { + @Mock + public JsonNode makeRpcAndGetJson(List<String> args) throws IOException { + ObjectMapper mapper = new ObjectMapper(); + String jsonvalue = "[{\"product\":\"onap-dublin\",\"description\":\"its 4th release\"}]"; + JsonNode jsonNode = mapper.readTree(jsonvalue); + return jsonNode; + } + }; + assertNotNull(vtpScenarioResource.listTestScenariosHandler()); } - @Test(expected = Exception.class) - public void testListTestSutiesHandler() throws Exception{ - vtpScenarioResource.listTestSutiesHandler("open-cli"); + + @Test + public void testListTestSutiesHandler() throws Exception { + new MockUp<VTPResource>() { + @Mock + public JsonNode makeRpcAndGetJson(List<String> args) throws IOException { + ObjectMapper mapper = new ObjectMapper(); + String jsonvalue = "[{\"product\":\"onap-dublin\",\"service\":\"test\",\"description\":\"its 4th release\"}]"; + JsonNode jsonNode = mapper.readTree(jsonvalue); + return jsonNode; + } + }; + assertNotNull(vtpScenarioResource.listTestSutiesHandler("open-cli")); } + @Test(expected = Exception.class) - public void testListTestcasesHandler() throws Exception - { - vtpScenarioResource.listTestcasesHandler("testsuite","open-cli"); + public void testListTestcasesHandler() throws Exception { + vtpScenarioResource.listTestcasesHandler("testsuite", "open-cli"); } + @Test(expected = Exception.class) - public void testListTestcases() throws Exception - { - vtpScenarioResource.listTestcases("open-cli","testsuite"); + public void testListTestcases() throws Exception { + vtpScenarioResource.listTestcases("open-cli", "testsuite"); } + @Test(expected = Exception.class) - public void testGetTestcase() throws Exception - { - vtpScenarioResource.getTestcase("open-cli","testsuit","testcase"); + public void testGetTestcase() throws Exception { + vtpScenarioResource.getTestcase("open-cli", "testsuit", "testcase"); } - @Test(expected = Exception.class) - public void testGetTestcaseHandler() throws Exception - { - vtpScenarioResource.getTestcaseHandler("open-cli","testsuit","testcase"); + + @Test + public void testGetTestcaseHandler() throws Exception { + new MockUp<VTPResource>() { + @Mock + public JsonNode makeRpcAndGetJson(List<String> args) throws IOException { + ObjectMapper mapper = new ObjectMapper(); + + 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); + return jsonNode; + } + }; + assertNotNull(vtpScenarioResource.getTestcaseHandler("open-cli", "testsuit", "testcase")); } }
\ No newline at end of file |