From 374c870c299e915ae705c202a0a5f0fef024542c Mon Sep 17 00:00:00 2001 From: Lizi Date: Fri, 26 Jan 2018 06:44:46 +0000 Subject: [PATCH] Change the unit test of SDNC with mock. Change-Id: Ic0ae520c481fcf3b154e1cc83c0847094acf4ee2 Issue-ID: AAI-638 Signed-off-by: Lizi --- .../main/java/org/onap/aai/esr/common/IsTest.java | 30 --------- .../externalservice/aai/ExternalSystemProxy.java | 50 ++++---------- .../aai/esr/wrapper/ThirdpartySdncWrapperTest.java | 78 +++++++++++++++------- 3 files changed, 66 insertions(+), 92 deletions(-) delete mode 100644 esr-mgr/src/main/java/org/onap/aai/esr/common/IsTest.java 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); } } diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/ThirdpartySdncWrapperTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/ThirdpartySdncWrapperTest.java index d60fcce..b72867b 100644 --- a/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/ThirdpartySdncWrapperTest.java +++ b/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/ThirdpartySdncWrapperTest.java @@ -19,41 +19,24 @@ import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; import javax.ws.rs.core.Response; -import org.junit.AfterClass; import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; -import org.onap.aai.esr.common.IsTest; +import org.mockito.Mockito; import org.onap.aai.esr.common.MsbConfig; +import org.onap.aai.esr.entity.aai.EsrThirdpartySdncDetail; import org.onap.aai.esr.entity.rest.ThirdpartySdncRegisterInfo; +import org.onap.aai.esr.exception.ExtsysException; import org.onap.aai.esr.externalservice.aai.ExternalSystemProxy; import org.onap.aai.esr.util.ExtsysUtil; public class ThirdpartySdncWrapperTest { - private static ThirdpartySdncWrapper thirdpartySdncWrapper; static { MsbConfig.setMsbServerAddr("http://127.0.0.1:80"); } - @BeforeClass - public static void beforeClass() { - ExternalSystemProxy.test = new IsTest(true); - }; - - @AfterClass - public static void afterClass() { - ExternalSystemProxy.test = new IsTest(false); - }; - - @Before - public void setUp() throws Exception { - thirdpartySdncWrapper = ThirdpartySdncWrapper.getInstance(); - } - @Test - public void test_registerThirdpartySdnc() { + public void test_registerThirdpartySdnc() throws ExtsysException { ThirdpartySdncRegisterInfo sdncRegisterInfo = new ThirdpartySdncRegisterInfo(); sdncRegisterInfo.setLocation("edge"); sdncRegisterInfo.setName("SDNC_TEST"); @@ -66,6 +49,9 @@ public class ThirdpartySdncWrapperTest { sdncRegisterInfo.setUserName("nancy"); sdncRegisterInfo.setVendor("zte"); sdncRegisterInfo.setVersion("v1"); + ExternalSystemProxy mockExternalSystemProxy = Mockito.mock(ExternalSystemProxy.class); + Mockito.doNothing().when(mockExternalSystemProxy).registerSdnc(Mockito.anyString(), (EsrThirdpartySdncDetail)Mockito.anyObject()); + ThirdpartySdncWrapper thirdpartySdncWrapper = new ThirdpartySdncWrapper(mockExternalSystemProxy); Response response = thirdpartySdncWrapper.registerThirdpartySdnc(sdncRegisterInfo); if (response != null) { Assert.assertTrue(response.getStatus() == 200); @@ -73,7 +59,17 @@ public class ThirdpartySdncWrapperTest { } @Test - public void test_delThirdpartySdnc() { + public void test_delThirdpartySdnc() throws ExtsysException { + 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\"}]}}"; + ExternalSystemProxy mockExternalSystemProxy = Mockito.mock(ExternalSystemProxy.class); + Mockito.doNothing().when(mockExternalSystemProxy).deleteThirdpartySdnc(Mockito.anyString(), Mockito.anyString()); + Mockito.when(mockExternalSystemProxy.queryThirdpartySdncDetail(Mockito.anyString())).thenReturn(sdncDetail); + ThirdpartySdncWrapper thirdpartySdncWrapper = new ThirdpartySdncWrapper(mockExternalSystemProxy); Response response = thirdpartySdncWrapper.delThirdpartySdnc("123456"); if (response != null) { Assert.assertTrue(response.getStatus() == 204); @@ -81,7 +77,7 @@ public class ThirdpartySdncWrapperTest { } @Test - public void test_queryThirdpartySdncById() { + public void test_queryThirdpartySdncById() throws ExtsysException { ExtsysUtil extsysUtil = new ExtsysUtil(); ThirdpartySdncRegisterInfo sdncRegisterInfo = new ThirdpartySdncRegisterInfo(); sdncRegisterInfo.setLocation("edge"); @@ -95,6 +91,15 @@ public class ThirdpartySdncWrapperTest { sdncRegisterInfo.setUserName("nancy"); sdncRegisterInfo.setVendor("zte"); sdncRegisterInfo.setVersion("v1"); + 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\"}]}}"; + ExternalSystemProxy mockExternalSystemProxy = Mockito.mock(ExternalSystemProxy.class); + Mockito.when(mockExternalSystemProxy.queryThirdpartySdncDetail(Mockito.anyString())).thenReturn(sdncDetail); + ThirdpartySdncWrapper thirdpartySdncWrapper = new ThirdpartySdncWrapper(mockExternalSystemProxy); Response response = thirdpartySdncWrapper.queryThirdpartySdncById("123456"); if (response != null) { Assert.assertTrue(response.getStatus() == 200); @@ -103,7 +108,7 @@ public class ThirdpartySdncWrapperTest { } @Test - public void test_queryThirdpartySdncList() { + public void test_queryThirdpartySdncList() throws ExtsysException { ExtsysUtil extsysUtil = new ExtsysUtil(); List sdncList = new ArrayList<>(); ThirdpartySdncRegisterInfo sdncRegisterInfo = new ThirdpartySdncRegisterInfo(); @@ -119,6 +124,19 @@ public class ThirdpartySdncWrapperTest { sdncRegisterInfo.setVendor("zte"); sdncRegisterInfo.setVersion("v1"); sdncList.add(sdncRegisterInfo); + 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\"}]}}"; + String sdncListStr = + "{\"esr-thirdparty-sdnc\": [{\"thirdparty-sdnc-id\": \"123456\",\"location\": \"edge\"," + + "\"product-name\": \"thirdparty SDNC\",\"resource-version\": \"1\"}]}"; + ExternalSystemProxy mockExternalSystemProxy = Mockito.mock(ExternalSystemProxy.class); + Mockito.when(mockExternalSystemProxy.queryThirdpartySdncDetail(Mockito.anyString())).thenReturn(sdncDetail); + Mockito.when(mockExternalSystemProxy.querySdncList()).thenReturn(sdncListStr); + ThirdpartySdncWrapper thirdpartySdncWrapper = new ThirdpartySdncWrapper(mockExternalSystemProxy); Response response = thirdpartySdncWrapper.queryThirdpartySdncList(); if (response != null) { Assert.assertTrue(response.getStatus() == 200); @@ -127,7 +145,7 @@ public class ThirdpartySdncWrapperTest { } @Test - public void test_updateThirdpartySdnc() { + public void test_updateThirdpartySdnc() throws ExtsysException { ThirdpartySdncRegisterInfo sdncRegisterInfo = new ThirdpartySdncRegisterInfo(); sdncRegisterInfo.setLocation("edge"); sdncRegisterInfo.setName("SDNC_TEST"); @@ -140,6 +158,16 @@ public class ThirdpartySdncWrapperTest { sdncRegisterInfo.setUserName("nancy"); sdncRegisterInfo.setVendor("zte"); sdncRegisterInfo.setVersion("v1"); + 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\"}]}}"; + ExternalSystemProxy mockExternalSystemProxy = Mockito.mock(ExternalSystemProxy.class); + Mockito.when(mockExternalSystemProxy.queryThirdpartySdncDetail(Mockito.anyString())).thenReturn(sdncDetail); + Mockito.doNothing().when(mockExternalSystemProxy).registerSdnc(Mockito.anyString(), (EsrThirdpartySdncDetail)Mockito.anyObject()); + ThirdpartySdncWrapper thirdpartySdncWrapper = new ThirdpartySdncWrapper(mockExternalSystemProxy); Response response = thirdpartySdncWrapper.updateThirdpartySdnc(sdncRegisterInfo, "123456"); if (response != null) { Assert.assertTrue(response.getStatus() == 200); -- 2.16.6