diff --git a/pom.xml b/pom.xml index a49def62..fa3fc52d 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.matsim matsim-all - 16.0-2023w50 + 16.0-2024w01 @@ -53,6 +53,21 @@ ${project.parent.version} test + + + + org.junit.jupiter + junit-jupiter-engine + 5.10.1 + test + + + org.junit.jupiter + junit-jupiter + 5.10.1 + test + + diff --git a/src/test/java/org/matsim/freight/logistics/adapterTests/CollectionResourceTest.java b/src/test/java/org/matsim/freight/logistics/adapterTests/CollectionResourceTest.java index 5c738688..233aae23 100644 --- 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 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 index 83653160..5e08e004 100644 --- 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 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 index bc41d1bc..ea75f74a 100644 --- 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 index 124bfbb7..f3135c8e 100644 --- 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/src/test/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest.java index 854b6684..2aebd2d7 100644 --- a/src/test/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest.java +++ b/src/test/java/org/matsim/freight/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/src/test/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleTwoEchelonGridTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleTwoEchelonGridTest.java index 619dfe56..d0043688 100644 --- a/src/test/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleTwoEchelonGridTest.java +++ b/src/test/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/src/test/java/org/matsim/freight/logistics/example/lsp/lspReplanning/CollectionLSPReplanningTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/lspReplanning/CollectionLSPReplanningTest.java index 62d212ac..3a2d9adb 100644 --- a/src/test/java/org/matsim/freight/logistics/example/lsp/lspReplanning/CollectionLSPReplanningTest.java +++ b/src/test/java/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/src/test/java/org/matsim/freight/logistics/example/lsp/lspScoring/CollectionLSPScoringTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/lspScoring/CollectionLSPScoringTest.java index 942ae5ff..f1b630eb 100644 --- a/src/test/java/org/matsim/freight/logistics/example/lsp/lspScoring/CollectionLSPScoringTest.java +++ b/src/test/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 index 3a678995..d406cf20 100644 --- 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/src/test/java/org/matsim/freight/logistics/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest.java index 7d97d9f1..781b0349 100644 --- a/src/test/java/org/matsim/freight/logistics/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest.java +++ b/src/test/java/org/matsim/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/src/test/java/org/matsim/freight/logistics/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSPTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSPTest.java index 51515d99..7f3974a9 100644 --- a/src/test/java/org/matsim/freight/logistics/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSPTest.java +++ b/src/test/java/org/matsim/freight/logistics/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSPTest.java @@ -1,11 +1,11 @@ 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; /** @@ -13,7 +13,7 @@ */ public class ExampleMobsimOfSimpleLSPTest { private static final Logger log = LogManager.getLogger(ExampleMobsimOfSimpleLSPTest.class); - @Rule + @RegisterExtension public final MatsimTestUtils utils = new MatsimTestUtils(); @Test diff --git a/src/test/java/org/matsim/freight/logistics/example/lsp/multipleChains/MultipleChainsReplanningTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/multipleChains/MultipleChainsReplanningTest.java index e02abbb9..ff77c96c 100644 --- a/src/test/java/org/matsim/freight/logistics/example/lsp/multipleChains/MultipleChainsReplanningTest.java +++ b/src/test/java/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 createResourcesListFromLSPPlans(List l return resourceList; } - @Before + @BeforeEach public void initialize() { Config config = prepareConfig(); diff --git a/src/test/java/org/matsim/freight/logistics/example/lsp/multipleChains/WorstPlanSelectorTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/multipleChains/WorstPlanSelectorTest.java index 02bda5f3..a526ed75 100644 --- a/src/test/java/org/matsim/freight/logistics/example/lsp/multipleChains/WorstPlanSelectorTest.java +++ b/src/test/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 createResourcesListFromLSPPlans(List l return resourceList; } - @Before + @BeforeEach public void initialize() { Config config = prepareConfig(); diff --git a/src/test/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/CollectionTrackerTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/CollectionTrackerTest.java index 3340ca90..5a8646c1 100644 --- a/src/test/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/CollectionTrackerTest.java +++ b/src/test/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/CollectionTrackerTest.java @@ -20,15 +20,15 @@ package org.matsim.freight.logistics.example.lsp.simulationTrackers; -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.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -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; @@ -59,14 +59,14 @@ public class CollectionTrackerTest { private static final Logger log = LogManager.getLogger(CollectionTrackerTest.class); - @Rule + @RegisterExtension public final MatsimTestUtils utils = new MatsimTestUtils(); private Network network; private Carrier carrier; private LogisticChain logisticChain; private double shareOfFixedCosts; - @Before + @BeforeEach public void initialize() { Config config = new Config(); diff --git a/src/test/java/org/matsim/freight/logistics/example/lspAndDemand/requirementsChecking/AssignerRequirementsTest.java b/src/test/java/org/matsim/freight/logistics/example/lspAndDemand/requirementsChecking/AssignerRequirementsTest.java index c21a4459..ce2cfe87 100644 --- a/src/test/java/org/matsim/freight/logistics/example/lspAndDemand/requirementsChecking/AssignerRequirementsTest.java +++ b/src/test/java/org/matsim/freight/logistics/example/lspAndDemand/requirementsChecking/AssignerRequirementsTest.java @@ -20,13 +20,13 @@ package org.matsim.freight.logistics.example.lspAndDemand.requirementsChecking; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Collections; import java.util.Random; -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 AssignerRequirementsTest { private LogisticChain blueChain; private LogisticChain redChain; - @Before + @BeforeEach public void initialize() { Config config = new Config(); diff --git a/src/test/java/org/matsim/freight/logistics/io/LSPReadWriteTest.java b/src/test/java/org/matsim/freight/logistics/io/LSPReadWriteTest.java index 5a0eed69..9d3083cc 100644 --- a/src/test/java/org/matsim/freight/logistics/io/LSPReadWriteTest.java +++ b/src/test/java/org/matsim/freight/logistics/io/LSPReadWriteTest.java @@ -1,8 +1,8 @@ package org.matsim.freight.logistics.io; import java.util.Collections; -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.carriers.CarrierPlanXmlReader; import org.matsim.freight.carriers.CarrierVehicleTypeReader; import org.matsim.freight.carriers.CarrierVehicleTypes; @@ -12,7 +12,7 @@ public class LSPReadWriteTest { - @Rule + @RegisterExtension public MatsimTestUtils utils = new MatsimTestUtils(); @Test diff --git a/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/CollectionElementTest.java b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/CollectionElementTest.java index 75497197..627986bb 100644 --- a/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/CollectionElementTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/CollectionElementTest.java @@ -20,10 +20,10 @@ package org.matsim.freight.logistics.logisticChainElementTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -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; @@ -44,7 +44,7 @@ public class CollectionElementTest { private LogisticChainElement collectionElement; private LSPCarrierResource carrierResource; - @Before + @BeforeEach public void initialize() { Config config = new Config(); diff --git a/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/DistributionElementTest.java b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/DistributionElementTest.java index 9fb9ef34..3e6c2004 100644 --- a/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/DistributionElementTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/DistributionElementTest.java @@ -20,10 +20,10 @@ package org.matsim.freight.logistics.logisticChainElementTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -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; @@ -47,7 +47,7 @@ public class DistributionElementTest { private LogisticChainElement distributionElement; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/MainRunElementTest.java b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/MainRunElementTest.java index 37c576bf..a4c42ec5 100644 --- a/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/MainRunElementTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/MainRunElementTest.java @@ -20,10 +20,10 @@ package org.matsim.freight.logistics.logisticChainElementTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -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; @@ -45,7 +45,7 @@ public class MainRunElementTest { private LSPResource mainRunResource; private LogisticChainElement mainRunElement; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/SecondHubElementTest.java b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/SecondHubElementTest.java index f4055a74..8fd6e2a0 100644 --- a/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/SecondHubElementTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/SecondHubElementTest.java @@ -20,10 +20,10 @@ package org.matsim.freight.logistics.logisticChainElementTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -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.freight.logistics.LSPResource; import org.matsim.freight.logistics.LSPUtils; @@ -35,7 +35,7 @@ public class SecondHubElementTest { private LSPResource point; private LogisticChainElement hubElement; - @Before + @BeforeEach public void initialize() { TranshipmentHubUtils.TranshipmentHubSchedulerBuilder schedulerBuilder = TranshipmentHubUtils.TranshipmentHubSchedulerBuilder.newInstance(); schedulerBuilder.setCapacityNeedFixed(10); diff --git a/src/test/java/org/matsim/freight/logistics/logisticChainTests/CollectionChainTest.java b/src/test/java/org/matsim/freight/logistics/logisticChainTests/CollectionChainTest.java index 6bde3a65..0d1e0729 100644 --- a/src/test/java/org/matsim/freight/logistics/logisticChainTests/CollectionChainTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainTests/CollectionChainTest.java @@ -20,11 +20,11 @@ package org.matsim.freight.logistics.logisticChainTests; -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; @@ -45,7 +45,7 @@ public class CollectionChainTest { private LogisticChain logisticChain; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/logisticChainTests/CompleteLogisticChainTest.java b/src/test/java/org/matsim/freight/logistics/logisticChainTests/CompleteLogisticChainTest.java index 142e3d3e..11026136 100644 --- a/src/test/java/org/matsim/freight/logistics/logisticChainTests/CompleteLogisticChainTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainTests/CompleteLogisticChainTest.java @@ -20,11 +20,11 @@ package org.matsim.freight.logistics.logisticChainTests; -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; @@ -54,7 +54,7 @@ public class CompleteLogisticChainTest { private LogisticChainElement distributionElement; private LogisticChain logisticChain; - @Before + @BeforeEach public void initialize() { Config config = new Config(); diff --git a/src/test/java/org/matsim/freight/logistics/lspCreationTests/CollectionLSPCreationTest.java b/src/test/java/org/matsim/freight/logistics/lspCreationTests/CollectionLSPCreationTest.java index 20fd5401..f53e9427 100644 --- a/src/test/java/org/matsim/freight/logistics/lspCreationTests/CollectionLSPCreationTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspCreationTests/CollectionLSPCreationTest.java @@ -20,11 +20,11 @@ package org.matsim.freight.logistics.lspCreationTests; -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; @@ -45,7 +45,7 @@ public class CollectionLSPCreationTest { private ShipmentAssigner assigner; private LSP collectionLSP; - @Before + @BeforeEach public void initialize() { Config config = new Config(); diff --git a/src/test/java/org/matsim/freight/logistics/lspCreationTests/CompleteLSPCreationTest.java b/src/test/java/org/matsim/freight/logistics/lspCreationTests/CompleteLSPCreationTest.java index 89d1933b..4d204960 100644 --- a/src/test/java/org/matsim/freight/logistics/lspCreationTests/CompleteLSPCreationTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspCreationTests/CompleteLSPCreationTest.java @@ -20,11 +20,11 @@ package org.matsim.freight.logistics.lspCreationTests; -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; @@ -48,7 +48,7 @@ public class CompleteLSPCreationTest { private ShipmentAssigner assigner; private LogisticChain logisticChain; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CollectionLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CollectionLSPMobsimTest.java index 1a95098b..b6fee357 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CollectionLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CollectionLSPMobsimTest.java @@ -20,7 +20,7 @@ package org.matsim.freight.logistics.lspMobsimTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils.createDefaultSimpleForwardLogisticChainScheduler; import static org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils.createSingleLogisticChainShipmentAssigner; @@ -30,9 +30,9 @@ import java.util.List; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -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.events.Event; @@ -59,13 +59,13 @@ public class CollectionLSPMobsimTest { private static final Logger log = LogManager.getLogger(CollectionLSPMobsimTest.class); - @Rule + @RegisterExtension public final MatsimTestUtils utils = new MatsimTestUtils(); private LSP collectionLSP; private Carrier carrier; private LSPResource collectionResource; - @Before + @BeforeEach public void initialize() { // create config: diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CompleteLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CompleteLSPMobsimTest.java index a6f14e7f..dc0b22f8 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CompleteLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CompleteLSPMobsimTest.java @@ -20,12 +20,12 @@ package org.matsim.freight.logistics.lspMobsimTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; 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,11 +55,11 @@ public class CompleteLSPMobsimTest { - @Rule + @RegisterExtension public final MatsimTestUtils utils = new MatsimTestUtils(); private LSP completeLSP; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstAndSecondReloadLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstAndSecondReloadLSPMobsimTest.java index 439b997b..3d05b14f 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstAndSecondReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstAndSecondReloadLSPMobsimTest.java @@ -20,15 +20,15 @@ package org.matsim.freight.logistics.lspMobsimTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; 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; @@ -58,11 +58,11 @@ public class FirstAndSecondReloadLSPMobsimTest { - @Rule + @RegisterExtension public final MatsimTestUtils utils = new MatsimTestUtils(); private LSP lsp; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstReloadLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstReloadLSPMobsimTest.java index 453f0343..126ee97d 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstReloadLSPMobsimTest.java @@ -20,15 +20,15 @@ package org.matsim.freight.logistics.lspMobsimTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; 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; @@ -57,12 +57,12 @@ public class FirstReloadLSPMobsimTest { - @Rule + @RegisterExtension public final MatsimTestUtils utils = new MatsimTestUtils(); private LSP lsp; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunLSPMobsimTest.java index 381034dc..b5a19980 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunLSPMobsimTest.java @@ -20,15 +20,15 @@ package org.matsim.freight.logistics.lspMobsimTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; 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; @@ -58,11 +58,11 @@ public class MainRunLSPMobsimTest { - @Rule + @RegisterExtension public final MatsimTestUtils utils = new MatsimTestUtils(); private LSP lsp; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunOnlyLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunOnlyLSPMobsimTest.java index 7d84d68f..4218f588 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunOnlyLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunOnlyLSPMobsimTest.java @@ -20,15 +20,15 @@ package org.matsim.freight.logistics.lspMobsimTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; 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; @@ -56,11 +56,11 @@ public class MainRunOnlyLSPMobsimTest { - @Rule + @RegisterExtension public final MatsimTestUtils utils = new MatsimTestUtils(); private LSP lsp; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java index e1ae8be6..263fe2cc 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java @@ -20,15 +20,15 @@ package org.matsim.freight.logistics.lspMobsimTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; 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; @@ -59,12 +59,12 @@ public class MultipleIterationsCollectionLSPMobsimTest { - @Rule + @RegisterExtension public final MatsimTestUtils utils = new MatsimTestUtils(); private LSP collectionLSP; - @Before + @BeforeEach public void initialize() { Config config = new Config(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java index 10e2695e..6626f425 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java @@ -20,15 +20,15 @@ package org.matsim.freight.logistics.lspMobsimTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; 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; @@ -64,11 +64,11 @@ public class MultipleIterationsCompleteLSPMobsimTest { - @Rule + @RegisterExtension public final MatsimTestUtils utils = new MatsimTestUtils(); private LSP completeLSP; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstAndSecondReloadLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstAndSecondReloadLSPMobsimTest.java index ddc77b31..ad98c3a6 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstAndSecondReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstAndSecondReloadLSPMobsimTest.java @@ -20,15 +20,15 @@ package org.matsim.freight.logistics.lspMobsimTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; 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; @@ -63,11 +63,11 @@ public class MultipleIterationsFirstAndSecondReloadLSPMobsimTest { - @Rule + @RegisterExtension public final MatsimTestUtils utils = new MatsimTestUtils(); private LSP lsp; - @Before + @BeforeEach public void initialize() { //Todo/Fixme: In the result there only the second hub is used. -- see Issue #170. KMT Nov'23 Config config = new Config(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java index 7221bf60..04f673cc 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java @@ -20,15 +20,15 @@ package org.matsim.freight.logistics.lspMobsimTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; 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; @@ -61,12 +61,12 @@ public class MultipleIterationsFirstReloadLSPMobsimTest { - @Rule + @RegisterExtension public final MatsimTestUtils utils = new MatsimTestUtils(); private LSP lsp; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java index ce03400c..a64fd438 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java @@ -20,15 +20,15 @@ package org.matsim.freight.logistics.lspMobsimTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; 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; @@ -63,11 +63,11 @@ public class MultipleIterationsMainRunLSPMobsimTest { - @Rule + @RegisterExtension public final MatsimTestUtils utils = new MatsimTestUtils(); private LSP lsp; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java index 72fc5421..b1b45de2 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java @@ -20,15 +20,15 @@ package org.matsim.freight.logistics.lspMobsimTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; 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; @@ -55,11 +55,11 @@ public class MultipleShipmentsCollectionLSPMobsimTest { - @Rule + @RegisterExtension public final MatsimTestUtils utils = new MatsimTestUtils(); private LSP collectionLSP; - @Before + @BeforeEach public void initialize() { Config config = new Config(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java index 365e6650..01fb5532 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java @@ -20,7 +20,7 @@ package org.matsim.freight.logistics.lspMobsimTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; @@ -28,9 +28,9 @@ import java.util.List; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -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; @@ -67,11 +67,11 @@ public class MultipleShipmentsCompleteLSPMobsimTest { private static final Logger log = LogManager.getLogger(MultipleShipmentsCompleteLSPMobsimTest.class); - @Rule + @RegisterExtension public final MatsimTestUtils utils = new MatsimTestUtils(); private LSP completeLSP; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstAndSecondReloadLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstAndSecondReloadLSPMobsimTest.java index 12f7fe00..c2c77a0e 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstAndSecondReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstAndSecondReloadLSPMobsimTest.java @@ -20,15 +20,15 @@ package org.matsim.freight.logistics.lspMobsimTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; 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; @@ -63,11 +63,11 @@ public class MultipleShipmentsFirstAndSecondReloadLSPMobsimTest { - @Rule + @RegisterExtension public final MatsimTestUtils utils = new MatsimTestUtils(); private LSP lsp; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java index 3e556d5f..62c8f1c9 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java @@ -20,15 +20,15 @@ package org.matsim.freight.logistics.lspMobsimTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; 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; @@ -57,11 +57,11 @@ public class MultipleShipmentsFirstReloadLSPMobsimTest { - @Rule + @RegisterExtension public final MatsimTestUtils utils = new MatsimTestUtils(); private LSP lsp; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java index 995aa4ad..f55752ea 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java @@ -20,15 +20,15 @@ package org.matsim.freight.logistics.lspMobsimTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; 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; @@ -58,11 +58,11 @@ public class MultipleShipmentsMainRunLSPMobsimTest { - @Rule + @RegisterExtension public final MatsimTestUtils utils = new MatsimTestUtils(); private LSP lsp; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java index 18648ed2..b98c213d 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java @@ -20,15 +20,15 @@ package org.matsim.freight.logistics.lspMobsimTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; 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; @@ -59,11 +59,11 @@ public class RepeatedMultipleShipmentsCompleteLSPMobsimTest { - @Rule + @RegisterExtension public final MatsimTestUtils utils = new MatsimTestUtils(); private LSP completeLSP; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/lspPlanTests/CollectionLSPPlanTest.java b/src/test/java/org/matsim/freight/logistics/lspPlanTests/CollectionLSPPlanTest.java index 0891eba1..b726b248 100644 --- a/src/test/java/org/matsim/freight/logistics/lspPlanTests/CollectionLSPPlanTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspPlanTests/CollectionLSPPlanTest.java @@ -20,10 +20,10 @@ package org.matsim.freight.logistics.lspPlanTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -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; @@ -44,7 +44,7 @@ public class CollectionLSPPlanTest { private ShipmentAssigner assigner; private LSPPlan collectionPlan; - @Before + @BeforeEach public void initialize() { Config config = new Config(); diff --git a/src/test/java/org/matsim/freight/logistics/lspPlanTests/CompleteLSPPlanTest.java b/src/test/java/org/matsim/freight/logistics/lspPlanTests/CompleteLSPPlanTest.java index 047033f2..611ca8f4 100644 --- a/src/test/java/org/matsim/freight/logistics/lspPlanTests/CompleteLSPPlanTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspPlanTests/CompleteLSPPlanTest.java @@ -20,10 +20,10 @@ package org.matsim.freight.logistics.lspPlanTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -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; @@ -48,7 +48,7 @@ public class CompleteLSPPlanTest { private LSPPlan completePlan; private LogisticChain logisticChain; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CollectionLSPShipmentAssigmentTest.java b/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CollectionLSPShipmentAssigmentTest.java index 6241b70d..4d266375 100644 --- a/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CollectionLSPShipmentAssigmentTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CollectionLSPShipmentAssigmentTest.java @@ -20,12 +20,12 @@ package org.matsim.freight.logistics.lspShipmentAssignmentTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; -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; @@ -48,7 +48,7 @@ public class CollectionLSPShipmentAssigmentTest { private LSPPlan collectionPlan; private LSP collectionLSP; - @Before + @BeforeEach public void initialize() { Config config = new Config(); diff --git a/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CompleteLSPShipmentAssignerTest.java b/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CompleteLSPShipmentAssignerTest.java index e06c1a8d..4875d05f 100644 --- a/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CompleteLSPShipmentAssignerTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CompleteLSPShipmentAssignerTest.java @@ -20,12 +20,12 @@ package org.matsim.freight.logistics.lspShipmentAssignmentTests; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; -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; @@ -53,7 +53,7 @@ public class CompleteLSPShipmentAssignerTest { private LSP completeLSP; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/lspShipmentTest/CollectionShipmentBuilderTest.java b/src/test/java/org/matsim/freight/logistics/lspShipmentTest/CollectionShipmentBuilderTest.java index f0886dbf..d117e117 100644 --- a/src/test/java/org/matsim/freight/logistics/lspShipmentTest/CollectionShipmentBuilderTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspShipmentTest/CollectionShipmentBuilderTest.java @@ -20,12 +20,12 @@ package org.matsim.freight.logistics.lspShipmentTest; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; -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; @@ -44,7 +44,7 @@ public class CollectionShipmentBuilderTest { private ArrayList shipments; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/lspShipmentTest/CompleteShipmentBuilderTest.java b/src/test/java/org/matsim/freight/logistics/lspShipmentTest/CompleteShipmentBuilderTest.java index 0201908b..6049dae0 100644 --- a/src/test/java/org/matsim/freight/logistics/lspShipmentTest/CompleteShipmentBuilderTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspShipmentTest/CompleteShipmentBuilderTest.java @@ -20,12 +20,12 @@ package org.matsim.freight.logistics.lspShipmentTest; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; -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; @@ -43,7 +43,7 @@ public class CompleteShipmentBuilderTest { private Network network; private ArrayList shipments; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/lspShipmentTest/DistributionShipmentBuilderTest.java b/src/test/java/org/matsim/freight/logistics/lspShipmentTest/DistributionShipmentBuilderTest.java index d1a9db31..05082fd6 100644 --- a/src/test/java/org/matsim/freight/logistics/lspShipmentTest/DistributionShipmentBuilderTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspShipmentTest/DistributionShipmentBuilderTest.java @@ -20,12 +20,12 @@ package org.matsim.freight.logistics.lspShipmentTest; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; -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; @@ -44,7 +44,7 @@ public class DistributionShipmentBuilderTest { private ArrayList shipments; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/CollectionLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/CollectionLSPSchedulingTest.java index f89566f6..48bf8b00 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/CollectionLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/CollectionLSPSchedulingTest.java @@ -20,13 +20,13 @@ package org.matsim.freight.logistics.resourceImplementations; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.Random; -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; @@ -52,7 +52,7 @@ public class CollectionLSPSchedulingTest { private LSPResource collectionResource; private LogisticChainElement collectionElement; - @Before + @BeforeEach public void initialize() { Config config = new Config(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/CompleteLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/CompleteLSPSchedulingTest.java index b99cd0f8..2bf1c997 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/CompleteLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/CompleteLSPSchedulingTest.java @@ -20,15 +20,15 @@ package org.matsim.freight.logistics.resourceImplementations; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.Map.Entry; import java.util.Random; -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; @@ -72,7 +72,7 @@ public class CompleteLSPSchedulingTest { private LogisticChainElement distributionElement; private Id toLinkId; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstHubElementTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstHubElementTest.java index 591cfbb8..b01819a8 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstHubElementTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstHubElementTest.java @@ -20,10 +20,10 @@ package org.matsim.freight.logistics.resourceImplementations; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -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.freight.logistics.LSPResource; import org.matsim.freight.logistics.LSPUtils; @@ -36,7 +36,7 @@ public class FirstHubElementTest { private TransshipmentHubResource point; private LogisticChainElement reloadingElement; - @Before + @BeforeEach public void initialize() { TranshipmentHubUtils.TranshipmentHubSchedulerBuilder schedulerBuilder = TranshipmentHubUtils.TranshipmentHubSchedulerBuilder.newInstance(); schedulerBuilder.setCapacityNeedFixed(10); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadLSPSchedulingTest.java index feaef55f..6d8dedda 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadLSPSchedulingTest.java @@ -20,13 +20,13 @@ package org.matsim.freight.logistics.resourceImplementations; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.Map.Entry; -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; @@ -57,7 +57,7 @@ public class FirstReloadLSPSchedulingTest { private LogisticChainElement collectionElement; private LSPResource collectionResource; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadResourceTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadResourceTest.java index f20ffbdb..3a3f2e34 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadResourceTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadResourceTest.java @@ -20,10 +20,10 @@ package org.matsim.freight.logistics.resourceImplementations; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -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.network.Link; import org.matsim.freight.logistics.LSPCarrierResource; @@ -36,7 +36,7 @@ public class FirstReloadResourceTest { private static final Id hubLinkId = Id.createLinkId("(4 2) (4 3)"); private TransshipmentHubResource transshipmentHubResource; - @Before + @BeforeEach public void initialize() { diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MainRunLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MainRunLSPSchedulingTest.java index 56e49b6f..777aa4de 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MainRunLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MainRunLSPSchedulingTest.java @@ -20,13 +20,13 @@ package org.matsim.freight.logistics.resourceImplementations; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.Map.Entry; -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; @@ -63,7 +63,7 @@ public class MainRunLSPSchedulingTest { private LogisticChainElement mainRunElement; private Id toLinkId; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java index 53496781..c4329490 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java @@ -20,13 +20,13 @@ package org.matsim.freight.logistics.resourceImplementations; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.Random; -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; @@ -53,7 +53,7 @@ public class MultipleShipmentsCollectionLSPSchedulingTest { private LSPResource collectionResource; private LogisticChainElement collectionElement; - @Before + @BeforeEach public void initialize() { Config config = new Config(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java index 51102827..5ff47ace 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java @@ -20,15 +20,15 @@ package org.matsim.freight.logistics.resourceImplementations; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.Map.Entry; import java.util.Random; -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; @@ -72,7 +72,7 @@ public class MultipleShipmentsCompleteLSPSchedulingTest { private LogisticChainElement distributionElement; private Id toLinkId; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java index 2a3a352d..081929e7 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java @@ -20,13 +20,13 @@ package org.matsim.freight.logistics.resourceImplementations; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.Map.Entry; -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; @@ -57,7 +57,7 @@ public class MultipleShipmentsFirstReloadLSPSchedulingTest { private LogisticChainElement collectionElement; private LSPResource collectionResource; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java index 52acbd4b..5b25469c 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java @@ -20,13 +20,13 @@ package org.matsim.freight.logistics.resourceImplementations; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.Map.Entry; -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; @@ -63,7 +63,7 @@ public class MultipleShipmentsMainRunLSPSchedulingTest { private LogisticChainElement mainRunElement; private Id toLinkId; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java index 7804027a..8cd5719a 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java @@ -20,14 +20,14 @@ package org.matsim.freight.logistics.resourceImplementations; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.Map.Entry; -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; @@ -66,7 +66,7 @@ public class MultipleShipmentsSecondReloadLSPSchedulingTest { private LogisticChainElement secondHubElement; private Id toLinkId; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadLSPSchedulingTest.java index 185e06fa..19886d02 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadLSPSchedulingTest.java @@ -20,14 +20,14 @@ package org.matsim.freight.logistics.resourceImplementations; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.Map.Entry; -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; @@ -66,7 +66,7 @@ public class SecondReloadLSPSchedulingTest { private LogisticChainElement secondHubElement; private Id toLinkId; - @Before + @BeforeEach public void initialize() { Config config = new Config(); config.addCoreModules(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadResourceTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadResourceTest.java index cae21ba2..2db33026 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadResourceTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadResourceTest.java @@ -20,10 +20,10 @@ package org.matsim.freight.logistics.resourceImplementations; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -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.network.Link; import org.matsim.freight.logistics.LSPCarrierResource; @@ -36,7 +36,7 @@ public class SecondReloadResourceTest { private TransshipmentHubResource transshipmentHubResource; private Id reloadingLinkId; - @Before + @BeforeEach public void initialize() { TranshipmentHubUtils.TranshipmentHubSchedulerBuilder schedulerBuilder = TranshipmentHubUtils.TranshipmentHubSchedulerBuilder.newInstance(); schedulerBuilder.setCapacityNeedFixed(10);