Remove dependency on org.powermock (PowerMockito)

[aai/model-loader.git] / src / test / java / org / onap / aai / modelloader / notification / EventCallbackTest.java

diff --git a/src/test/java/org/onap/aai/modelloader/notification/EventCallbackTest.java b/src/test/java/org/onap/aai/modelloader/notification/EventCallbackTest.java
index 0cc183d..bc88c85 100644 (file)
--- a/src/test/java/org/onap/aai/modelloader/notification/EventCallbackTest.java
+++ b/src/test/java/org/onap/aai/modelloader/notification/EventCallbackTest.java
@@ -20,27 +20,28 @@
  */\r
 package org.onap.aai.modelloader.notification;\r
 \r
+import static org.mockito.Matchers.any;\r
+import static org.mockito.Mockito.mock;\r
+import static org.mockito.Mockito.verify;\r
+import static org.mockito.Mockito.when;\r
+\r
 import java.io.IOException;\r
 import java.util.List;\r
 import java.util.Properties;\r
 import org.junit.After;\r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.junit.runner.RunWith;\r
 import org.mockito.Mockito;\r
+import org.mockito.internal.util.reflection.Whitebox;\r
 import org.onap.aai.modelloader.config.ModelLoaderConfig;\r
 import org.onap.aai.modelloader.entity.model.BabelArtifactParsingException;\r
 import org.onap.aai.modelloader.fixture.NotificationDataFixtureBuilder;\r
 import org.openecomp.sdc.api.IDistributionClient;\r
 import org.openecomp.sdc.api.notification.INotificationData;\r
-import org.powermock.api.mockito.PowerMockito;\r
-import org.powermock.modules.junit4.PowerMockRunner;\r
-import org.powermock.reflect.Whitebox;\r
 \r
 /**\r
  * Tests {@link EventCallback}\r
  */\r
-@RunWith(PowerMockRunner.class)\r
 public class EventCallbackTest {\r
 \r
     private static final String CONFIG_FILE = "model-loader.properties";\r
@@ -59,14 +60,14 @@ public class EventCallbackTest {
         configProperties.load(this.getClass().getClassLoader().getResourceAsStream(CONFIG_FILE));\r
         config = new ModelLoaderConfig(configProperties, null);\r
 \r
-        mockArtifactDeploymentManager = PowerMockito.mock(ArtifactDeploymentManager.class);\r
-        mockArtifactDownloadManager = PowerMockito.mock(ArtifactDownloadManager.class);\r
-        mockDistributionClient = PowerMockito.mock(IDistributionClient.class);\r
+        mockArtifactDeploymentManager = mock(ArtifactDeploymentManager.class);\r
+        mockArtifactDownloadManager = mock(ArtifactDownloadManager.class);\r
+        mockDistributionClient = mock(IDistributionClient.class);\r
 \r
         eventCallback = new EventCallback(mockDistributionClient, config);\r
 \r
-        Whitebox.setInternalState(eventCallback, mockArtifactDeploymentManager);\r
-        Whitebox.setInternalState(eventCallback, mockArtifactDownloadManager);\r
+        Whitebox.setInternalState(eventCallback, "artifactDeploymentManager", mockArtifactDeploymentManager);\r
+        Whitebox.setInternalState(eventCallback, "artifactDownloadManager", mockArtifactDownloadManager);\r
     }\r
 \r
     @After\r
@@ -84,14 +85,13 @@ public class EventCallbackTest {
     public void activateCallback_downloadFails() {\r
         INotificationData data = NotificationDataFixtureBuilder.getNotificationDataWithToscaCsarFile();\r
 \r
-        PowerMockito.when(mockArtifactDownloadManager.downloadArtifacts(Mockito.any(INotificationData.class),\r
-                Mockito.any(List.class), Mockito.any(List.class), Mockito.any(List.class)))\r
-                .thenReturn(false);\r
+        when(mockArtifactDownloadManager.downloadArtifacts(any(INotificationData.class), any(List.class),\r
+                any(List.class), any(List.class))).thenReturn(false);\r
 \r
         eventCallback.activateCallback(data);\r
 \r
-        Mockito.verify(mockArtifactDownloadManager).downloadArtifacts(Mockito.any(INotificationData.class),\r
-                Mockito.any(List.class), Mockito.any(List.class), Mockito.any(List.class));\r
+        verify(mockArtifactDownloadManager).downloadArtifacts(any(INotificationData.class), any(List.class),\r
+                any(List.class), any(List.class));\r
         Mockito.verifyZeroInteractions(mockArtifactDeploymentManager);\r
     }\r
 \r
@@ -100,20 +100,17 @@ public class EventCallbackTest {
     public void activateCallback() throws BabelArtifactParsingException {\r
         INotificationData data = NotificationDataFixtureBuilder.getNotificationDataWithToscaCsarFile();\r
 \r
-        PowerMockito.when(mockArtifactDownloadManager.downloadArtifacts(Mockito.any(INotificationData.class),\r
-                Mockito.any(List.class), Mockito.any(List.class), Mockito.any(List.class)))\r
-                .thenReturn(true);\r
+        when(mockArtifactDownloadManager.downloadArtifacts(any(INotificationData.class), any(List.class),\r
+                any(List.class), any(List.class))).thenReturn(true);\r
 \r
-        PowerMockito\r
-                .when(mockArtifactDeploymentManager.deploy(Mockito.any(INotificationData.class),\r
-                        Mockito.any(List.class), Mockito.any(List.class), Mockito.any(List.class)))\r
-                .thenReturn(true);\r
+        when(mockArtifactDeploymentManager.deploy(any(INotificationData.class), any(List.class), any(List.class),\r
+                any(List.class))).thenReturn(true);\r
 \r
         eventCallback.activateCallback(data);\r
 \r
-        Mockito.verify(mockArtifactDownloadManager).downloadArtifacts(Mockito.any(INotificationData.class),\r
-                Mockito.any(List.class), Mockito.any(List.class), Mockito.any(List.class));\r
-        Mockito.verify(mockArtifactDeploymentManager).deploy(Mockito.any(INotificationData.class),\r
-                Mockito.any(List.class), Mockito.any(List.class), Mockito.any(List.class));\r
+        verify(mockArtifactDownloadManager).downloadArtifacts(any(INotificationData.class), any(List.class),\r
+                any(List.class), any(List.class));\r
+        verify(mockArtifactDeploymentManager).deploy(any(INotificationData.class), any(List.class), any(List.class),\r
+                any(List.class));\r
     }\r
 }\r