X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=huawei%2Fvnfmadapter%2FVnfmadapterService%2Fservice%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fvfc%2Fnfvo%2Fvnfm%2Fsvnfm%2Fvnfmadapter%2Fcommon%2Fservicetoken%2FVnfmRestfulUtilTest.java;fp=huawei%2Fvnfmadapter%2FVnfmadapterService%2Fservice%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fvfc%2Fnfvo%2Fvnfm%2Fsvnfm%2Fvnfmadapter%2Fcommon%2Fservicetoken%2FVnfmRestfulUtilTest.java;h=60b5f6394afd0e72dfb6bc0c9843ff66c91a23e5;hb=087408bbb07917024bbfca77f4983b32582e11b4;hp=fec98449809e94d1a8879ec2c6f31774e50a9019;hpb=29bfc15ca573151581e9da09efaab9a847380284;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VnfmRestfulUtilTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VnfmRestfulUtilTest.java index fec98449..60b5f639 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VnfmRestfulUtilTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VnfmRestfulUtilTest.java @@ -53,51 +53,51 @@ public class VnfmRestfulUtilTest { @Test public void testSendReqToApp() { - new MockUp() { - - @Mock - public RestfulResponse getRestResByDefault(String path, String methodNames, JSONObject bodyParam) { - RestfulResponse restfulResponse = new RestfulResponse(); - restfulResponse.setStatus(Constant.HTTP_OK); - String responseString = "{\"retCode\":1,\"data\":\"success\"}"; - restfulResponse.setResponseJson(responseString); - return restfulResponse; - } - }; +// new MockUp() { +// +// @Mock +// public RestfulResponse getRestResByDefault(String path, String methodNames, JSONObject bodyParam) { +// RestfulResponse restfulResponse = new RestfulResponse(); +// restfulResponse.setStatus(Constant.HTTP_OK); +// String responseString = "{\"retCode\":1,\"data\":\"success\"}"; +// restfulResponse.setResponseJson(responseString); +// return restfulResponse; +// } +// }; JSONObject result = VnfmRestfulUtil.sendReqToApp("path", "put", new JSONObject()); assertEquals(Constant.REST_SUCCESS, result.get("retCode")); } @Test public void testSendReqToAppByErrorMsg() { - new MockUp() { - - @Mock - public RestfulResponse getRestResByDefault(String path, String methodNames, JSONObject bodyParam) { - RestfulResponse restfulResponse = new RestfulResponse(); - restfulResponse.setStatus(Constant.HTTP_OK); - String responseString = "{\"retCode\":-1,\"data\":\"fail\",\"msg\":\"fail\"}"; - restfulResponse.setResponseJson(responseString); - return restfulResponse; - } - }; +// new MockUp() { +// +// @Mock +// public RestfulResponse getRestResByDefault(String path, String methodNames, JSONObject bodyParam) { +// RestfulResponse restfulResponse = new RestfulResponse(); +// restfulResponse.setStatus(Constant.HTTP_OK); +// String responseString = "{\"retCode\":-1,\"data\":\"fail\",\"msg\":\"fail\"}"; +// restfulResponse.setResponseJson(responseString); +// return restfulResponse; +// } +// }; JSONObject result = VnfmRestfulUtil.sendReqToApp("path", "put", new JSONObject()); assertEquals(Constant.REST_FAIL, result.get("retCode")); } @Test public void testSendReqToAppByError() { - new MockUp() { - - @Mock - public RestfulResponse getRestResByDefault(String path, String methodNames, JSONObject bodyParam) { - RestfulResponse restfulResponse = new RestfulResponse(); - restfulResponse.setStatus(Constant.HTTP_OK); - String responseString = "{\"retCode\":-1,\"data\":\"fail\"}"; - restfulResponse.setResponseJson(responseString); - return restfulResponse; - } - }; +// new MockUp() { +// +// @Mock +// public RestfulResponse getRestResByDefault(String path, String methodNames, JSONObject bodyParam) { +// RestfulResponse restfulResponse = new RestfulResponse(); +// restfulResponse.setStatus(Constant.HTTP_OK); +// String responseString = "{\"retCode\":-1,\"data\":\"fail\"}"; +// restfulResponse.setResponseJson(responseString); +// return restfulResponse; +// } +// }; JSONObject result = VnfmRestfulUtil.sendReqToApp("path", "put", new JSONObject()); assertEquals(Constant.REST_FAIL, result.get("retCode")); } @@ -238,4 +238,17 @@ public class VnfmRestfulUtilTest { RestfulResponse resp = VnfmRestfulUtil.getRemoteResponse("/test/123", "", "test123"); assertNull(resp); } + + @Test + public void getRemoteResponse() { + Map headerMap = new HashMap(); + + VnfmRestfulUtil.getRemoteResponse( "url", "get", headerMap,"params"); + VnfmRestfulUtil.getRemoteResponse( "url", "post", headerMap,"params"); + VnfmRestfulUtil.getRemoteResponse( "url", "put", headerMap,"params"); + assertNull(VnfmRestfulUtil.getRemoteResponse( "url", "delete", headerMap,"params")); + + + + } }