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%2Fservice%2Fadapter%2Fimpl%2FVnfmAdapter2DriverManagerTest.java;fp=huawei%2Fvnfmadapter%2FVnfmadapterService%2Fservice%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fvfc%2Fnfvo%2Fvnfm%2Fsvnfm%2Fvnfmadapter%2Fservice%2Fadapter%2Fimpl%2FVnfmAdapter2DriverManagerTest.java;h=df9ecbeb1138b0bdec64a43054ee63b12cb534f5;hb=1a544042bb0ca12e16ad7334aef259bfe78e43d8;hp=7af73f86a7e613b26a19ffe08aa0ba811e6814cd;hpb=ec7b4ae6da9a4a3201da28c8189b44ef3aea71d5;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java
index 7af73f86..df9ecbeb 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java
@@ -60,15 +60,15 @@ public class VnfmAdapter2DriverManagerTest {
 
     @Test
     public void registerDriverTestNullResp() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-
-                return null;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//
+//                return null;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -79,18 +79,18 @@ public class VnfmAdapter2DriverManagerTest {
 
     @Test
     public void registerDriverCreateSuccess() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(201);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(201);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -101,18 +101,18 @@ public class VnfmAdapter2DriverManagerTest {
 
     @Test
     public void registerDriverOkSuccess() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(200);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(200);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -123,18 +123,18 @@ public class VnfmAdapter2DriverManagerTest {
 
     @Test
     public void registerDriverTestInvalidParams() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(415);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(415);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -145,18 +145,18 @@ public class VnfmAdapter2DriverManagerTest {
 
     @Test
     public void registerDriverTestInternalError() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(500);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(500);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -167,15 +167,15 @@ public class VnfmAdapter2DriverManagerTest {
 
     @Test
     public void unregisterDriverTestNullResp() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-
-                return null;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//
+//                return null;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -186,18 +186,18 @@ public class VnfmAdapter2DriverManagerTest {
 
     @Test
     public void unregisterDriverDeleteSuccess() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(204);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(204);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -208,18 +208,18 @@ public class VnfmAdapter2DriverManagerTest {
 
     @Test
     public void unregisterDriverResourceNotFound() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(404);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(404);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -230,18 +230,18 @@ public class VnfmAdapter2DriverManagerTest {
 
     @Test
     public void unregisterDriverTestInvalidParams() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(415);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(415);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -252,18 +252,18 @@ public class VnfmAdapter2DriverManagerTest {
 
     @Test
     public void unregisterDriverTestInternalError() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(500);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(500);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");