summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancis Toth <francis.toth@yoppworks.com>2020-04-30 15:36:38 -0400
committerOfir Sonsino <ofir.sonsino@intl.att.com>2020-05-03 08:25:49 +0000
commit789d5c745e2d1a6add6dbbc065296ce4254b3046 (patch)
tree0eaa3226114be6319eeb95a8eb0f2fd42b687fc6
parent5f8087fc96f07c771a9c4cf7c687c4e91be7fddc (diff)
Remove powermockito from NetworksImplTest
This commit aims to remove the Powermockito dependency from NetworksImplTest. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I7eecb877f86a64514609e11fd9501f3fb972a866 Issue-ID: SDC-2984
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/NetworksImpl.java11
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/services/NetworksImplTest.java227
2 files changed, 108 insertions, 130 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/NetworksImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/NetworksImpl.java
index 2db80639ae..6a6cbd0e60 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/NetworksImpl.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/NetworksImpl.java
@@ -48,8 +48,15 @@ import java.util.Collection;
@Scope(value = "prototype")
public class NetworksImpl implements Networks {
- private NetworkManager networkManager =
- NetworkManagerFactory.getInstance().createInterface();
+ private final NetworkManager networkManager;
+
+ public NetworksImpl(NetworkManager networkManager) {
+ this.networkManager = networkManager;
+ }
+
+ public NetworksImpl() {
+ this(NetworkManagerFactory.getInstance().createInterface());
+ }
@Override
public Response list(String vspId, String versionId, String user) {
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/services/NetworksImplTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/services/NetworksImplTest.java
index 78b2d44cff..756e8fdde3 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/services/NetworksImplTest.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/services/NetworksImplTest.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,17 +20,20 @@
package org.openecomp.sdcrests.vsp.rest.services;
+import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.UUID;
+import javax.ws.rs.core.Response;
import org.apache.http.HttpStatus;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.openecomp.sdc.logging.api.Logger;
-import org.openecomp.sdc.logging.api.LoggerFactory;
import org.openecomp.sdc.vendorsoftwareproduct.NetworkManager;
-import org.openecomp.sdc.vendorsoftwareproduct.NetworkManagerFactory;
import org.openecomp.sdc.vendorsoftwareproduct.dao.type.NetworkEntity;
import org.openecomp.sdc.vendorsoftwareproduct.types.CompositionEntityResponse;
import org.openecomp.sdc.vendorsoftwareproduct.types.composition.CompositionEntityType;
@@ -41,138 +44,106 @@ import org.openecomp.sdcrests.vendorsoftwareproducts.types.NetworkDto;
import org.openecomp.sdcrests.vendorsoftwareproducts.types.NetworkRequestDto;
import org.openecomp.sdcrests.wrappers.GenericCollectionWrapper;
import org.openecomp.sdcrests.wrappers.StringWrapperResponse;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import javax.ws.rs.core.Response;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.UUID;
-import static org.mockito.MockitoAnnotations.initMocks;
-import static org.powermock.api.mockito.PowerMockito.mockStatic;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({NetworksImpl.class, NetworkManagerFactory.class})
public class NetworksImplTest {
- private Logger logger = LoggerFactory.getLogger(NetworksImplTest.class);
-
- @Mock
- private NetworkManagerFactory networkManagerFactory;
-
- @Mock
- private NetworkManager networkManager;
-
-
- private final String vspId = UUID.randomUUID().toString();
- private final String versionId = UUID.randomUUID().toString();
- private final String networkId = "" + System.currentTimeMillis();
- private final String user = "cs0008";
-
- @Before
- public void setUp() {
- try {
- initMocks(this);
-
- mockStatic(NetworkManagerFactory.class);
- when(NetworkManagerFactory.getInstance()).thenReturn(networkManagerFactory);
- when(networkManagerFactory.createInterface()).thenReturn(networkManager);
-
-
- NetworkEntity e = new NetworkEntity();
- e.setId(networkId);
- e.setVspId(vspId);
- e.setVersion(new Version(versionId));
- e.setCompositionData("{\"name\":\"nm\",\"description\":\"d\"}");
+ @Mock
+ private NetworkManager mockedNetworkManager;
+
+ private final String vspId = UUID.randomUUID().toString();
+ private final String versionId = UUID.randomUUID().toString();
+ private final String networkId = "" + System.currentTimeMillis();
+ private final String user = "cs0008";
+
+ @Before
+ public void setUp() {
+ initMocks(this);
+
+ NetworkEntity e = new NetworkEntity();
+ e.setId(networkId);
+ e.setVspId(vspId);
+ e.setVersion(new Version(versionId));
+ e.setCompositionData("{\"name\":\"nm\",\"description\":\"d\"}");
+
+ Collection<NetworkEntity> lst = Collections.singletonList(e);
+ when(mockedNetworkManager.listNetworks(
+ ArgumentMatchers.eq(vspId),
+ ArgumentMatchers.any())).thenReturn(lst);
+
+ when(mockedNetworkManager.createNetwork(
+ ArgumentMatchers.any())).thenReturn(e);
+
+ CompositionEntityResponse<Network> r = new CompositionEntityResponse<>();
+ r.setId(vspId);
+ when(mockedNetworkManager.getNetwork(
+ ArgumentMatchers.eq(vspId),
+ ArgumentMatchers.any(),
+ ArgumentMatchers.eq(networkId))).thenReturn(r);
+
+ CompositionEntityType tpe = CompositionEntityType.component;
+ CompositionEntityValidationData data = new CompositionEntityValidationData(tpe, vspId);
+ when(mockedNetworkManager.updateNetwork(
+ ArgumentMatchers.any())).thenReturn(data);
+ }
+ @Test
+ public void testList() {
+ NetworksImpl bean = new NetworksImpl(mockedNetworkManager);
+
+ Response rsp = bean.list(vspId, versionId, user);
+ Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
+ Object e = rsp.getEntity();
+ Assert.assertNotNull(e);
+ @SuppressWarnings("unchecked")
+ GenericCollectionWrapper<NetworkDto> results = (GenericCollectionWrapper<NetworkDto>) e;
+ Assert.assertEquals("result length", 1, results.getListCount());
+ }
- Collection<NetworkEntity> lst = Collections.singletonList(e);
- when(networkManager.listNetworks(
- ArgumentMatchers.eq(vspId),
- ArgumentMatchers.any())).thenReturn(lst);
- when(networkManager.createNetwork(
- ArgumentMatchers.any())).thenReturn(e);
+ @Test
+ public void testCreate() {
+
+ NetworkRequestDto dto = new NetworkRequestDto();
+ dto.setName("name");
+ dto.setDhcp(true);
+
+ NetworksImpl bean = new NetworksImpl(mockedNetworkManager);
+ Response rsp = bean.create(dto, vspId, versionId, user);
+ Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
+ Object e = rsp.getEntity();
+ Assert.assertNotNull(e);
+ try {
+ StringWrapperResponse s = (StringWrapperResponse) e;
+ Assert.assertEquals(networkId, s.getValue());
+ } catch (ClassCastException ex) {
+ Assert.fail("unexpected class for DTO " + e.getClass().getName());
+ }
+ }
- CompositionEntityResponse<Network> r = new CompositionEntityResponse<>();
- r.setId(vspId);
- when(networkManager.getNetwork(
- ArgumentMatchers.eq(vspId),
- ArgumentMatchers.any(),
- ArgumentMatchers.eq(networkId))).thenReturn(r);
- CompositionEntityType tpe = CompositionEntityType.component;
- CompositionEntityValidationData data = new CompositionEntityValidationData(tpe, vspId);
- when(networkManager.updateNetwork(
- ArgumentMatchers.any())).thenReturn(data);
+ @Test
+ public void testDelete() {
+ NetworksImpl bean = new NetworksImpl(mockedNetworkManager);
+ Response rsp = bean.delete(vspId, versionId, networkId, user);
+ Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
+ Assert.assertNull(rsp.getEntity());
+ }
- } catch (Exception e) {
- logger.error(e.getMessage(), e);
- }
- }
-
- @Test
- public void testList() {
- NetworksImpl bean = new NetworksImpl();
-
- Response rsp = bean.list(vspId, versionId, user);
- Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
- Object e = rsp.getEntity();
- Assert.assertNotNull(e);
- @SuppressWarnings("unchecked")
- GenericCollectionWrapper<NetworkDto> results = (GenericCollectionWrapper<NetworkDto>)e;
- Assert.assertEquals("result length", 1, results.getListCount());
- }
-
-
- @Test
- public void testCreate() {
-
- NetworkRequestDto dto = new NetworkRequestDto();
- dto.setName("name");
- dto.setDhcp(true);
-
- NetworksImpl bean = new NetworksImpl();
- Response rsp = bean.create(dto, vspId, versionId, user);
- Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
- Object e = rsp.getEntity();
- Assert.assertNotNull(e);
- try {
- StringWrapperResponse s = (StringWrapperResponse)e;
- Assert.assertEquals(networkId, s.getValue());
- } catch (ClassCastException ex) {
- Assert.fail("unexpected class for DTO " + e.getClass().getName());
+ @Test
+ public void testGet() {
+ NetworksImpl bean = new NetworksImpl(mockedNetworkManager);
+ Response rsp = bean.get(vspId, versionId, networkId, user);
+ Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
+ Assert.assertNotNull(rsp.getEntity());
}
- }
-
-
- @Test
- public void testDelete() {
- NetworksImpl bean = new NetworksImpl();
- Response rsp = bean.delete(vspId, versionId, networkId, user);
- Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
- Assert.assertNull(rsp.getEntity());
- }
-
-
- @Test
- public void testGet() {
- NetworksImpl bean = new NetworksImpl();
- Response rsp = bean.get(vspId, versionId, networkId, user);
- Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
- Assert.assertNotNull(rsp.getEntity());
- }
-
- @Test
- public void testUpdate() {
- NetworksImpl bean = new NetworksImpl();
- NetworkRequestDto dto = new NetworkRequestDto();
- Response rsp = bean.update(dto, vspId, versionId, networkId, user);
- Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
- Assert.assertNull(rsp.getEntity());
- }
+ @Test
+ public void testUpdate() {
+ NetworksImpl bean = new NetworksImpl(mockedNetworkManager);
+ NetworkRequestDto dto = new NetworkRequestDto();
+ Response rsp = bean.update(dto, vspId, versionId, networkId, user);
+ Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
+ Assert.assertNull(rsp.getEntity());
+ }
}