Migrate mockito-configuration to JUnit5

Automated (and augmented) rewrite of code.

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

diff --git a/common/mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java b/common/mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java
index a3a66f229d974331a76c2686db6ed5d89785803c..5e6d4429e4188aa31c86380fb9cc2c0c80a08b4f 100644 (file)
--- a/common/mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java
+++ b/common/mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java
@@ -7,30 +7,30 @@
  */
 package org.mockito.configuration;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 
 import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.StrictStubs.class)
-public class ArgumentsExtractorVerifierTest {
+@ExtendWith(MockitoExtension.class)
+class ArgumentsExtractorVerifierTest {
     @Mock
     List<String> mockedList;
 
     @Test
-    public void test() {
-        doReturn(Boolean.TRUE).when(this.mockedList).add(any(String.class));
+    void test() {
+        doReturn(Boolean.TRUE).when(mockedList).add(any(String.class));
         final String argument = "something";
-        this.mockedList.add(argument);
+        mockedList.add(argument);
         // retrieve argument
         final ArgumentsExtractorVerifier argumentsExtractorVerifier = new ArgumentsExtractorVerifier();
-        verify(this.mockedList, argumentsExtractorVerifier).add(any(String.class));
-        assertArrayEquals(new Object[] { argument }, argumentsExtractorVerifier.getArguments());
+        verify(mockedList, argumentsExtractorVerifier).add(any(String.class));
+        assertArrayEquals(new Object[]{argument}, argumentsExtractorVerifier.getArguments());
     }
 }

diff --git a/common/mockito-configuration/src/test/java/org/mockito/configuration/DefaultAnswerTest.java b/common/mockito-configuration/src/test/java/org/mockito/configuration/DefaultAnswerTest.java
index c8c290ff783c3ec2ea39a97828b242089bc2f8d9..3114667e8e45dc8ae77f0453c636bb19608923e3 100644 (file)
--- a/common/mockito-configuration/src/test/java/org/mockito/configuration/DefaultAnswerTest.java
+++ b/common/mockito-configuration/src/test/java/org/mockito/configuration/DefaultAnswerTest.java
@@ -7,23 +7,18 @@
  */
 package org.mockito.configuration;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 
 import java.io.Closeable;
-import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class DefaultAnswerTest {
+class DefaultAnswerTest {
     @Test
-    public void testAnswering() throws IOException {
-        Closeable mock = mock(Closeable.class);
-        try {
-            mock.close();
-            fail();
-        } catch (UnstubbedMethodException e) {
-            assertEquals("closeable.close(); was not stubbed", e.getMessage());
-        }
+    void testAnswering() {
+        final var mock = mock(Closeable.class);
+        final var e = assertThrows(UnstubbedMethodException.class, mock::close);
+        assertEquals("closeable.close(); was not stubbed", e.getMessage());
     }
 }