Remove use of powermock from mdsalutil-impl

powermock is not really used in these tests, remove it, allowing
us to simply upgrade mockito.

Change-Id: I26eca39285e2bcca7193c837e69c347c4b5cc878
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/mdsalutil/mdsalutil-impl/pom.xml b/mdsalutil/mdsalutil-impl/pom.xml
index 68c5669f19737ce6635b4b7651165708bbb90770..48f606c9664b764270a3dfa340c01eab26143bf7 100644 (file)
--- a/mdsalutil/mdsalutil-impl/pom.xml
+++ b/mdsalutil/mdsalutil-impl/pom.xml
@@ -71,6 +71,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>blueprint-maven-plugin-annotation</artifactId>
       <optional>true</optional>
     </dependency>
+
     <!--  TEST Dependencies -->
     <dependency>
       <groupId>com.google.truth</groupId>
@@ -86,53 +87,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>infrautils-testutils</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-      <version>1.6.4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito</artifactId>
-      <version>1.6.4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-     <groupId>org.powermock</groupId>
-     <artifactId>powermock-api-support</artifactId>
-     <version>1.6.4</version>
-     <scope>test</scope>
-   </dependency>
-   <dependency>
-     <groupId>org.powermock</groupId>
-     <artifactId>powermock-reflect</artifactId>
-     <version>1.6.4</version>
-     <scope>test</scope>
-   </dependency>
-   <dependency>
-     <groupId>org.powermock</groupId>
-     <artifactId>powermock-core</artifactId>
-     <version>1.6.4</version>
-     <scope>test</scope>
-   </dependency>
-    <dependency>
-     <groupId>org.javassist</groupId>
-     <artifactId>javassist</artifactId>
-     <version>3.21.0-GA</version>
-     <scope>test</scope>
-   </dependency>
-   <dependency>
-     <groupId>org.mockito</groupId>
-     <artifactId>mockito-core</artifactId>
-     <version>1.10.19</version>
-     <scope>test</scope>
-   </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-broker-impl</artifactId>

diff --git a/mdsalutil/mdsalutil-impl/src/test/java/org/opendaylight/genius/datastoreutils/listeners/tests/DataTreeEventCallbackRegistrarTest.java b/mdsalutil/mdsalutil-impl/src/test/java/org/opendaylight/genius/datastoreutils/listeners/tests/DataTreeEventCallbackRegistrarTest.java
index 8c8b08e4feb5b977c917e5aef255bc2c5c164280..9fd768f106106c4d10d433742303e88811ffb9f9 100644 (file)
--- a/mdsalutil/mdsalutil-impl/src/test/java/org/opendaylight/genius/datastoreutils/listeners/tests/DataTreeEventCallbackRegistrarTest.java
+++ b/mdsalutil/mdsalutil-impl/src/test/java/org/opendaylight/genius/datastoreutils/listeners/tests/DataTreeEventCallbackRegistrarTest.java
@@ -32,7 +32,6 @@ import com.google.common.util.concurrent.ListeningScheduledExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.Uninterruptibles;
 import java.time.Duration;
-import java.util.Collection;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ScheduledExecutorService;
@@ -150,8 +149,8 @@ public class DataTreeEventCallbackRegistrarTest {
         ListenerRegistration<?> mockListenerReg = mock(ListenerRegistration.class);
         doAnswer(invocation -> {
             ListenerRegistration<?> realReg = db.registerDataTreeChangeListener(
-                invocation.getArgumentAt(0, DataTreeIdentifier.class),
-                invocation.getArgumentAt(1, DataTreeChangeListener.class));
+                invocation.getArgument(0),
+                invocation.getArgument(1));
             doAnswer(ignored -> {
                 realReg.close();
                 return null;
@@ -234,7 +233,7 @@ public class DataTreeEventCallbackRegistrarTest {
 
         DataBroker spiedDataBroker = spy(db);
         final DataTreeChangeListener mockListener = mock(DataTreeChangeListener.class, "TestListener");
-        doAnswer(invocation -> db.registerDataTreeChangeListener(invocation.getArgumentAt(0, DataTreeIdentifier.class),
+        doAnswer(invocation -> db.registerDataTreeChangeListener(invocation.getArgument(0),
                 mockListener)).when(spiedDataBroker).registerDataTreeChangeListener(any(), any());
 
         AtomicBoolean added = new AtomicBoolean(false);
@@ -252,7 +251,7 @@ public class DataTreeEventCallbackRegistrarTest {
         AtomicBoolean onDataTreeChangeDone = new AtomicBoolean(false);
         doAnswer(invocation -> {
             try {
-                realListener.getValue().onDataTreeChanged(invocation.getArgumentAt(0, Collection.class));
+                realListener.getValue().onDataTreeChanged(invocation.getArgument(0));
             } finally {
                 onDataTreeChangeDone.set(true);
             }
@@ -351,7 +350,7 @@ public class DataTreeEventCallbackRegistrarTest {
 
         final DataTreeChangeListener mockListener = mock(DataTreeChangeListener.class);
         doAnswer(invocation -> {
-            db.registerDataTreeChangeListener(invocation.getArgumentAt(0, DataTreeIdentifier.class), mockListener);
+            db.registerDataTreeChangeListener(invocation.getArgument(0), mockListener);
             return mock(ListenerRegistration.class);
         }).when(spiedDataBroker).registerDataTreeChangeListener(any(), any());
 
@@ -377,7 +376,7 @@ public class DataTreeEventCallbackRegistrarTest {
         AtomicBoolean onDataTreeChangeDone = new AtomicBoolean(false);
         doAnswer(invocation -> {
             try {
-                realListener.getValue().onDataTreeChanged(invocation.getArgumentAt(0, Collection.class));
+                realListener.getValue().onDataTreeChanged(invocation.getArgument(0));
             } finally {
                 onDataTreeChangeDone.set(true);
             }
@@ -403,8 +402,8 @@ public class DataTreeEventCallbackRegistrarTest {
         AtomicBoolean updated = new AtomicBoolean(false);
         ListenerRegistration<?> mockListenerReg = mock(ListenerRegistration.class);
         doAnswer(invocation -> {
-            DataTreeChangeListener<?> listener = invocation.getArgumentAt(1, DataTreeChangeListener.class);
-            db.registerDataTreeChangeListener(invocation.getArgumentAt(0, DataTreeIdentifier.class), listener);
+            DataTreeChangeListener<?> listener = invocation.getArgument(1);
+            db.registerDataTreeChangeListener(invocation.getArgument(0), listener);
             db1.syncWrite(OPERATIONAL, FOO_PATH, FOO_DATA);
             await().untilTrue(updated);
             return mockListenerReg;

diff --git a/mdsalutil/mdsalutil-impl/src/test/java/org/opendaylight/genius/mdsalutil/internal/MdSalUtilTest.java b/mdsalutil/mdsalutil-impl/src/test/java/org/opendaylight/genius/mdsalutil/internal/MdSalUtilTest.java
index 9511fcbf61cd2a12d0c41deeaa18acd939c00bf8..a6f1119810e15bbf6ae635cd8fd4f6a84fd1cc47 100644 (file)
--- a/mdsalutil/mdsalutil-impl/src/test/java/org/opendaylight/genius/mdsalutil/internal/MdSalUtilTest.java
+++ b/mdsalutil/mdsalutil-impl/src/test/java/org/opendaylight/genius/mdsalutil/internal/MdSalUtilTest.java
@@ -16,7 +16,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.binding.test.AbstractConcurrentDataBrokerTest;
@@ -46,11 +46,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.N
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
 
 @RunWith(MockitoJUnitRunner.class)
-@PrepareForTest(MDSALUtil.class)
 public class MdSalUtilTest extends AbstractConcurrentDataBrokerTest {
 
     DataBroker dataBroker;
@@ -68,8 +65,6 @@ public class MdSalUtilTest extends AbstractConcurrentDataBrokerTest {
         flowFwder = new MockFlowForwarder(dataBroker);
         grpFwder = new MockGroupForwarder(dataBroker);
 
-        PowerMockito.mockStatic(MDSALUtil.class);
-
         NodeKey s1Key = new NodeKey(new NodeId("openflow:1"));
         addFlowCapableNode(s1Key);
     }