Upgrade to JUnit5

pom.xml

@@ -69,7 +69,7 @@ We use these goals frequently to keep the dependencies and plugins up-to-date:
         <eclipse.lifecycle.mapping.version>1.0.0</eclipse.lifecycle.mapping.version>
         <java.version>1.8</java.version>
         <jmh.version>1.21</jmh.version>
-        <junit.version>4.13-beta-1</junit.version>
+        <junit.version>5.11.0</junit.version>
         <maven.enforcer.version>3.0.0-M2</maven.enforcer.version>
         <maven.build-helper.version>3.0.0</maven.build-helper.version>
         <maven.bundle.version>5.1.1</maven.bundle.version>
@@ -93,9 +93,10 @@ We use these goals frequently to keep the dependencies and plugins up-to-date:
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter</artifactId>
                 <version>${junit.version}</version>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.assertj</groupId>

vavr-benchmark/pom.xml

@@ -65,8 +65,8 @@
             <version>15.0</version>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

vavr-benchmark/src/test/java/io/vavr/collection/ArrayBenchmark.java

@@ -20,7 +20,7 @@
 package io.vavr.collection;
 
 import io.vavr.JmhRunner;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.*;
 
 import java.util.ArrayList;

vavr-benchmark/src/test/java/io/vavr/collection/BitSetBenchmark.java

@@ -20,7 +20,7 @@
 package io.vavr.collection;
 
 import io.vavr.JmhRunner;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.*;
 
 import static io.vavr.JmhRunner.create;

vavr-benchmark/src/test/java/io/vavr/collection/CharSeqBenchmark.java

@@ -20,7 +20,7 @@
 package io.vavr.collection;
 
 import io.vavr.JmhRunner;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.*;
 
 import java.util.Objects;

vavr-benchmark/src/test/java/io/vavr/collection/HashSetBenchmark.java

@@ -20,7 +20,7 @@
 package io.vavr.collection;
 
 import io.vavr.JmhRunner;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.*;
 
 import static io.vavr.JmhRunner.create;

vavr-benchmark/src/test/java/io/vavr/collection/IteratorBenchmark.java

@@ -21,7 +21,7 @@
 
 import io.vavr.JmhRunner;
 import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 

vavr-benchmark/src/test/java/io/vavr/collection/ListBenchmark.java

@@ -20,7 +20,7 @@
 package io.vavr.collection;
 
 import io.vavr.JmhRunner;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.*;
 
 import java.util.ArrayList;

vavr-benchmark/src/test/java/io/vavr/collection/MapBenchmark.java

@@ -21,7 +21,7 @@
 
 import io.vavr.Function1;
 import io.vavr.JmhRunner;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 

vavr-benchmark/src/test/java/io/vavr/collection/PriorityQueueBenchmark.java

@@ -22,7 +22,7 @@
 import fj.P;
 import io.vavr.JmhRunner;
 import io.vavr.Tuple2;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.*;
 import scala.math.Ordering;
 import scala.math.Ordering$;

vavr-benchmark/src/test/java/io/vavr/collection/VectorBenchmark.java

@@ -20,7 +20,7 @@
 package io.vavr.collection;
 
 import io.vavr.JmhRunner;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 import scala.collection.generic.CanBuildFrom;

vavr-benchmark/src/test/java/io/vavr/control/LazyBenchmark.java

@@ -23,7 +23,7 @@
 import io.vavr.Lazy;
 import io.vavr.collection.Array;
 import io.vavr.collection.Iterator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 

vavr-benchmark/src/test/java/io/vavr/idiom/ForBenchmark.java

@@ -21,7 +21,7 @@
 
 import io.vavr.JmhRunner;
 import io.vavr.collection.Array;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;

vavr-benchmark/src/test/java/io/vavr/idiom/PatternMatchingBenchmark.java

@@ -21,7 +21,7 @@
 
 import io.vavr.JmhRunner;
 import io.vavr.collection.Array;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;

vavr-benchmark/src/test/java/io/vavr/idiom/TryBenchmark.java

@@ -21,7 +21,7 @@
 
 import io.vavr.JmhRunner;
 import io.vavr.collection.Array;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;

vavr-benchmark/src/test/java/io/vavr/idiom/TupleBenchmark.java

@@ -22,7 +22,7 @@
 import io.vavr.JmhRunner;
 import io.vavr.Tuple;
 import io.vavr.collection.Array;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;

vavr-match-processor/pom.xml

@@ -26,8 +26,8 @@
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

vavr-test/generator/Generator.scala

@@ -351,7 +351,7 @@ def generateTestClasses(): Unit = {
       val tuple = im.getType("io.vavr.Tuple")
 
       // test classes
-      val test = im.getType("org.junit.Test")
+      val test = im.getType("org.junit.jupiter.api.Test")
       val assertThat = im.getStatic("org.assertj.core.api.Assertions.assertThat")
       val woops  = "yay! (this is a negative test)"
 
@@ -577,7 +577,7 @@ def generateTestClasses(): Unit = {
         val args = (1 to i).gen(j => s"o$j")(", ")
 
         // test classes
-        val test = im.getType("org.junit.Test")
+        val test = im.getType("org.junit.jupiter.api.Test")
         val assertThat = im.getStatic("org.assertj.core.api.Assertions.assertThat")
         val woops = "yay! (this is a negative test)"
 

vavr-test/pom.xml

@@ -25,8 +25,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

vavr-test/src-gen/test/java/io/vavr/test/PropertyCheck1Test.java

@@ -26,7 +26,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.vavr.CheckedFunction1;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PropertyCheck1Test {
 
@@ -118,4 +118,4 @@ public void shouldReturnErroneousProperty1CheckResultIfArbitraryFails() {
             .check();
         assertThat(result.isErroneous()).isTrue();
     }
-}
+}

vavr-test/src-gen/test/java/io/vavr/test/PropertyCheck2Test.java

@@ -26,7 +26,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.vavr.CheckedFunction2;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PropertyCheck2Test {
 
@@ -118,4 +118,4 @@ public void shouldReturnErroneousProperty2CheckResultIfArbitraryFails() {
             .check();
         assertThat(result.isErroneous()).isTrue();
     }
-}
+}

vavr-test/src-gen/test/java/io/vavr/test/PropertyCheck3Test.java

@@ -26,7 +26,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.vavr.CheckedFunction3;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PropertyCheck3Test {
 
@@ -118,4 +118,4 @@ public void shouldReturnErroneousProperty3CheckResultIfArbitraryFails() {
             .check();
         assertThat(result.isErroneous()).isTrue();
     }
-}
+}

vavr-test/src-gen/test/java/io/vavr/test/PropertyCheck4Test.java

@@ -26,7 +26,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.vavr.CheckedFunction4;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PropertyCheck4Test {
 
@@ -118,4 +118,4 @@ public void shouldReturnErroneousProperty4CheckResultIfArbitraryFails() {
             .check();
         assertThat(result.isErroneous()).isTrue();
     }
-}
+}

vavr-test/src-gen/test/java/io/vavr/test/PropertyCheck5Test.java

@@ -26,7 +26,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.vavr.CheckedFunction5;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PropertyCheck5Test {
 
@@ -118,4 +118,4 @@ public void shouldReturnErroneousProperty5CheckResultIfArbitraryFails() {
             .check();
         assertThat(result.isErroneous()).isTrue();
     }
-}
+}

vavr-test/src-gen/test/java/io/vavr/test/PropertyCheck6Test.java

@@ -26,7 +26,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.vavr.CheckedFunction6;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PropertyCheck6Test {
 
@@ -118,4 +118,4 @@ public void shouldReturnErroneousProperty6CheckResultIfArbitraryFails() {
             .check();
         assertThat(result.isErroneous()).isTrue();
     }
-}
+}

vavr-test/src-gen/test/java/io/vavr/test/PropertyCheck7Test.java

@@ -26,7 +26,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.vavr.CheckedFunction7;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PropertyCheck7Test {
 
@@ -118,4 +118,4 @@ public void shouldReturnErroneousProperty7CheckResultIfArbitraryFails() {
             .check();
         assertThat(result.isErroneous()).isTrue();
     }
-}
+}

vavr-test/src-gen/test/java/io/vavr/test/PropertyCheck8Test.java

@@ -26,7 +26,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.vavr.CheckedFunction8;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PropertyCheck8Test {
 
@@ -118,4 +118,4 @@ public void shouldReturnErroneousProperty8CheckResultIfArbitraryFails() {
             .check();
         assertThat(result.isErroneous()).isTrue();
     }
-}
+}

vavr-test/src-gen/test/java/io/vavr/test/PropertyTest.java

@@ -29,7 +29,7 @@
 import io.vavr.Tuple;
 import io.vavr.collection.List;
 import java.util.Random;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PropertyTest {
 
@@ -239,4 +239,4 @@ public void shouldCheckOrCombinationWhereFirstPropertyIsFalseAndSecondPropertyIs
         final CheckResult result = p1.or(p2).check();
         assertThat(result.isSatisfied()).isFalse();
     }
-}
+}

vavr-test/src/test/java/io/vavr/test/ArbitraryTest.java

@@ -24,7 +24,7 @@
 import io.vavr.collection.Iterator;
 import io.vavr.collection.List;
 import io.vavr.collection.Stream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;

vavr-test/src/test/java/io/vavr/test/CheckResultTest.java

@@ -22,7 +22,7 @@
 import io.vavr.Tuple;
 import io.vavr.control.Option;
 import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Objects;
 

vavr-test/src/test/java/io/vavr/test/ConditionTest.java

@@ -20,7 +20,7 @@
 package io.vavr.test;
 
 import io.vavr.test.Property.Condition;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

vavr-test/src/test/java/io/vavr/test/GenTest.java

@@ -23,7 +23,7 @@
 import io.vavr.collection.Stream;
 import io.vavr.Tuple2;
 import io.vavr.collection.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.Random;