Remove powermock from ComponentProcessesImplTest

- Remove powermock from ComponentProcessesImplTest and add new constructor to ComponentProcessesImpl

Issue-ID: SDC-3042
Signed-off-by: Rodrigo Lima  <rodrigo.lima@yoppworks.com>
Change-Id: I1766371a42a65d6b11c9b7b6783a312db2ed723e

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/ComponentProcessesImpl.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/ComponentProcessesImpl.java
index 5a5f61e..4e4d7d5 100644 (file)
--- 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/ComponentProcessesImpl.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/ComponentProcessesImpl.java
@@ -48,11 +48,22 @@ import java.util.Collection;
 @Scope(value = "prototype")
 public class ComponentProcessesImpl implements ComponentProcesses {
 
-  private ProcessManager processManager = ProcessManagerFactory.getInstance().createInterface();
-  private ComponentManager componentManager =
-      ComponentManagerFactory.getInstance().createInterface();
-  private ActivityLogManager activityLogManager =
-          ActivityLogManagerFactory.getInstance().createInterface();
+  private final ProcessManager processManager;
+  private final ComponentManager componentManager;
+  private final ActivityLogManager activityLogManager;
+
+  public ComponentProcessesImpl() {
+    this.processManager = ProcessManagerFactory.getInstance().createInterface();
+    this.componentManager = ComponentManagerFactory.getInstance().createInterface();
+    this.activityLogManager = ActivityLogManagerFactory.getInstance().createInterface();
+  }
+
+  public ComponentProcessesImpl(ProcessManager processManager,
+      ComponentManager componentManager, ActivityLogManager activityLogManager) {
+    this.processManager = processManager;
+    this.componentManager = componentManager;
+    this.activityLogManager = activityLogManager;
+  }
 
   @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/ComponentProcessesImplTest.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/ComponentProcessesImplTest.java
index c92ed97..48011ea 100644 (file)
--- 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/ComponentProcessesImplTest.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/ComponentProcessesImplTest.java
@@ -26,25 +26,19 @@ 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.activitylog.ActivityLogManager;
-import org.openecomp.sdc.activitylog.ActivityLogManagerFactory;
 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.ProcessManager;
-import org.openecomp.sdc.vendorsoftwareproduct.ProcessManagerFactory;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ProcessEntity;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ProcessType;
 import org.openecomp.sdc.versioning.dao.types.Version;
 import org.openecomp.sdcrests.vendorsoftwareproducts.types.*;
 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.io.ByteArrayInputStream;
@@ -54,28 +48,19 @@ import java.util.Collections;
 import java.util.UUID;
 
 import static org.mockito.MockitoAnnotations.initMocks;
-import static org.powermock.api.mockito.PowerMockito.*;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.mock;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ComponentDependenciesImpl.class, ActivityLogManagerFactory.class, ComponentManagerFactory.class, ProcessManagerFactory.class})
 public class ComponentProcessesImplTest {
 
   private Logger logger = LoggerFactory.getLogger(ComponentProcessesImplTest.class);
 
   @Mock
   private ActivityLogManager activityLogManager;
-  @Mock
-  private ActivityLogManagerFactory activityLogManagerFactory;
-
-  @Mock
-  private ProcessManagerFactory processManagerFactory;
 
   @Mock
   private ProcessManager processManager;
 
-  @Mock
-  private ComponentManagerFactory componentManagerFactory;
-
   @Mock
   private ComponentManager componentManager;
 
@@ -85,23 +70,13 @@ public class ComponentProcessesImplTest {
   private final String processId = "" + System.currentTimeMillis();
   private final String user = "cs0008";
 
+  private ComponentProcessesImpl cpi;
+
   @Before
   public void setUp() {
     try {
       initMocks(this);
 
-      mockStatic(ProcessManagerFactory.class);
-      when(ProcessManagerFactory.getInstance()).thenReturn(processManagerFactory);
-      when(processManagerFactory.createInterface()).thenReturn(processManager);
-
-      mockStatic(ActivityLogManagerFactory.class);
-      when(ActivityLogManagerFactory.getInstance()).thenReturn(activityLogManagerFactory);
-      when(activityLogManagerFactory.createInterface()).thenReturn(activityLogManager);
-
-      mockStatic(ComponentManagerFactory.class);
-      when(ComponentManagerFactory.getInstance()).thenReturn(componentManagerFactory);
-      when(componentManagerFactory.createInterface()).thenReturn(componentManager);
-
       ProcessEntity pe = new ProcessEntity();
       pe.setId(vspId);
       pe.setComponentId(componentId);
@@ -130,6 +105,8 @@ public class ComponentProcessesImplTest {
               ArgumentMatchers.eq(componentId),
               ArgumentMatchers.eq(processId))).thenReturn(processArtifact);
 
+      cpi = new ComponentProcessesImpl(processManager, componentManager, activityLogManager);
+
     } catch (Exception e) {
       logger.error(e.getMessage(), e);
     }
@@ -137,8 +114,6 @@ public class ComponentProcessesImplTest {
 
   @Test
   public void testList() {
-    ComponentProcessesImpl cpi = new ComponentProcessesImpl();
-
     Response rsp = cpi.list(vspId, versionId, componentId, user);
     Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
     Object e = rsp.getEntity();
@@ -150,7 +125,6 @@ public class ComponentProcessesImplTest {
 
   @Test
   public void testDeleteList() {
-    ComponentProcessesImpl cpi = new ComponentProcessesImpl();
     Response rsp = cpi.deleteList(vspId, versionId, componentId, user);
     Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
     Assert.assertNull(rsp.getEntity());
@@ -166,7 +140,6 @@ public class ComponentProcessesImplTest {
     dto.setName("name");
     dto.setType(ProcessType.Other);
 
-    ComponentProcessesImpl cpi = new ComponentProcessesImpl();
     Response rsp = cpi.create(dto, vspId, versionId, componentId, user);
     Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
     Object e = rsp.getEntity();
@@ -182,7 +155,6 @@ public class ComponentProcessesImplTest {
 
   @Test
   public void testDelete() {
-    ComponentProcessesImpl cpi = new ComponentProcessesImpl();
     Response rsp = cpi.delete(vspId, versionId, componentId, processId, user);
     Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
     Assert.assertNull(rsp.getEntity());
@@ -191,7 +163,6 @@ public class ComponentProcessesImplTest {
 
   @Test
   public void testGet() {
-    ComponentProcessesImpl cpi = new ComponentProcessesImpl();
     Response rsp = cpi.get(vspId, versionId, componentId, processId, user);
     Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
     Assert.assertNotNull(rsp.getEntity());
@@ -199,7 +170,6 @@ public class ComponentProcessesImplTest {
 
   @Test
   public void testUpdate() {
-    ComponentProcessesImpl cpi = new ComponentProcessesImpl();
     ProcessRequestDto dto = new ProcessRequestDto();
     Response rsp = cpi.update(dto, vspId, versionId, componentId, processId, user);
     Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
@@ -208,7 +178,6 @@ public class ComponentProcessesImplTest {
 
   @Test
   public void testGetUploadedFile() {
-    ComponentProcessesImpl cpi = new ComponentProcessesImpl();
     Response rsp = cpi.getUploadedFile(vspId, versionId, componentId, processId, user);
     Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
     Assert.assertNotEquals(rsp.getHeaderString("Content-Disposition").indexOf(vspId),-1);
@@ -217,7 +186,6 @@ public class ComponentProcessesImplTest {
 
   @Test
   public void testDeleteUploadedFile() {
-    ComponentProcessesImpl cpi = new ComponentProcessesImpl();
     Response rsp = cpi.deleteUploadedFile(vspId, versionId, componentId, processId, user);
     Assert.assertEquals("Response should be 200", HttpStatus.SC_OK, rsp.getStatus());
     Assert.assertNull(rsp.getEntity());
@@ -226,7 +194,6 @@ public class ComponentProcessesImplTest {
 
   @Test
   public void testUploadFile() {
-    ComponentProcessesImpl cpi = new ComponentProcessesImpl();
 
     Attachment attachment = mock(Attachment.class);
     when(attachment.getContentDisposition()).thenReturn(new ContentDisposition("test"));