fix before and after

moia-oss · Dec 11, 2023 · e10a392 · e10a392
1 parent 58b1265
commit e10a392
Show file tree

Hide file tree

Showing 97 changed files with 349 additions and 367 deletions.
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
@@ -40,10 +40,6 @@
 			<artifactId>matsim-examples</artifactId>
 			<version>16.0-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>org.junit.vintage</groupId>
-			<artifactId>junit-vintage-engine</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>

diff --git a/...s/analysis/src/test/java/org/matsim/contrib/analysis/kai/KNAnalysisEventsHandlerTest.java b/...s/analysis/src/test/java/org/matsim/contrib/analysis/kai/KNAnalysisEventsHandlerTest.java
@@ -22,8 +22,8 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.Ignore;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -68,7 +68,7 @@ public class KNAnalysisEventsHandlerTest {
 	private Population population = null ;
 	private Network network = null ;
 
-    @Before
+    @BeforeEach
 	public void setUp() throws Exception {
 
 		scenario = ScenarioUtils.createScenario(ConfigUtils.createConfig());
@@ -101,7 +101,7 @@ public void setUp() throws Exception {
 		this.network.addLink(link);
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() throws Exception {
 		this.population = null;
 		this.network = null;

diff --git a/...ribs/bicycle/src/test/java/org/matsim/contrib/bicycle/BicycleLinkSpeedCalculatorTest.java b/...ribs/bicycle/src/test/java/org/matsim/contrib/bicycle/BicycleLinkSpeedCalculatorTest.java
@@ -1,6 +1,6 @@
 package org.matsim.contrib.bicycle;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.matsim.api.core.v01.Coord;
@@ -42,7 +42,7 @@ public class BicycleLinkSpeedCalculatorTest {
     private BicycleConfigGroup configGroup;
     private final Network unusedNetwork = NetworkUtils.createNetwork();
 
-    @Before
+    @BeforeEach
     public void before() {
         configGroup = ConfigUtils.addOrGetModule( config, BicycleConfigGroup.class );
         configGroup.setMaxBicycleSpeedForRouting(MAX_BICYCLE_SPEED);

diff --git a/...atsim/contrib/commercialTrafficApplications/jointDemand/IsTheRightCustomerScoredTest.java b/...atsim/contrib/commercialTrafficApplications/jointDemand/IsTheRightCustomerScoredTest.java
@@ -18,7 +18,7 @@
 
 package org.matsim.contrib.commercialTrafficApplications.jointDemand;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.matsim.api.core.v01.Id;
@@ -41,7 +41,7 @@ public class IsTheRightCustomerScoredTest {
 
     Scenario scenario;
 
-    @Before
+    @BeforeEach
     public void setUp() {
 
         Config config = ConfigUtils.loadConfig("./scenarios/grid/jointDemand_config.xml");

diff --git a/...ribs/common/src/test/java/org/matsim/contrib/common/util/WeightedRandomSelectionTest.java b/...ribs/common/src/test/java/org/matsim/contrib/common/util/WeightedRandomSelectionTest.java
@@ -26,7 +26,7 @@
 import java.util.Random;
 
 import org.apache.commons.lang3.mutable.MutableDouble;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -37,7 +37,7 @@ public class WeightedRandomSelectionTest {
 	private final MutableDouble randomDouble = new MutableDouble();
 	private WeightedRandomSelection<String> weightedRandomSelection;
 
-	@Before
+	@BeforeEach
 	public void init() {
 		weightedRandomSelection = new WeightedRandomSelection<>(new Random() {
 			@Override

diff --git a/...st/java/org/matsim/contrib/drt/extension/estimator/MultiModaFixedDrtLegEstimatorTest.java b/...st/java/org/matsim/contrib/drt/extension/estimator/MultiModaFixedDrtLegEstimatorTest.java
@@ -1,6 +1,6 @@
 package org.matsim.contrib.drt.extension.estimator;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.matsim.application.MATSimApplication;
@@ -67,7 +67,7 @@ private static void prepare(Config config) {
 
 	}
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 
 		Config config = DrtTestScenario.loadConfig(utils);

diff --git a/...c/test/java/org/matsim/contrib/drt/extension/estimator/MultiModalDrtLegEstimatorTest.java b/...c/test/java/org/matsim/contrib/drt/extension/estimator/MultiModalDrtLegEstimatorTest.java
@@ -1,6 +1,6 @@
 package org.matsim.contrib.drt.extension.estimator;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.matsim.application.MATSimApplication;
@@ -31,7 +31,7 @@ public class MultiModalDrtLegEstimatorTest {
 
 	private Controler controler;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 
 		Config config = DrtTestScenario.loadConfig(utils);

diff --git a/...sim/contrib/drt/optimizer/insertion/extensive/MultiInsertionDetourPathCalculatorTest.java b/...sim/contrib/drt/optimizer/insertion/extensive/MultiInsertionDetourPathCalculatorTest.java
@@ -31,7 +31,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.junit.After;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.network.Link;
@@ -70,7 +70,7 @@ public class MultiInsertionDetourPathCalculatorTest {
 	private final MultiInsertionDetourPathCalculator detourPathCalculator = new MultiInsertionDetourPathCalculator(
 			pathSearch, pathSearch, pathSearch, pathSearch, 1);
 
-	@After
+	@AfterEach
 	public void after() {
 		detourPathCalculator.notifyMobsimBeforeCleanup(null);
 	}

diff --git a/...im/contrib/drt/optimizer/insertion/selective/SingleInsertionDetourPathCalculatorTest.java b/...im/contrib/drt/optimizer/insertion/selective/SingleInsertionDetourPathCalculatorTest.java
@@ -30,7 +30,7 @@
 
 import java.util.List;
 
-import org.junit.After;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.network.Link;
@@ -74,7 +74,7 @@ public class SingleInsertionDetourPathCalculatorTest {
 	private final SingleInsertionDetourPathCalculator detourPathCalculator = new SingleInsertionDetourPathCalculator(
 			null, new FreeSpeedTravelTime(), null, 1, (network, travelCosts, travelTimes) -> pathCalculator);
 
-	@After
+	@AfterEach
 	public void after() {
 		detourPathCalculator.notifyMobsimBeforeCleanup(null);
 	}

diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/path/OneToManyPathCalculatorTest.java b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/path/OneToManyPathCalculatorTest.java
@@ -26,7 +26,7 @@
 
 import java.util.List;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.matsim.api.core.v01.Coord;
 import org.matsim.api.core.v01.Id;
@@ -68,7 +68,7 @@ public class OneToManyPathCalculatorTest {
 	private final LeastCostPathTree dijkstraTree = new LeastCostPathTree(new SpeedyGraph(network), travelTime,
 			new TimeAsTravelDisutility(travelTime));
 
-	@Before
+	@BeforeEach
 	public void init() {
 		for (Node node : List.of(nodeA, nodeB, nodeC, nodeD, nodeE)) {
 			nodeMap.put(node.getId(), node);

diff --git a/...st/java/org/matsim/contrib/emissions/TestWarmEmissionAnalysisModuleTrafficSituations.java b/...st/java/org/matsim/contrib/emissions/TestWarmEmissionAnalysisModuleTrafficSituations.java
@@ -19,7 +19,7 @@
  * *********************************************************************** */
 
 import org.junit.Assert;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -44,7 +44,7 @@
 
 /**
  * @author joe
- 
+
 
 /*
  * test for playground.vsp.emissions.WarmEmissionAnalysisModule
@@ -96,7 +96,7 @@ public static Collection<Object[]> createCombinations() {
 		return list;
 	}
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		Map<HbefaWarmEmissionFactorKey, HbefaWarmEmissionFactor> avgHbefaWarmTable = new HashMap<>();
 		Map<HbefaWarmEmissionFactorKey, HbefaWarmEmissionFactor> detailedHbefaWarmTable = new HashMap<>();
@@ -257,7 +257,7 @@ private void fillDetailedTable( Map<HbefaWarmEmissionFactorKey, HbefaWarmEmissio
 
 			}
 		}
-		
+
 	}
 
 	private void fillAverageTable(	Map<HbefaWarmEmissionFactorKey, HbefaWarmEmissionFactor> avgHbefaWarmTable) {
@@ -282,7 +282,7 @@ private void fillAverageTable(	Map<HbefaWarmEmissionFactorKey, HbefaWarmEmission
 
 			}
 		}
-		
+
 	}
 
 	private void addDetailedRecordsToTestSpeedsTable(
@@ -302,7 +302,7 @@ private void addDetailedRecordsToTestSpeedsTable(
 
 
 }
-
 
-
+
+
 
diff --git a/contribs/freight/src/test/java/org/matsim/freight/carriers/CarrierModuleTest.java b/contribs/freight/src/test/java/org/matsim/freight/carriers/CarrierModuleTest.java
@@ -21,7 +21,7 @@
 
 package org.matsim.freight.carriers;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.matsim.api.core.v01.Scenario;
@@ -50,7 +50,7 @@ public class CarrierModuleTest {
     @RegisterExtension
 	public MatsimTestUtils testUtils = new MatsimTestUtils();
 
-    @Before
+    @BeforeEach
     public void setUp(){
         Config config = ConfigUtils.createConfig() ;
         ScoringConfigGroup.ActivityParams workParams = new ScoringConfigGroup.ActivityParams("w");

diff --git a/contribs/freight/src/test/java/org/matsim/freight/carriers/CarrierPlanXmlReaderV2Test.java b/contribs/freight/src/test/java/org/matsim/freight/carriers/CarrierPlanXmlReaderV2Test.java
@@ -21,7 +21,7 @@
 
 package org.matsim.freight.carriers;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -49,7 +49,7 @@ public class CarrierPlanXmlReaderV2Test {
 
 	private Carrier testCarrier;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception{
 		CarrierVehicleTypes carrierVehicleTypes = new CarrierVehicleTypes();
 		new CarrierVehicleTypeReader( carrierVehicleTypes ).readFile( utils.getPackageInputDirectory() + "vehicleTypes_v2.xml" );

diff --git a/.../freight/src/test/java/org/matsim/freight/carriers/CarrierPlanXmlReaderV2WithDtdTest.java b/.../freight/src/test/java/org/matsim/freight/carriers/CarrierPlanXmlReaderV2WithDtdTest.java
@@ -21,7 +21,7 @@
 
 package org.matsim.freight.carriers;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.Ignore;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -42,7 +42,7 @@ public class CarrierPlanXmlReaderV2WithDtdTest  {
 
 	private Carrier testCarrier;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception{
 
 		CarrierVehicleTypes carrierVehicleTypes = new CarrierVehicleTypes();

diff --git a/contribs/freight/src/test/java/org/matsim/freight/carriers/CarrierPlanXmlWriterV2Test.java b/contribs/freight/src/test/java/org/matsim/freight/carriers/CarrierPlanXmlWriterV2Test.java
@@ -21,7 +21,7 @@
 
 package org.matsim.freight.carriers;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.matsim.api.core.v01.Id;
@@ -42,7 +42,7 @@ public class CarrierPlanXmlWriterV2Test {
 
 	private Carrier testCarrier;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception{
 
 		CarrierVehicleTypes carrierVehicleTypes = new CarrierVehicleTypes();

diff --git a/contribs/freight/src/test/java/org/matsim/freight/carriers/CarrierPlanXmlWriterV2_1Test.java b/contribs/freight/src/test/java/org/matsim/freight/carriers/CarrierPlanXmlWriterV2_1Test.java
@@ -21,7 +21,7 @@
 
 package org.matsim.freight.carriers;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.matsim.api.core.v01.Id;
@@ -42,7 +42,7 @@ public class CarrierPlanXmlWriterV2_1Test {
 
 	private Carrier testCarrier;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception{
 
 		CarrierVehicleTypes carrierVehicleTypes = new CarrierVehicleTypes();

diff --git a/contribs/freight/src/test/java/org/matsim/freight/carriers/CarrierVehicleTypeLoaderTest.java b/contribs/freight/src/test/java/org/matsim/freight/carriers/CarrierVehicleTypeLoaderTest.java
@@ -21,7 +21,7 @@
 
 package org.matsim.freight.carriers;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -39,7 +39,7 @@ public class CarrierVehicleTypeLoaderTest {
 	private CarrierVehicleTypes types;
 	private Carriers carriers;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception{
 		types = new CarrierVehicleTypes();
 		new CarrierVehicleTypeReader(types).readFile(utils.getClassInputDirectory() + "vehicleTypes.xml");

diff --git a/contribs/freight/src/test/java/org/matsim/freight/carriers/CarrierVehicleTypeReaderTest.java b/contribs/freight/src/test/java/org/matsim/freight/carriers/CarrierVehicleTypeReaderTest.java
@@ -23,7 +23,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.matsim.api.core.v01.Id;
@@ -41,7 +41,7 @@ public class CarrierVehicleTypeReaderTest {
 	private CarrierVehicleTypes types;
 	private String inFilename;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		types = new CarrierVehicleTypes();
 		inFilename = utils.getClassInputDirectory() + "vehicleTypes.xml";

diff --git a/contribs/freight/src/test/java/org/matsim/freight/carriers/CarrierVehicleTypeTest.java b/contribs/freight/src/test/java/org/matsim/freight/carriers/CarrierVehicleTypeTest.java
@@ -21,7 +21,7 @@
 
 package org.matsim.freight.carriers;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -38,7 +38,7 @@ public class CarrierVehicleTypeTest {
 
 	CarrierVehicleTypes types;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception{
 		final Id<VehicleType> vehicleTypeId = Id.create( "medium", VehicleType.class );
 		VehicleType mediumType = VehicleUtils.getFactory().createVehicleType( vehicleTypeId );

diff --git a/...ht/src/test/java/org/matsim/freight/carriers/controler/EquilWithCarrierWithPersonsIT.java b/...ht/src/test/java/org/matsim/freight/carriers/controler/EquilWithCarrierWithPersonsIT.java
@@ -21,7 +21,7 @@
 
 package org.matsim.freight.carriers.controler;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -60,7 +60,7 @@ static Config commonConfig( MatsimTestUtils testUtils ) {
 		return config;
 	}
 
-	@Before
+	@BeforeEach
 	public void setUp(){
 		Config config = commonConfig( testUtils );