Change the unit test of SDNC with mock.

Change-Id: Ic0ae520c481fcf3b154e1cc83c0847094acf4ee2
Issue-ID: AAI-638
Signed-off-by: Lizi <li.zi30@zte.com.cn>

2 files changed, 13 insertions, 67 deletions

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/common/IsTest.java b/esr-mgr/src/main/java/org/onap/aai/esr/common/IsTest.java
deleted file mode 100644
index 6c69295..0000000
--- a/esr-mgr/src/main/java/org/onap/aai/esr/common/IsTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright 2018 ZTE Corporation.
- *
- * 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
- *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onap.aai.esr.common;
-
-public class IsTest {
-    private boolean isTest;
-    
-    public IsTest(boolean isTest)
-    {
-      this.isTest = isTest;
-    }
-  
-    public boolean getIsTest()
-    {
-      return isTest;
-    }
-}
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java
index 50a4950..ce0b51b 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java
@@ -16,7 +16,6 @@
 package org.onap.aai.esr.externalservice.aai;
 
 import org.glassfish.jersey.client.ClientConfig;
-import org.onap.aai.esr.common.IsTest;
 import org.onap.aai.esr.common.MsbConfig;
 import org.onap.aai.esr.entity.aai.EsrEmsDetail;
 import org.onap.aai.esr.entity.aai.EsrThirdpartySdncDetail;
@@ -36,8 +35,6 @@ public class ExternalSystemProxy {
                 ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
     }
     
-    public static IsTest test = new IsTest(false);
-
     public void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail) throws ExtsysException {
         ClientConfig config = new ClientConfig(new VnfmRegisterProvider());
         IExternalSystem registerVnfmServiceproxy =
@@ -73,31 +70,19 @@ public class ExternalSystemProxy {
         }
     }
 
-    public void registerSdnc(String thirdpartySdncId, EsrThirdpartySdncDetail esrSdncDetail)
-            throws ExtsysException {
-        if (!test.getIsTest()) {
-            ClientConfig config = new ClientConfig(new ThirdpartySdncRegisterProvider());
-            IExternalSystem registerSdncServiceproxy =
-                    ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
-            try {
-                registerSdncServiceproxy.registerThirdpartySdnc(transactionId, fromAppId, authorization,
-                        thirdpartySdncId, esrSdncDetail);
-            } catch (Exception e) {
-                throw new ExtsysException("PUT thirdparty SDNC to A&AI failed.", e);
-            }
+    public void registerSdnc(String thirdpartySdncId, EsrThirdpartySdncDetail esrSdncDetail) throws ExtsysException {
+        ClientConfig config = new ClientConfig(new ThirdpartySdncRegisterProvider());
+        IExternalSystem registerSdncServiceproxy =
+                ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
+        try {
+            registerSdncServiceproxy.registerThirdpartySdnc(transactionId, fromAppId, authorization, thirdpartySdncId,
+                    esrSdncDetail);
+        } catch (Exception e) {
+            throw new ExtsysException("PUT thirdparty SDNC to A&AI failed.", e);
         }
     }
 
     public String queryThirdpartySdncDetail(String thirdpartySdncId) throws ExtsysException {
-        if (test.getIsTest()) {
-            String sdncDetail = "{\"thirdparty-sdnc-id\":\"123456\",\"location\":\"edge\","
-                    + "\"product-name\":\"thirdparty SDNC\",\"esr-system-info-list\":{\"esr-system-info\":"
-                    + "[{\"esr-system-info-id\":\"987654\",\"system-name\":\"SDNC_TEST\",\"type\":\"SDNC\","
-                    + "\"vendor\":\"zte\",\"version\":\"v1\",\"service-url\":\"http://ip:8000\","
-                    + "\"user-name\":\"nancy\",\"password\":\"123987\",\"system-type\":\"thirdparty_SDNC\","
-                    + "\"protocol\":\"protocol\"}]}}";
-            return sdncDetail;
-        }
         try {
             return externalSystemproxy.queryThirdpartySdncDetail(transactionId, fromAppId, authorization,
                     thirdpartySdncId);
@@ -107,12 +92,6 @@ public class ExternalSystemProxy {
     }
 
     public String querySdncList() throws ExtsysException {
-        if (test.getIsTest()) {
-            String sdncList =
-                    "{\"esr-thirdparty-sdnc\": [{\"thirdparty-sdnc-id\": \"123456\",\"location\": \"edge\","
-                            + "\"product-name\": \"thirdparty SDNC\",\"resource-version\": \"1\"}]}";
-            return sdncList;
-        }
         try {
             return externalSystemproxy.queryThirdpartySdncList(transactionId, fromAppId, authorization);
         } catch (Exception e) {
@@ -121,13 +100,10 @@ public class ExternalSystemProxy {
     }
 
     public void deleteThirdpartySdnc(String sdncId, String resourceVersion) throws ExtsysException {
-        if (!test.getIsTest()) {
-            try {
-                externalSystemproxy.deleteThirdpartySdnc(transactionId, fromAppId, authorization, sdncId,
-                        resourceVersion);
-            } catch (Exception e) {
-                throw new ExtsysException("Delete thirdparty SDNC from A&AI failed.", e);
-            }
+        try {
+            externalSystemproxy.deleteThirdpartySdnc(transactionId, fromAppId, authorization, sdncId, resourceVersion);
+        } catch (Exception e) {
+            throw new ExtsysException("Delete thirdparty SDNC from A&AI failed.", e);
         }
     }