Merge pull request #191 from matsim-vsp/dependabot/maven/project.pare…

…nt.version-16.0-2024w01 Bump project.parent.version from 16.0-2023w50 to 16.0-2024w01
matsim-vsp · Jan 3, 2024 · f2869f7 · f2869f7
2 parents 2b359bb + 8df8fff
commit f2869f7
Show file tree

Hide file tree

Showing 62 changed files with 308 additions and 294 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.matsim</groupId>
         <artifactId>matsim-all</artifactId>
-		<version>16.0-2023w50</version>
+		<version>16.0-2024w01</version>
 <!--		<version>16.0-2023w41</version>-->
 <!--        <version>16.0-2023w23</version>-->
 <!--        <version>16.0-SNAPSHOT</version>-->
@@ -53,6 +53,21 @@
 			<version>${project.parent.version}</version>
 			<scope>test</scope>
 		</dependency>
+
+
+        <dependency>
+            <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>
+
 	</dependencies>
 
 </project>
diff --git a/src/test/java/org/matsim/freight/logistics/adapterTests/CollectionResourceTest.java b/src/test/java/org/matsim/freight/logistics/adapterTests/CollectionResourceTest.java
@@ -20,11 +20,11 @@
 
 package org.matsim.freight.logistics.adapterTests;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.ArrayList;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
@@ -51,7 +51,7 @@ public class CollectionResourceTest {
 	private Id<Link> collectionLinkId;
 	private CarrierCapabilities capabilities;
 
-	@Before
+	@BeforeEach
 	public void initialize() {
 		Config config = new Config();
 		config.addCoreModules();

diff --git a/src/test/java/org/matsim/freight/logistics/adapterTests/DistributionResourceTest.java b/src/test/java/org/matsim/freight/logistics/adapterTests/DistributionResourceTest.java
@@ -20,11 +20,11 @@
 
 package org.matsim.freight.logistics.adapterTests;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.ArrayList;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
@@ -51,7 +51,7 @@ public class DistributionResourceTest {
 	private LSPCarrierResource distributionResource;
 	private Id<Link> distributionLinkId;
 
-	@Before
+	@BeforeEach
 	public void initialize() {
 		Config config = new Config();
 		config.addCoreModules();

diff --git a/src/test/java/org/matsim/freight/logistics/adapterTests/MainRunResourceTest.java b/src/test/java/org/matsim/freight/logistics/adapterTests/MainRunResourceTest.java
@@ -20,11 +20,11 @@
 
 package org.matsim.freight.logistics.adapterTests;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.ArrayList;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
@@ -49,7 +49,7 @@ public class MainRunResourceTest {
 	private Carrier carrier;
 	private LSPCarrierResource mainRunResource;
 
-	@Before
+	@BeforeEach
 	public void initialize() {
 		Config config = new Config();
 		config.addCoreModules();

diff --git a/src/test/java/org/matsim/freight/logistics/events/LspEventsReaderTest.java b/src/test/java/org/matsim/freight/logistics/events/LspEventsReaderTest.java
@@ -4,8 +4,8 @@
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.events.Event;
 import org.matsim.core.api.experimental.events.EventsManager;
@@ -48,7 +48,7 @@ public void testReader() {
 						ControllerConfigGroup.EventsFileFormat.xml);
 		eventsManager.finishProcessing();
 
-		Assert.assertArrayEquals(lspEvents.toArray(), handler.handledEvents.toArray());
+		Assertions.assertArrayEquals(lspEvents.toArray(), handler.handledEvents.toArray());
 	}
 
 	private static class TestEventHandler

diff --git a/...logistics/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest.java b/...logistics/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest.java
@@ -20,18 +20,18 @@
 
 package org.matsim.freight.logistics.example.lsp.initialPlans;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 import org.matsim.freight.logistics.example.lsp.initialPlans.ExampleSchedulingOfTransportChainHubsVsDirect.SolutionType;
 import org.matsim.testcases.MatsimTestUtils;
 
 public class ExampleSchedulingOfTransportChainHubsVsDirectTest {
 	private static final Logger log = LogManager.getLogger(ExampleSchedulingOfTransportChainHubsVsDirectTest.class);
-	@Rule
+	@RegisterExtension
 	public final MatsimTestUtils utils = new MatsimTestUtils();
 
 	@Test

diff --git a/...java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleTwoEchelonGridTest.java b/...java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleTwoEchelonGridTest.java
@@ -20,17 +20,17 @@
 
 package org.matsim.freight.logistics.example.lsp.initialPlans;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 import org.matsim.testcases.MatsimTestUtils;
 
 public class ExampleTwoEchelonGridTest {
 	private static final Logger log = LogManager.getLogger(ExampleTwoEchelonGridTest.class);
-	@Rule
+	@RegisterExtension
 	public final MatsimTestUtils utils = new MatsimTestUtils();
 
 	@Test

diff --git a/...a/org/matsim/freight/logistics/example/lsp/lspReplanning/CollectionLSPReplanningTest.java b/...a/org/matsim/freight/logistics/example/lsp/lspReplanning/CollectionLSPReplanningTest.java
@@ -20,12 +20,12 @@
 
 package org.matsim.freight.logistics.example.lsp.lspReplanning;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.*;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
@@ -55,12 +55,12 @@
 
 public class CollectionLSPReplanningTest {
 
-	@Rule
+	@RegisterExtension
 	public final MatsimTestUtils utils = new MatsimTestUtils();
 
 	private LSP collectionLSP;
 
-	@Before
+	@BeforeEach
 	public void initialize() {
 
 		Config config = new Config();

diff --git a/...st/java/org/matsim/freight/logistics/example/lsp/lspScoring/CollectionLSPScoringTest.java b/...st/java/org/matsim/freight/logistics/example/lsp/lspScoring/CollectionLSPScoringTest.java
@@ -20,15 +20,15 @@
 
 package org.matsim.freight.logistics.example.lsp.lspScoring;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils.createDefaultSimpleForwardLogisticChainScheduler;
 import static org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils.createSingleLogisticChainShipmentAssigner;
 
 import java.util.*;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
@@ -51,12 +51,12 @@
 
 public class CollectionLSPScoringTest {
 
-	@Rule
+	@RegisterExtension
 	public final MatsimTestUtils utils = new MatsimTestUtils();
 	private final int numberOfShipments = 25;
 	private LSP collectionLSP;
 
-	@Before
+	@BeforeEach
 	public void initialize() {
 		Config config = ConfigUtils.createConfig();
 		config.network().setInputFile("scenarios/2regions/2regions-network.xml");

diff --git a/src/test/java/org/matsim/freight/logistics/example/lsp/lspScoring/ExampleLSPScoringTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/lspScoring/ExampleLSPScoringTest.java
@@ -1,8 +1,7 @@
 package org.matsim.freight.logistics.example.lsp.lspScoring;
-
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.groups.VspExperimentalConfigGroup;
@@ -13,7 +12,7 @@
 
 public class ExampleLSPScoringTest {
 
-	@Rule
+	@RegisterExtension
 	public final MatsimTestUtils utils = new MatsimTestUtils();
 
 	@Test
@@ -31,7 +30,7 @@ public void testMain() {
 		controler.run();
 
 		for (LSP lsp : LSPUtils.getLSPs(scenario).getLSPs().values()) {
-			Assert.assertEquals(13.245734044444207, lsp.getSelectedPlan().getScore(), Double.MIN_VALUE);
+			Assertions.assertEquals(13.245734044444207, lsp.getSelectedPlan().getScore(), Double.MIN_VALUE);
 		}
 
 	}

diff --git a/.../freight/logistics/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest.java b/.../freight/logistics/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest.java
@@ -20,13 +20,13 @@
 
 package org.matsim.freight.logistics.example.lsp.lspScoring;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.*;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
@@ -55,13 +55,13 @@
 
 public class MultipleIterationsCollectionLSPScoringTest {
 
-	@Rule
+	@RegisterExtension
 	public final MatsimTestUtils utils = new MatsimTestUtils();
 
 	private final int numberOfShipments = 25;
 	private LSP collectionLSP;
 
-	@Before
+	@BeforeEach
 	public void initialize() {
 
 		Config config = new Config();

diff --git a/...org/matsim/freight/logistics/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSPTest.java b/...org/matsim/freight/logistics/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSPTest.java
@@ -1,19 +1,19 @@
 package org.matsim.freight.logistics.example.lsp.mobsimExamples;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 import org.matsim.testcases.MatsimTestUtils;
 
 /**
  * @author Kai Martins-Turner (kturner)
  */
 public class ExampleMobsimOfSimpleLSPTest {
 	private static final Logger log = LogManager.getLogger(ExampleMobsimOfSimpleLSPTest.class);
-	@Rule
+	@RegisterExtension
 	public final MatsimTestUtils utils = new MatsimTestUtils();
 
 	@Test

diff --git a/...org/matsim/freight/logistics/example/lsp/multipleChains/MultipleChainsReplanningTest.java b/...org/matsim/freight/logistics/example/lsp/multipleChains/MultipleChainsReplanningTest.java
@@ -1,14 +1,14 @@
 package org.matsim.freight.logistics.example.lsp.multipleChains;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
@@ -47,7 +47,7 @@ public class MultipleChainsReplanningTest {
 			.setCostPerDistanceUnit(0.01)
 			.setCostPerTimeUnit(0.01)
 			.build();
-	@Rule
+	@RegisterExtension
 	public final MatsimTestUtils utils = new MatsimTestUtils();
 	int initialPlanCount;
 	int initialPlanShipmentPlanCount;
@@ -190,7 +190,7 @@ private static List<LSPResource> createResourcesListFromLSPPlans(List<LSPPlan> l
 		return resourceList;
 	}
 
-	@Before
+	@BeforeEach
 	public void initialize() {
 
 		Config config = prepareConfig();

diff --git a/...t/java/org/matsim/freight/logistics/example/lsp/multipleChains/WorstPlanSelectorTest.java b/...t/java/org/matsim/freight/logistics/example/lsp/multipleChains/WorstPlanSelectorTest.java
@@ -1,11 +1,11 @@
 package org.matsim.freight.logistics.example.lsp.multipleChains;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.*;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
@@ -54,7 +54,7 @@ public class WorstPlanSelectorTest {
 			.setCostPerDistanceUnit(0.01)
 			.setCostPerTimeUnit(0.01)
 			.build();
-	@Rule
+	@RegisterExtension
 	public final MatsimTestUtils utils = new MatsimTestUtils();
 	private LSP lsp;
 
@@ -218,7 +218,7 @@ private static List<LSPResource> createResourcesListFromLSPPlans(List<LSPPlan> l
 		return resourceList;
 	}
 
-	@Before
+	@BeforeEach
 	public void initialize() {
 
 		Config config = prepareConfig();