summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Lima <rodrigo.lima@yoppworks.com>2020-05-08 13:30:55 -0400
committerOfir Sonsino <ofir.sonsino@intl.att.com>2020-05-10 06:22:56 +0000
commit4a98c7efa0e8103b4e14c1d521b7963d095495e0 (patch)
tree45c3d4f46a85174495cbbca5f3f33479d74b119e
parent35a3b49ea659fbaf88000ba933b5f9a6b37c917d (diff)
Remove powermock from ComputeImplTest
- Remove powermock from ComputeImplTest and add new constructor to ComputeImpl Issue-ID: SDC-3046 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: Idf3e67c52f1d65e059bbcfcda5a477e2398b0a3e
-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/ComputeImpl.java16
-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/ComputeImplTest.java35
2 files changed, 16 insertions, 35 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/ComputeImpl.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/ComputeImpl.java
index b4a09dac4f..1eea42803b 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/ComputeImpl.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/ComputeImpl.java
@@ -47,10 +47,18 @@ import java.util.Collection;
@Service("computes")
@Scope(value = "prototype")
public class ComputeImpl implements Compute {
- private ComputeManager computetManager =
- ComputeManagerFactory.getInstance().createInterface();
- private ComponentManager componentManager =
- ComponentManagerFactory.getInstance().createInterface();
+ private final ComputeManager computetManager;
+ private final ComponentManager componentManager;
+
+ public ComputeImpl() {
+ this.computetManager = ComputeManagerFactory.getInstance().createInterface();
+ this.componentManager = ComponentManagerFactory.getInstance().createInterface();
+ }
+
+ public ComputeImpl(ComputeManager computetManager, ComponentManager componentManager) {
+ this.computetManager = computetManager;
+ this.componentManager = componentManager;
+ }
@Override
public Response list(String vspId, String versionId, String componentId, 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/ComputeImplTest.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/ComputeImplTest.java
index ce6ad1322d..7cd78e0c1d 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/ComputeImplTest.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/ComputeImplTest.java
@@ -24,15 +24,12 @@ 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.ComponentManager;
-import org.openecomp.sdc.vendorsoftwareproduct.ComponentManagerFactory;
import org.openecomp.sdc.vendorsoftwareproduct.ComputeManager;
-import org.openecomp.sdc.vendorsoftwareproduct.ComputeManagerFactory;
import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComputeEntity;
import org.openecomp.sdc.vendorsoftwareproduct.types.CompositionEntityResponse;
import org.openecomp.sdc.vendorsoftwareproduct.types.ListComputeResponse;
@@ -45,8 +42,6 @@ import org.openecomp.sdcrests.vendorsoftwareproducts.types.ComputeDetailsDto;
import org.openecomp.sdcrests.vendorsoftwareproducts.types.ComputeDto;
import org.openecomp.sdcrests.vendorsoftwareproducts.types.QuestionnaireResponseDto;
import org.openecomp.sdcrests.wrappers.GenericCollectionWrapper;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
import javax.ws.rs.core.Response;
import java.util.Collection;
@@ -54,25 +49,16 @@ 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;
+import static org.mockito.Mockito.when;
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ComputeImpl.class, ComponentManagerFactory.class, ComputeManagerFactory.class})
public class ComputeImplTest {
private Logger logger = LoggerFactory.getLogger(ComputeImplTest.class);
@Mock
- private ComputeManagerFactory computeManagerFactory;
-
- @Mock
private ComputeManager computeManager;
@Mock
- private ComponentManagerFactory componentManagerFactory;
-
- @Mock
private ComponentManager componentManager;
private final String vspId = UUID.randomUUID().toString();
@@ -81,20 +67,13 @@ public class ComputeImplTest {
private final String computeId = "" + System.currentTimeMillis();
private final String user = "cs0008";
+ private ComputeImpl ci;
+
@Before
public void setUp() {
try {
initMocks(this);
- mockStatic(ComponentManagerFactory.class);
- when(ComponentManagerFactory.getInstance()).thenReturn(componentManagerFactory);
- when(componentManagerFactory.createInterface()).thenReturn(componentManager);
-
- mockStatic(ComputeManagerFactory.class);
- when(ComputeManagerFactory.getInstance()).thenReturn(computeManagerFactory);
- when(computeManagerFactory.createInterface()).thenReturn(computeManager);
-
-
ListComputeResponse lcr = new ListComputeResponse();
lcr.setAssociatedWithDeploymentFlavor(false);
lcr.setComputeEntity(new ComputeEntity());
@@ -137,6 +116,7 @@ public class ComputeImplTest {
ArgumentMatchers.eq(componentId),
ArgumentMatchers.eq(computeId))).thenReturn(qr);
+ ci = new ComputeImpl(computeManager, componentManager);
} catch (Exception e) {
logger.error(e.getMessage(), e);
@@ -145,7 +125,6 @@ public class ComputeImplTest {
@Test
public void testList() {
- ComputeImpl ci = new ComputeImpl();
Response rsp = ci.list(vspId, versionId, componentId, user);
Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
@@ -164,7 +143,6 @@ public class ComputeImplTest {
dto.setDescription("hello");
dto.setName("name");
- ComputeImpl ci = new ComputeImpl();
Response rsp = ci.create(dto, vspId, versionId, componentId, user);
Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
Object e = rsp.getEntity();
@@ -180,7 +158,6 @@ public class ComputeImplTest {
@Test
public void testDelete() {
- ComputeImpl ci = new ComputeImpl();
Response rsp = ci.delete(vspId, versionId, componentId, computeId, user);
Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
Assert.assertNull(rsp.getEntity());
@@ -189,7 +166,6 @@ public class ComputeImplTest {
@Test
public void testGet() {
- ComputeImpl ci = new ComputeImpl();
Response rsp = ci.get(vspId, versionId, componentId, computeId, user);
Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
Assert.assertNotNull(rsp.getEntity());
@@ -197,7 +173,6 @@ public class ComputeImplTest {
@Test
public void testUpdate() {
- ComputeImpl ci = new ComputeImpl();
ComputeDetailsDto dto = new ComputeDetailsDto();
Response rsp = ci.update(dto, vspId, versionId, componentId, computeId, user);
Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
@@ -206,7 +181,6 @@ public class ComputeImplTest {
@Test
public void testGetQuestionaire() {
- ComputeImpl ci = new ComputeImpl();
Response rsp = ci.getQuestionnaire(vspId, versionId, componentId, computeId, user);
Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
try {
@@ -222,7 +196,6 @@ public class ComputeImplTest {
@Test
public void testUpdateQuestionaire() {
- ComputeImpl ci = new ComputeImpl();
Response rsp = ci.updateQuestionnaire("helloworld", vspId, versionId, componentId, computeId, user);
Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
Assert.assertNull(rsp.getEntity());