diff --git a/pom.xml b/pom.xml index b520686c..3f05a4eb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,10 +6,10 @@ matsim-all - + 16.0-PR3023 - 16.0-SNAPSHOT + 4.0.0 @@ -254,8 +254,21 @@ - junit - junit + org.junit.jupiter + junit-jupiter-engine + 5.10.1 + test + + + org.junit.jupiter + junit-jupiter + 5.10.1 + test + + + org.junit.vintage + junit-vintage-engine + 5.10.0 test diff --git a/src/test/java/org/matsim/prepare/opt/ScoreCalculatorTest.java b/src/test/java/org/matsim/prepare/opt/ScoreCalculatorTest.java index 09b596c2..af324860 100644 --- 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 index 21183355..8093427f 100644 --- a/src/test/java/org/matsim/run/RunOpenBerlinScenarioTest.java +++ b/src/test/java/org/matsim/run/RunOpenBerlinScenarioTest.java @@ -1,7 +1,7 @@ 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; @@ -9,7 +9,7 @@ public class RunOpenBerlinScenarioTest { - @Rule + @RegisterExtension public MatsimTestUtils utils = new MatsimTestUtils(); @Test