diff options
Diffstat (limited to 'huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoaTest.java')
| -rw-r--r-- | huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoaTest.java | 704 |
1 files changed, 373 insertions, 331 deletions
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoaTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoaTest.java index b13b4096..d98ef421 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoaTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoaTest.java @@ -20,29 +20,44 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import java.io.IOException; +import java.lang.reflect.Method; +import javax.servlet.ServletInputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmJsonUtil; -import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmUtil; +import org.junit.runner.RunWith; +import org.mockito.Matchers; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.runners.MockitoJUnitRunner; import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.restclient.ServiceException; import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant; import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.VnfMgr; -import mockit.Mock; import mockit.MockUp; -import net.sf.json.JSONArray; import net.sf.json.JSONObject; - +@RunWith(MockitoJUnitRunner.class) public class VnfRoaTest { private VnfRoa vnfRoa; private VnfMgr vnfMgr; + + @Mock + HttpServletRequest context; + + @Mock + HttpServletResponse resp; + + @Mock + ServletInputStream servletInputStream; + + @Mock + VnfMgr vnfMgr1; @Before public void setUp() { @@ -58,36 +73,35 @@ public class VnfRoaTest { } @Test - public void testAddVnf() throws ServiceException { + public void testAddVnf() throws ServiceException, IOException { final JSONObject restJson = new JSONObject(); restJson.put("retCode", Constant.REST_SUCCESS); - MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {}; - HttpServletRequest mockInstance = proxyStub.getMockInstance(); - - MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; - HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); - - new MockUp<VnfMgr>() { - - @Mock - public JSONObject addVnf(JSONObject subJsonObject, String vnfmId) { - JSONObject retJson = new JSONObject(); - retJson.put("id", "123"); - restJson.put("data", retJson); - return restJson; - } - }; - new MockUp<VnfmJsonUtil>() { - - @SuppressWarnings("unchecked") - @Mock - public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { - return (T)restJson; - } - }; - - String result = vnfRoa.addVnf(mockInstance, mockResInstance, "vnfmId"); - +// MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {}; +// HttpServletRequest mockInstance = proxyStub.getMockInstance(); +// +// MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; +// HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); + +// new MockUp<VnfMgr>() { +// +// @Mock +// public JSONObject addVnf(JSONObject subJsonObject, String vnfmId) { +// JSONObject retJson = new JSONObject(); +// retJson.put("id", "123"); +// restJson.put("data", retJson); +// return restJson; +// } +// }; +// new MockUp<VnfmJsonUtil>() { +// +// @SuppressWarnings("unchecked") +// @Mock +// public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { +// return (T)restJson; +// } +// }; + Mockito.when(context.getInputStream()).thenReturn(servletInputStream); + String result = vnfRoa.addVnf(context, resp, "vnfmId"); JSONObject retJson = new JSONObject(); retJson.put("id", "123"); assertEquals(retJson.toString(), result); @@ -104,21 +118,21 @@ public class VnfRoaTest { MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); - new MockUp<VnfMgr>() { - - @Mock - public JSONObject addVnf(JSONObject subJsonObject, String vnfmId) { - return restJson; - } - }; - new MockUp<VnfmJsonUtil>() { - - @SuppressWarnings("unchecked") - @Mock - public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { - return (T)restJson; - } - }; +// new MockUp<VnfMgr>() { +// +// @Mock +// public JSONObject addVnf(JSONObject subJsonObject, String vnfmId) { +// return restJson; +// } +// }; +// new MockUp<VnfmJsonUtil>() { +// +// @SuppressWarnings("unchecked") +// @Mock +// public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { +// return (T)restJson; +// } +// }; String result = vnfRoa.addVnf(mockInstance, mockResInstance, "vnfmId"); @@ -135,13 +149,13 @@ public class VnfRoaTest { MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); - new MockUp<VnfmJsonUtil>() { - - @Mock - public <T> T getJsonFromContexts(HttpServletRequest context) { - return null; - } - }; +// new MockUp<VnfmJsonUtil>() { +// +// @Mock +// public <T> T getJsonFromContexts(HttpServletRequest context) { +// return null; +// } +// }; String result = vnfRoa.addVnf(mockInstance, mockResInstance, "vnfmId"); @@ -150,36 +164,36 @@ public class VnfRoaTest { } @Test - public void testDelVnf() throws ServiceException { + public void testDelVnf() throws ServiceException, IOException { final JSONObject restJson = new JSONObject(); restJson.put("retCode", Constant.REST_SUCCESS); - MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {}; - HttpServletRequest mockInstance = proxyStub.getMockInstance(); - - MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; - HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); - - new MockUp<VnfMgr>() { - - @Mock - public JSONObject deleteVnf(String vnfId, String vnfmId, JSONObject vnfObject) { - JSONObject retJson = new JSONObject(); - retJson.put("id", "123"); - restJson.put("data", retJson); - return restJson; - } - }; - - new MockUp<VnfmJsonUtil>() { - - @SuppressWarnings("unchecked") - @Mock - public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { - return (T)restJson; - } - }; - - String result = vnfRoa.delVnf("vnfmId", mockResInstance, "vnfId", mockInstance); +// MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {}; +// HttpServletRequest mockInstance = proxyStub.getMockInstance(); +// +// MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; +// HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); + +// new MockUp<VnfMgr>() { +// +// @Mock +// public JSONObject deleteVnf(String vnfId, String vnfmId, JSONObject vnfObject) { +// JSONObject retJson = new JSONObject(); +// retJson.put("id", "123"); +// restJson.put("data", retJson); +// return restJson; +// } +// }; + +// new MockUp<VnfmJsonUtil>() { +// +// @SuppressWarnings("unchecked") +// @Mock +// public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { +// return (T)restJson; +// } +// }; + Mockito.when(context.getInputStream()).thenReturn(servletInputStream); + String result = vnfRoa.delVnf("vnfmId", resp, "vnfId", context); JSONObject retJson = new JSONObject(); retJson.put("id", "123"); assertEquals(retJson.toString(), result); @@ -194,14 +208,14 @@ public class VnfRoaTest { MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); - new MockUp<VnfmJsonUtil>() { - - @SuppressWarnings("unchecked") - @Mock - public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { - return (T)restJson; - } - }; +// new MockUp<VnfmJsonUtil>() { +// +// @SuppressWarnings("unchecked") +// @Mock +// public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { +// return (T)restJson; +// } +// }; String result = vnfRoa.delVnf("vnfmId", mockResInstance, "", mockInstance); @@ -217,14 +231,14 @@ public class VnfRoaTest { MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); - new MockUp<VnfmJsonUtil>() { - - @SuppressWarnings("unchecked") - @Mock - public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { - return (T)restJson; - } - }; +// new MockUp<VnfmJsonUtil>() { +// +// @SuppressWarnings("unchecked") +// @Mock +// public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { +// return (T)restJson; +// } +// }; String result = vnfRoa.delVnf("", mockResInstance, "vnfId", mockInstance); @@ -240,14 +254,14 @@ public class VnfRoaTest { MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); - new MockUp<VnfmJsonUtil>() { - - @SuppressWarnings("unchecked") - @Mock - public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { - return (T)restJson; - } - }; +// new MockUp<VnfmJsonUtil>() { +// +// @SuppressWarnings("unchecked") +// @Mock +// public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { +// return (T)restJson; +// } +// }; String result = vnfRoa.delVnf("", mockResInstance, "", mockInstance); @@ -264,22 +278,22 @@ public class VnfRoaTest { MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); - new MockUp<VnfMgr>() { - - @Mock - public JSONObject deleteVnf(String vnfId, String vnfmId, JSONObject vnfObject) { - return restJson; - } - }; - - new MockUp<VnfmJsonUtil>() { - - @SuppressWarnings("unchecked") - @Mock - public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { - return (T)restJson; - } - }; +// new MockUp<VnfMgr>() { +// +// @Mock +// public JSONObject deleteVnf(String vnfId, String vnfmId, JSONObject vnfObject) { +// return restJson; +// } +// }; +// +// new MockUp<VnfmJsonUtil>() { +// +// @SuppressWarnings("unchecked") +// @Mock +// public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { +// return (T)restJson; +// } +// }; String result = vnfRoa.delVnf("vnfmId", mockResInstance, "vnfId", mockInstance); assertEquals(restJson.toString(), result); @@ -294,14 +308,14 @@ public class VnfRoaTest { MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); - new MockUp<VnfmJsonUtil>() { - - @SuppressWarnings("unchecked") - @Mock - public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { - return (T)restJson; - } - }; +// new MockUp<VnfmJsonUtil>() { +// +// @SuppressWarnings("unchecked") +// @Mock +// public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { +// return (T)restJson; +// } +// }; String result = vnfRoa.getVnf("vnfmId", mockResInstance, ""); @@ -317,14 +331,14 @@ public class VnfRoaTest { MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); - new MockUp<VnfmJsonUtil>() { - - @SuppressWarnings("unchecked") - @Mock - public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { - return (T)restJson; - } - }; +// new MockUp<VnfmJsonUtil>() { +// +// @SuppressWarnings("unchecked") +// @Mock +// public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { +// return (T)restJson; +// } +// }; String result = vnfRoa.getVnf("", mockResInstance, "vnfId"); @@ -341,22 +355,22 @@ public class VnfRoaTest { MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); - new MockUp<VnfMgr>() { - - @Mock - public JSONObject getVnf(String vnfId, String vnfmId) { - return restJson; - } - }; - - new MockUp<VnfmJsonUtil>() { - - @SuppressWarnings("unchecked") - @Mock - public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { - return (T)restJson; - } - }; +// new MockUp<VnfMgr>() { +// +// @Mock +// public JSONObject getVnf(String vnfId, String vnfmId) { +// return restJson; +// } +// }; +// +// new MockUp<VnfmJsonUtil>() { +// +// @SuppressWarnings("unchecked") +// @Mock +// public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { +// return (T)restJson; +// } +// }; String result = vnfRoa.getVnf("vnfmId", mockResInstance, "vnfId"); assertEquals(restJson.toString(), result); @@ -372,35 +386,35 @@ public class VnfRoaTest { MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); - new MockUp<VnfMgr>() { - - @Mock - public JSONObject getVnf(String vnfId, String vnfmId) { - JSONObject retJson = new JSONObject(); - JSONObject basicInfoJson = new JSONObject(); - basicInfoJson.put("vnfInstanceId", "123"); - basicInfoJson.put("vnfInstanceName", "1"); - basicInfoJson.put("vnfInstanceDescription", "vFW"); - basicInfoJson.put("vnfdId", "1"); - basicInfoJson.put("vnfdPackageId", "vFW"); - basicInfoJson.put("version", "vFW"); - basicInfoJson.put("vnfProvider", "hw"); - basicInfoJson.put("vnfType", "fw"); - basicInfoJson.put("vnfStatus", "active"); - retJson.put("vnfInfo", basicInfoJson); - retJson.put(Constant.RETCODE, Constant.REST_SUCCESS); - return retJson; - } - }; - - new MockUp<VnfmJsonUtil>() { - - @SuppressWarnings("unchecked") - @Mock - public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { - return (T)restJson; - } - }; +// new MockUp<VnfMgr>() { +// +// @Mock +// public JSONObject getVnf(String vnfId, String vnfmId) { +// JSONObject retJson = new JSONObject(); +// JSONObject basicInfoJson = new JSONObject(); +// basicInfoJson.put("vnfInstanceId", "123"); +// basicInfoJson.put("vnfInstanceName", "1"); +// basicInfoJson.put("vnfInstanceDescription", "vFW"); +// basicInfoJson.put("vnfdId", "1"); +// basicInfoJson.put("vnfdPackageId", "vFW"); +// basicInfoJson.put("version", "vFW"); +// basicInfoJson.put("vnfProvider", "hw"); +// basicInfoJson.put("vnfType", "fw"); +// basicInfoJson.put("vnfStatus", "active"); +// retJson.put("vnfInfo", basicInfoJson); +// retJson.put(Constant.RETCODE, Constant.REST_SUCCESS); +// return retJson; +// } +// }; + +// new MockUp<VnfmJsonUtil>() { +// +// @SuppressWarnings("unchecked") +// @Mock +// public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { +// return (T)restJson; +// } +// }; String result = vnfRoa.getVnf("vnfmId", mockResInstance, "vnfId"); JSONObject basicInfoJson = new JSONObject(); @@ -440,105 +454,107 @@ public class VnfRoaTest { public void testGetJobByVnfMgrFail() throws ServiceException { MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); - new MockUp<VnfMgr>() { - - @Mock - public JSONObject getJob(String jobId, String vnfmId) { - JSONObject restJson = new JSONObject(); - restJson.put(Constant.RETCODE, Constant.REST_FAIL); - return restJson; - } - }; +// new MockUp<VnfMgr>() { +// +// @Mock +// public JSONObject getJob(String jobId, String vnfmId) { +// JSONObject restJson = new JSONObject(); +// restJson.put(Constant.RETCODE, Constant.REST_FAIL); +// return restJson; +// } +// }; String result = vnfRoa.getJob("123", "1234", mockResInstance, "1111"); assertEquals("{\"retCode\":-1}", result); } @Test public void testGetJob() throws ServiceException { - new MockUp<VnfMgr>() { - - @Mock - public JSONObject getJob(String jobId, String vnfmId) { - JSONObject restJson = new JSONObject(); - JSONArray data = new JSONArray(); - JSONObject obj = new JSONObject(); - obj.put("id", "11111"); - obj.put("status", "Active"); - data.add(obj); - restJson.put(Constant.RETCODE, Constant.REST_SUCCESS); - restJson.put("data", data); - return restJson; - } - }; +// new MockUp<VnfMgr>() { +// +// @Mock +// public JSONObject getJob(String jobId, String vnfmId) { +// JSONObject restJson = new JSONObject(); +// JSONArray data = new JSONArray(); +// JSONObject obj = new JSONObject(); +// obj.put("id", "11111"); +// obj.put("status", "Active"); +// data.add(obj); +// restJson.put(Constant.RETCODE, Constant.REST_SUCCESS); +// restJson.put("data", data); +// return restJson; +// } +// }; String result = vnfRoa.getJob("123", "1234", null, "1111"); assertNotNull(result); } @Test - public void testHealVnf() throws ServiceException { + public void testHealVnf() throws ServiceException, IOException { final JSONObject restJson = new JSONObject(); restJson.put("retCode", Constant.REST_SUCCESS); - MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {}; - HttpServletRequest mockInstance = proxyStub.getMockInstance(); - - MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; - HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); - - new MockUp<VnfMgr>() { - - @Mock - public JSONObject healVnf(JSONObject jsonObject, String vnfInstanceId, String vnfmId) { - JSONObject retJson = new JSONObject(); - retJson.put("id", "123"); - restJson.put("data", retJson); - return restJson; - } - }; - new MockUp<VnfmJsonUtil>() { - - @SuppressWarnings("unchecked") - @Mock - public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { - return (T)restJson; - } - }; - - String result = vnfRoa.healVnf(mockInstance, mockResInstance, "id", "id"); +// MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {}; +// HttpServletRequest mockInstance = proxyStub.getMockInstance(); +// +// MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; +// HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); + +// new MockUp<VnfMgr>() { +// +// @Mock +// public JSONObject healVnf(JSONObject jsonObject, String vnfInstanceId, String vnfmId) { +// JSONObject retJson = new JSONObject(); +// retJson.put("id", "123"); +// restJson.put("data", retJson); +// return restJson; +// } +// }; +// new MockUp<VnfmJsonUtil>() { +// +// @SuppressWarnings("unchecked") +// @Mock +// public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { +// return (T)restJson; +// } +// }; + Mockito.when(context.getInputStream()).thenReturn(servletInputStream); + + String result = vnfRoa.healVnf(context, resp, "id", "id"); assertNotNull(result); } @Test - public void testScaleVnf() throws ServiceException { + public void testScaleVnf() throws ServiceException, IOException { final JSONObject restJson = new JSONObject(); restJson.put("retCode", Constant.REST_SUCCESS); - MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {}; - HttpServletRequest mockInstance = proxyStub.getMockInstance(); - - MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; - HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); - - new MockUp<VnfMgr>() { - - @Mock - public JSONObject scaleVNF(JSONObject vnfObject, String vnfmId, String vnfInstanceId) { - JSONObject retJson = new JSONObject(); - retJson.put("id", "123"); - restJson.put("data", retJson); - return restJson; - } - }; - new MockUp<VnfmJsonUtil>() { - - @SuppressWarnings("unchecked") - @Mock - public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { - return (T)restJson; - } - }; - - String result = vnfRoa.scaleVnf(mockInstance, mockResInstance, "id", "id"); +// MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {}; +// HttpServletRequest mockInstance = proxyStub.getMockInstance(); +// +// MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; +// HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); + +// new MockUp<VnfMgr>() { +// +// @Mock +// public JSONObject scaleVNF(JSONObject vnfObject, String vnfmId, String vnfInstanceId) { +// JSONObject retJson = new JSONObject(); +// retJson.put("id", "123"); +// restJson.put("data", retJson); +// return restJson; +// } +// }; +// new MockUp<VnfmJsonUtil>() { +// +// @SuppressWarnings("unchecked") +// @Mock +// public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { +// return (T)restJson; +// } +// }; + + Mockito.when(context.getInputStream()).thenReturn(servletInputStream); + String result = vnfRoa.scaleVnf(context, resp, "id", "id"); JSONObject retJson = new JSONObject(); retJson.put("id", "123"); @@ -556,24 +572,24 @@ public class VnfRoaTest { MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); - new MockUp<VnfMgr>() { - - @Mock - public JSONObject scaleVNF(JSONObject vnfObject, String vnfmId, String vnfInstanceId) { - JSONObject retJson = new JSONObject(); - retJson.put("id", "123"); - restJson.put("data", retJson); - return restJson; - } - }; - new MockUp<VnfmJsonUtil>() { - - @SuppressWarnings("unchecked") - @Mock - public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { - return (T)restJson; - } - }; +// new MockUp<VnfMgr>() { +// +// @Mock +// public JSONObject scaleVNF(JSONObject vnfObject, String vnfmId, String vnfInstanceId) { +// JSONObject retJson = new JSONObject(); +// retJson.put("id", "123"); +// restJson.put("data", retJson); +// return restJson; +// } +// }; +// new MockUp<VnfmJsonUtil>() { +// +// @SuppressWarnings("unchecked") +// @Mock +// public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { +// return (T)restJson; +// } +// }; String result = vnfRoa.scaleVnf(mockInstance, mockResInstance, "id", "id"); assertEquals(restJson.toString(), result); @@ -590,24 +606,24 @@ public class VnfRoaTest { MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); - new MockUp<VnfMgr>() { - - @Mock - public JSONObject scaleVNF(JSONObject vnfObject, String vnfmId, String vnfInstanceId) { - JSONObject retJson = new JSONObject(); - retJson.put("id", "123"); - restJson.put("data", retJson); - return restJson; - } - }; - new MockUp<VnfmJsonUtil>() { - - @SuppressWarnings("unchecked") - @Mock - public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { - return null; - } - }; +// new MockUp<VnfMgr>() { +// +// @Mock +// public JSONObject scaleVNF(JSONObject vnfObject, String vnfmId, String vnfInstanceId) { +// JSONObject retJson = new JSONObject(); +// retJson.put("id", "123"); +// restJson.put("data", retJson); +// return restJson; +// } +// }; +// new MockUp<VnfmJsonUtil>() { +// +// @SuppressWarnings("unchecked") +// @Mock +// public <T> T getJsonFromContexts(HttpServletRequest VNFreq) { +// return null; +// } +// }; String result = vnfRoa.scaleVnf(mockInstance, mockResInstance, "id", "id"); assertNotNull(result); @@ -616,35 +632,35 @@ public class VnfRoaTest { @Test public void testGetVnfmById() throws ServiceException { - new MockUp<VnfmUtil>() { - - @Mock - public JSONObject getVnfmById(String vnfmId) { - JSONObject json = new JSONObject(); - json.put("vnfm", "1234"); - return json; - } - }; +// new MockUp<VnfmUtil>() { +// +// @Mock +// public JSONObject getVnfmById(String vnfmId) { +// JSONObject json = new JSONObject(); +// json.put("vnfm", "1234"); +// return json; +// } +// }; String result = vnfRoa.getVnfmById("1234", null); assertNotNull(result); } @Test public void testGetJobFromVnfm() throws ServiceException { - new MockUp<VnfMgr>() { - - @Mock - public JSONObject getJobFromVnfm(String jobId, String vnfmId) { - JSONObject json = new JSONObject(); - json.put("retCode", "1"); - return json; - } - - @Mock - public String transferToLcm(JSONObject restJson) { - return "success"; - } - }; +// new MockUp<VnfMgr>() { +// +// @Mock +// public JSONObject getJobFromVnfm(String jobId, String vnfmId) { +// JSONObject json = new JSONObject(); +// json.put("retCode", "1"); +// return json; +// } +// +// @Mock +// public String transferToLcm(JSONObject restJson) { +// return "success"; +// } +// }; String result = vnfRoa.getJobFromVnfm("jobId", "vnfmId", null, "responseId"); assertNotNull(result); } @@ -652,20 +668,46 @@ public class VnfRoaTest { @Test public void testGetJobFromVnfmFail() throws ServiceException { - new MockUp<VnfMgr>() { - - @Mock - public JSONObject getJobFromVnfm(String jobId, String vnfmId) { - JSONObject json = new JSONObject(); - json.put("retCode", "-1"); - return json; - } - - }; +// new MockUp<VnfMgr>() { +// +// @Mock +// public JSONObject getJobFromVnfm(String jobId, String vnfmId) { +// JSONObject json = new JSONObject(); +// json.put("retCode", "-1"); +// return json; +// } +// +// }; MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {}; HttpServletResponse mockResInstance = proxyResStub.getMockInstance(); String result = vnfRoa.getJobFromVnfm("jobId", "vnfmId", mockResInstance, "responseId"); assertNotNull(result); } + + @Test + public void getHealJobBody() throws Exception { + VnfRoa vnfRoa = new VnfRoa(); + Method m = VnfRoa.class.getDeclaredMethod("getHealJobBody",new Class[] {String.class}); + m.setAccessible(true); + assertNotNull(m.invoke(vnfRoa, "jobId")); + } + @Test + public void getJobBody() throws Exception { + JSONObject restJson = new JSONObject(); + JSONObject data = new JSONObject(); + data.put(Constant.STATUS, Constant.STATUS); + restJson.put("data", new JSONObject[] {data}); + VnfRoa vnfRoa = new VnfRoa(); + Method m = VnfRoa.class.getDeclaredMethod("getJobBody",new Class[] {JSONObject.class,String.class}); + m.setAccessible(true); + assertNotNull(m.invoke(vnfRoa, restJson,"jobId")); + } + + @Test + public void getVms() { + VnfRoa vnfRoa = new VnfRoa(); + Mockito.when(vnfMgr1.getVmsFromVnfm(Matchers.anyString(), Matchers.any())).thenReturn(new JSONObject()); + vnfRoa.getVms("Vmf", resp); + } } |