Upgrade mockito to 4.3.1 and remove Powermock

Author: mpiggott

httpfixture/src/test/java/org/sonatype/goodies/httpfixture/validation/ValidatingBehaviourTest.java

@@ -18,7 +18,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;

httpfixture/src/test/java/org/sonatype/goodies/httpfixture/validation/ValidatingProxyServerTest.java

@@ -33,7 +33,7 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;

pom.xml

@@ -54,7 +54,6 @@
 
     <slf4j.version>1.7.35</slf4j.version>
     <sisu-guice.version>3.2.5</sisu-guice.version>
-    <powermock.version>1.6.1</powermock.version>
     <eclipse-sisu.version>0.3.1</eclipse-sisu.version>
     <eclipse-jetty.version>9.4.44.v20210927</eclipse-jetty.version>
 
@@ -189,16 +188,22 @@
         <version>4.13.1</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest</artifactId>
+        <version>2.2</version>
+      </dependency>
+
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest-core</artifactId>
-        <version>1.3</version>
+        <version>2.2</version>
       </dependency>
 
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest-library</artifactId>
-        <version>1.3</version>
+        <version>2.2</version>
       </dependency>
 
       <dependency>
@@ -209,45 +214,15 @@
 
       <dependency>
         <groupId>org.mockito</groupId>
-        <artifactId>mockito-core</artifactId>
-        <version>1.9.5</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.powermock</groupId>
-        <artifactId>powermock-module-junit4</artifactId>
-        <version>${powermock.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.powermock</groupId>
-        <artifactId>powermock-api-mockito</artifactId>
-        <version>${powermock.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-
-      <dependency>
-        <groupId>org.powermock</groupId>
-        <artifactId>powermock-module-junit4-rule</artifactId>
-        <version>${powermock.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.powermock</groupId>
-        <artifactId>powermock-classloading-xstream</artifactId>
-        <version>${powermock.version}</version>
+        <artifactId>mockito-inline</artifactId>
+        <version>4.3.1</version>
       </dependency>
 
       <!-- mockito-inline and powermock-reflect depend on different versions of objenesis, force newest -->
       <dependency>
         <groupId>org.objenesis</groupId>
         <artifactId>objenesis</artifactId>
-        <version>1.3</version>
+        <version>3.2</version>
       </dependency>
 
       <dependency>

testsupport/pom.xml

@@ -63,7 +63,7 @@
 
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
+      <artifactId>hamcrest</artifactId>
     </dependency>
 
     <dependency>
@@ -93,27 +93,7 @@
 
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4-rule</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-classloading-xstream</artifactId>
+      <artifactId>mockito-inline</artifactId>
     </dependency>
 
     <dependency>

testsupport/src/main/java/org/sonatype/goodies/testsupport/TestSupport.java

@@ -14,6 +14,7 @@
 
 import org.sonatype.gossip.Level;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.mockito.MockitoAnnotations;
@@ -38,9 +39,18 @@ public class TestSupport
   @Rule
   public final TestTracer tracer = new TestTracer(this);
 
+  private AutoCloseable mocks;
+
   @Before
   public void initMocks() {
-    MockitoAnnotations.initMocks(this);
+    mocks = MockitoAnnotations.openMocks(this);
+  }
+
+  @After
+  public void closeMocks() throws Exception {
+    if (mocks != null) {
+      mocks.close();
+    }
   }
 
   public Level getLogLevel() {

testsupport/src/main/java/org/sonatype/goodies/testsupport/inject/InjectedTestSupport.java

@@ -60,9 +60,18 @@ public class InjectedTestSupport
   @Rule
   public final TestName testName = new TestName();
 
+  private AutoCloseable mocks;
+
   @Before
   public void initMocks() {
-    MockitoAnnotations.initMocks(this);
+    mocks = MockitoAnnotations.openMocks(this);
+  }
+
+  @After
+  public void closeMocks() throws Exception {
+    if (mocks != null) {
+      mocks.close();
+    }
   }
 
   public Level getLogLevel() {

testsupport/src/main/java/org/sonatype/goodies/testsupport/mock/MockitoRule.java

@@ -51,8 +51,7 @@ public Statement apply(final Statement base, final Description description) {
       @Override
       public void evaluate() throws Throwable {
         Throwable throwable = null;
-        try {
-          MockitoAnnotations.initMocks(testClass);
+        try (AutoCloseable mocks = MockitoAnnotations.openMocks(testClass)) {
           base.evaluate();
         }
         catch (final Throwable t) {