migrate JUnit 4 to JUnit 5

pom.xml

@@ -88,9 +88,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest</artifactId>
+            <version>2.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -99,6 +99,12 @@
             <version>1.3</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.14.1</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.reflections</groupId>
             <artifactId>reflections</artifactId>
@@ -108,7 +114,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.23.4</version>
+            <version>4.11.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -139,6 +145,24 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.openrewrite.maven</groupId>
+                <artifactId>rewrite-maven-plugin</artifactId>
+                <version>6.26.0</version>
+                <configuration>
+                    <exportDatatables>true</exportDatatables>
+                    <activeRecipes>
+                        <recipe>org.openrewrite.java.testing.junit5.JUnit4to5Migration</recipe>
+                    </activeRecipes>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.openrewrite.recipe</groupId>
+                        <artifactId>rewrite-testing-frameworks</artifactId>
+                        <version>3.5.1</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>

src/test/java/org/thejavaguy/javafaker/AbstractFakerTest.java

@@ -5,24 +5,24 @@
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
-import org.junit.Before;
-import org.junit.Rule;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.MockitoAnnotations;
 import org.mockito.Spy;
-
 import org.thejavaguy.javafaker.repeating.RepeatRule;
 
+@ExtendWith(RepeatRule.class)
 public class AbstractFakerTest {
 
-    @Rule
-    public RepeatRule repeatRule = new RepeatRule();
-
     @Spy
     protected Faker faker;
 
-    @Before
+    private AutoCloseable closeable;
+
+    @BeforeEach
     public void before() {
-        MockitoAnnotations.initMocks(this);
+        closeable = MockitoAnnotations.openMocks(this);
 
         Logger rootLogger = LogManager.getLogManager().getLogger("");
         Handler[] handlers = rootLogger.getHandlers();
@@ -32,4 +32,8 @@ public void before() {
         }
     }
 
+    @AfterEach
+    void closeMocks() throws Exception{
+        closeable.close();
+    }
 }

src/test/java/org/thejavaguy/javafaker/AddressTest.java

@@ -1,21 +1,21 @@
 package org.thejavaguy.javafaker;
 
-import static org.thejavaguy.javafaker.matchers.IsANumber.isANumber;
-import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents;
-import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.emptyOrNullString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyOrNullString;
-import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.hamcrest.Matchers.not;
+import static org.thejavaguy.javafaker.matchers.IsANumber.isANumber;
+import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents;
+import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 
 import java.text.DecimalFormatSymbols;
 import java.util.Locale;
 import java.util.Random;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AddressTest extends AbstractFakerTest {
 
@@ -91,7 +91,7 @@ public void testCountryCode() {
 
     @Test
     public void testStreetAddressIncludeSecondary() {
-        assertThat(faker.address().streetAddress(true), not(isEmptyString()));
+        assertThat(faker.address().streetAddress(true), is(not(emptyString())));
     }
 
     @Test
@@ -104,7 +104,7 @@ public void testCityWithLocaleFranceAndSeed() {
 
     @Test
     public void testFullAddress() {
-        assertThat(faker.address().fullAddress(), not(isEmptyOrNullString()));
+        assertThat(faker.address().fullAddress(), is(not(emptyOrNullString())));
     }
 
     @Test
@@ -122,7 +122,7 @@ public void testHungarianZipCodeByState() {
     @Test
     public void testCountyByZipCode() {
         faker = new Faker(new Locale("en-US"));
-        assertThat(faker.address().countyByZipCode("47732"), not(isEmptyOrNullString()));
+        assertThat(faker.address().countyByZipCode("47732"), is(not(emptyOrNullString())));
     }
 
     @Test

src/test/java/org/thejavaguy/javafaker/AncientTest.java

@@ -1,9 +1,9 @@
 package org.thejavaguy.javafaker;
 
-import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AncientTest extends AbstractFakerTest {
 

src/test/java/org/thejavaguy/javafaker/AnimalTest.java

@@ -1,9 +1,9 @@
 package org.thejavaguy.javafaker;
 
-import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AnimalTest extends AbstractFakerTest {
 

src/test/java/org/thejavaguy/javafaker/AppTest.java

@@ -1,9 +1,9 @@
 package org.thejavaguy.javafaker;
 
-import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AppTest extends AbstractFakerTest {
 

src/test/java/org/thejavaguy/javafaker/AquaTeenHungerForceTest.java

@@ -1,9 +1,9 @@
 package org.thejavaguy.javafaker;
 
-import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AquaTeenHungerForceTest extends AbstractFakerTest {
 

src/test/java/org/thejavaguy/javafaker/ArtistTest.java

@@ -1,9 +1,9 @@
 package org.thejavaguy.javafaker;
 
-import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ArtistTest extends AbstractFakerTest {
 

src/test/java/org/thejavaguy/javafaker/AvatarTest.java

@@ -1,15 +1,14 @@
 package org.thejavaguy.javafaker;
 
-import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 
-import org.junit.Test;
-
+import org.junit.jupiter.api.TestTemplate;
 import org.thejavaguy.javafaker.repeating.Repeat;
 
 public class AvatarTest extends AbstractFakerTest {
 
-    @Test
+    @TestTemplate
     @Repeat(times=10)
     public void testAvatar() {
         String avatar = faker.avatar().image();

src/test/java/org/thejavaguy/javafaker/AviationTest.java

@@ -1,10 +1,10 @@
 package org.thejavaguy.javafaker;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents;
 import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
-import static org.hamcrest.MatcherAssert.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AviationTest extends AbstractFakerTest {
 

src/test/java/org/thejavaguy/javafaker/BackToTheFutureTest.java

@@ -1,10 +1,10 @@
 package org.thejavaguy.javafaker;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents;
 import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
-import static org.hamcrest.MatcherAssert.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BackToTheFutureTest extends AbstractFakerTest {
 

src/test/java/org/thejavaguy/javafaker/BarcodeTest.java

@@ -1,9 +1,9 @@
 package org.thejavaguy.javafaker;
 
-import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BarcodeTest extends AbstractFakerTest {
 

src/test/java/org/thejavaguy/javafaker/BasketballTest.java

@@ -1,10 +1,10 @@
 package org.thejavaguy.javafaker;
 
-import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BasketballTest extends AbstractFakerTest {
 

src/test/java/org/thejavaguy/javafaker/BeerTest.java

@@ -1,9 +1,9 @@
 package org.thejavaguy.javafaker;
 
-import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeerTest extends AbstractFakerTest {
 

src/test/java/org/thejavaguy/javafaker/BojackHorsemanTest.java

@@ -1,10 +1,11 @@
 package org.thejavaguy.javafaker;
 
-import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BojackHorsemanTest extends AbstractFakerTest {
 

src/test/java/org/thejavaguy/javafaker/BookTest.java

@@ -1,9 +1,9 @@
 package org.thejavaguy.javafaker;
 
-import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BookTest extends AbstractFakerTest {
 

src/test/java/org/thejavaguy/javafaker/BoolTest.java

@@ -1,16 +1,17 @@
 package org.thejavaguy.javafaker;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isOneOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.oneOf;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BoolTest extends AbstractFakerTest {
 
     @Test
     public void testBool() {
         for (int i = 0; i < 100; i++) {
-            assertThat(faker.bool().bool(), isOneOf(true, false));
+            assertThat(faker.bool().bool(), is(oneOf(true, false)));
         }
     }
 }

src/test/java/org/thejavaguy/javafaker/BuffyTest.java

@@ -1,9 +1,9 @@
 package org.thejavaguy.javafaker;
 
-import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BuffyTest extends AbstractFakerTest {
     @Test

src/test/java/org/thejavaguy/javafaker/BusinessTest.java

@@ -1,9 +1,9 @@
 package org.thejavaguy.javafaker;
 
-import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BusinessTest extends AbstractFakerTest {
     @Test

src/test/java/org/thejavaguy/javafaker/CatTest.java

@@ -1,9 +1,9 @@
 package org.thejavaguy.javafaker;
 
-import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CatTest extends AbstractFakerTest {