Update m2 test to mockito2 for JDK 11

Peyton's review was pulled in before Ali's JDK 11 fix. So
unfortunately this update did not get done.

Issue-ID: POLICY-1587
Change-Id: I9666b6e2f2327183e15bfe19d34515d0426c8ff0
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

diff --git a/controlloop/m2/util/pom.xml b/controlloop/m2/util/pom.xml
index 0a45408..12f6ba7 100644 (file)
--- a/controlloop/m2/util/pom.xml
+++ b/controlloop/m2/util/pom.xml
@@ -46,7 +46,7 @@
 
     <dependency>
       <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito</artifactId>
+      <artifactId>powermock-api-mockito2</artifactId>
       <scope>test</scope>
     </dependency>
 

diff --git a/controlloop/m2/util/src/test/java/org/onap/policy/util/DroolsSessionCommonSerializableTest.java b/controlloop/m2/util/src/test/java/org/onap/policy/util/DroolsSessionCommonSerializableTest.java
index 808be34..2448d17 100644 (file)
--- a/controlloop/m2/util/src/test/java/org/onap/policy/util/DroolsSessionCommonSerializableTest.java
+++ b/controlloop/m2/util/src/test/java/org/onap/policy/util/DroolsSessionCommonSerializableTest.java
@@ -21,7 +21,7 @@
 package org.onap.policy.util;
 
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;