Provide Mockito 5.x forward compatibility.

* warning: [deprecation] initMocks(Object) in MockitoAnnotations has been deprecated * org.junit.platform.commons.JUnitException: @BeforeAll/@afterall method must not be private
metafacture · Mar 7, 2024 · 3b17c19 · 3b17c19
1 parent 07d8458
commit 3b17c19
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/metafix/src/test/java/org/metafacture/metafix/ListFixPathsTest.java b/metafix/src/test/java/org/metafacture/metafix/ListFixPathsTest.java
@@ -19,28 +19,28 @@
 import org.metafacture.framework.ObjectReceiver;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
 import org.mockito.exceptions.base.MockitoAssertionError;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 /**
  * Tests for class {@link ListFixPaths}.
  *
  * @author Fabian Steeg
  *
  */
+@ExtendWith(MockitoExtension.class)
 public final class ListFixPathsTest {
 
-    private ListFixPaths lister;
+    private final ListFixPaths lister = new ListFixPaths();
 
     @Mock
     private ObjectReceiver<String> receiver;
 
     public ListFixPathsTest() {
-        MockitoAnnotations.initMocks(this);
-        lister = new ListFixPaths();
     }
 
     @Test

diff --git a/metafix/src/test/java/org/metafacture/metafix/ListFixValuesTest.java b/metafix/src/test/java/org/metafacture/metafix/ListFixValuesTest.java
@@ -19,18 +19,20 @@
 import org.metafacture.framework.ObjectReceiver;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
 import org.mockito.exceptions.base.MockitoAssertionError;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 /**
  * Tests for class {@link ListFixValues}.
  *
  * @author Fabian Steeg
  *
  */
+@ExtendWith(MockitoExtension.class)
 public final class ListFixValuesTest {
 
     private ListFixValues lister;
@@ -39,7 +41,6 @@ public final class ListFixValuesTest {
     private ObjectReceiver<String> receiver;
 
     public ListFixValuesTest() {
-        MockitoAnnotations.initMocks(this);
     }
 
     @Test

diff --git a/metafix/src/test/java/org/metafacture/metafix/MetafixLookupTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixLookupTest.java
@@ -67,7 +67,7 @@ public MetafixLookupTest() {
     }
 
     @BeforeAll
-    private static void setStubForWireMock() {
+    public static void setStubForWireMock() {
         WIRE_MOCK_SERVER.start();
 
         // stubs for RDF
@@ -94,7 +94,7 @@ private static String loadFile(final String path) {
     }
 
     @AfterAll
-    private static void tearDownWireMock() {
+    public static void tearDownWireMock() {
         WIRE_MOCK_SERVER.stop();
     }