Skip to content

Commit 646a619

Browse files
committed
Upgrade to JUnit5
1 parent d5bcbb6 commit 646a619

File tree

180 files changed

+2721
-2261
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+2721
-2261
lines changed

pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ We use these goals frequently to keep the dependencies and plugins up-to-date:
6969
<eclipse.lifecycle.mapping.version>1.0.0</eclipse.lifecycle.mapping.version>
7070
<java.version>1.8</java.version>
7171
<jmh.version>1.21</jmh.version>
72-
<junit.version>4.13-beta-1</junit.version>
72+
<junit.version>5.11.0</junit.version>
7373
<maven.enforcer.version>3.0.0-M2</maven.enforcer.version>
7474
<maven.build-helper.version>3.0.0</maven.build-helper.version>
7575
<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:
9393
<dependencyManagement>
9494
<dependencies>
9595
<dependency>
96-
<groupId>junit</groupId>
97-
<artifactId>junit</artifactId>
96+
<groupId>org.junit.jupiter</groupId>
97+
<artifactId>junit-jupiter</artifactId>
9898
<version>${junit.version}</version>
99+
<scope>test</scope>
99100
</dependency>
100101
<dependency>
101102
<groupId>org.assertj</groupId>

vavr-benchmark/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
<version>15.0</version>
6666
</dependency>
6767
<dependency>
68-
<groupId>junit</groupId>
69-
<artifactId>junit</artifactId>
68+
<groupId>org.junit.jupiter</groupId>
69+
<artifactId>junit-jupiter</artifactId>
7070
<scope>test</scope>
7171
</dependency>
7272
<dependency>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
package io.vavr.collection;
2121

2222
import io.vavr.JmhRunner;
23-
import org.junit.Test;
23+
import org.junit.jupiter.api.Test;
2424
import org.openjdk.jmh.annotations.*;
2525

2626
import java.util.ArrayList;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
package io.vavr.collection;
2121

2222
import io.vavr.JmhRunner;
23-
import org.junit.Test;
23+
import org.junit.jupiter.api.Test;
2424
import org.openjdk.jmh.annotations.*;
2525

2626
import static io.vavr.JmhRunner.create;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
package io.vavr.collection;
2121

2222
import io.vavr.JmhRunner;
23-
import org.junit.Test;
23+
import org.junit.jupiter.api.Test;
2424
import org.openjdk.jmh.annotations.*;
2525

2626
import java.util.Objects;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
package io.vavr.collection;
2121

2222
import io.vavr.JmhRunner;
23-
import org.junit.Test;
23+
import org.junit.jupiter.api.Test;
2424
import org.openjdk.jmh.annotations.*;
2525

2626
import static io.vavr.JmhRunner.create;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import io.vavr.JmhRunner;
2323
import org.junit.Assert;
24-
import org.junit.Test;
24+
import org.junit.jupiter.api.Test;
2525
import org.openjdk.jmh.annotations.*;
2626
import org.openjdk.jmh.infra.Blackhole;
2727

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
package io.vavr.collection;
2121

2222
import io.vavr.JmhRunner;
23-
import org.junit.Test;
23+
import org.junit.jupiter.api.Test;
2424
import org.openjdk.jmh.annotations.*;
2525

2626
import java.util.ArrayList;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import io.vavr.Function1;
2323
import io.vavr.JmhRunner;
24-
import org.junit.Test;
24+
import org.junit.jupiter.api.Test;
2525
import org.openjdk.jmh.annotations.*;
2626
import org.openjdk.jmh.infra.Blackhole;
2727

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import fj.P;
2323
import io.vavr.JmhRunner;
2424
import io.vavr.Tuple2;
25-
import org.junit.Test;
25+
import org.junit.jupiter.api.Test;
2626
import org.openjdk.jmh.annotations.*;
2727
import scala.math.Ordering;
2828
import scala.math.Ordering$;

0 commit comments

Comments
 (0)