Skip to content

Commit 3b17c19

Browse files
committed
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
1 parent 07d8458 commit 3b17c19

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

metafix/src/test/java/org/metafacture/metafix/ListFixPathsTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,28 @@
1919
import org.metafacture.framework.ObjectReceiver;
2020

2121
import org.junit.jupiter.api.Test;
22+
import org.junit.jupiter.api.extension.ExtendWith;
2223
import org.mockito.InOrder;
2324
import org.mockito.Mock;
2425
import org.mockito.Mockito;
25-
import org.mockito.MockitoAnnotations;
2626
import org.mockito.exceptions.base.MockitoAssertionError;
27+
import org.mockito.junit.jupiter.MockitoExtension;
2728

2829
/**
2930
* Tests for class {@link ListFixPaths}.
3031
*
3132
* @author Fabian Steeg
3233
*
3334
*/
35+
@ExtendWith(MockitoExtension.class)
3436
public final class ListFixPathsTest {
3537

36-
private ListFixPaths lister;
38+
private final ListFixPaths lister = new ListFixPaths();
3739

3840
@Mock
3941
private ObjectReceiver<String> receiver;
4042

4143
public ListFixPathsTest() {
42-
MockitoAnnotations.initMocks(this);
43-
lister = new ListFixPaths();
4444
}
4545

4646
@Test

metafix/src/test/java/org/metafacture/metafix/ListFixValuesTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,20 @@
1919
import org.metafacture.framework.ObjectReceiver;
2020

2121
import org.junit.jupiter.api.Test;
22+
import org.junit.jupiter.api.extension.ExtendWith;
2223
import org.mockito.InOrder;
2324
import org.mockito.Mock;
2425
import org.mockito.Mockito;
25-
import org.mockito.MockitoAnnotations;
2626
import org.mockito.exceptions.base.MockitoAssertionError;
27+
import org.mockito.junit.jupiter.MockitoExtension;
2728

2829
/**
2930
* Tests for class {@link ListFixValues}.
3031
*
3132
* @author Fabian Steeg
3233
*
3334
*/
35+
@ExtendWith(MockitoExtension.class)
3436
public final class ListFixValuesTest {
3537

3638
private ListFixValues lister;
@@ -39,7 +41,6 @@ public final class ListFixValuesTest {
3941
private ObjectReceiver<String> receiver;
4042

4143
public ListFixValuesTest() {
42-
MockitoAnnotations.initMocks(this);
4344
}
4445

4546
@Test

metafix/src/test/java/org/metafacture/metafix/MetafixLookupTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public MetafixLookupTest() {
6767
}
6868

6969
@BeforeAll
70-
private static void setStubForWireMock() {
70+
public static void setStubForWireMock() {
7171
WIRE_MOCK_SERVER.start();
7272

7373
// stubs for RDF
@@ -94,7 +94,7 @@ private static String loadFile(final String path) {
9494
}
9595

9696
@AfterAll
97-
private static void tearDownWireMock() {
97+
public static void tearDownWireMock() {
9898
WIRE_MOCK_SERVER.stop();
9999
}
100100

0 commit comments

Comments
 (0)