update to junit 5

matsim-scenarios · Dec 29, 2023 · d5fe008 · d5fe008
1 parent afb78fe
commit d5fe008
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,10 +6,10 @@
 		<artifactId>matsim-all</artifactId>
 
 		<!-- PR-labelled release -->
-<!--		<version>16.0-PR2990</version>-->
+		<version>16.0-PR3023</version>
 
 		<!-- snapshot == not recommended: rather use PR-labelled release!-->
-		<version>16.0-SNAPSHOT</version>
+		<!--<version>16.0-SNAPSHOT</version>-->
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
@@ -254,8 +254,21 @@
 
 		<!-- Include the JUnit testing library.  Not transitive. -->
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<version>5.10.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>5.10.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+			<version>5.10.0</version>
 			<scope>test</scope>
 		</dependency>
 

diff --git a/src/test/java/org/matsim/prepare/opt/ScoreCalculatorTest.java b/src/test/java/org/matsim/prepare/opt/ScoreCalculatorTest.java
@@ -1,6 +1,6 @@
 package org.matsim.prepare.opt;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/src/test/java/org/matsim/run/RunOpenBerlinScenarioTest.java b/src/test/java/org/matsim/run/RunOpenBerlinScenarioTest.java
@@ -1,15 +1,15 @@
 package org.matsim.run;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.matsim.application.MATSimApplication;
 import org.matsim.testcases.MatsimTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class RunOpenBerlinScenarioTest {
 
-	@Rule
+	@RegisterExtension
 	public MatsimTestUtils utils = new MatsimTestUtils();
 
 	@Test