From 8df8fffa90718081b009c4c5a7a21ff6fe512ed4 Mon Sep 17 00:00:00 2001 From: Kai Martins-Turner Date: Wed, 3 Jan 2024 14:22:49 +0100 Subject: [PATCH] update import of @Test annotation --- .../freight/logistics/adapterTests/CollectionResourceTest.java | 2 +- .../logistics/adapterTests/DistributionResourceTest.java | 2 +- .../freight/logistics/adapterTests/MainRunResourceTest.java | 2 +- .../matsim/freight/logistics/events/LspEventsReaderTest.java | 2 +- .../ExampleSchedulingOfTransportChainHubsVsDirectTest.java | 2 +- .../example/lsp/initialPlans/ExampleTwoEchelonGridTest.java | 2 +- .../example/lsp/lspReplanning/CollectionLSPReplanningTest.java | 2 +- .../example/lsp/lspScoring/CollectionLSPScoringTest.java | 2 +- .../logistics/example/lsp/lspScoring/ExampleLSPScoringTest.java | 2 +- .../lspScoring/MultipleIterationsCollectionLSPScoringTest.java | 2 +- .../lsp/mobsimExamples/ExampleMobsimOfSimpleLSPTest.java | 2 +- .../lsp/multipleChains/MultipleChainsReplanningTest.java | 2 +- .../example/lsp/multipleChains/WorstPlanSelectorTest.java | 2 +- .../example/lsp/simulationTrackers/CollectionTrackerTest.java | 2 +- .../requirementsChecking/AssignerRequirementsTest.java | 2 +- .../java/org/matsim/freight/logistics/io/LSPReadWriteTest.java | 2 +- .../logisticChainElementTests/CollectionElementTest.java | 2 +- .../logisticChainElementTests/DistributionElementTest.java | 2 +- .../logistics/logisticChainElementTests/MainRunElementTest.java | 2 +- .../logisticChainElementTests/SecondHubElementTest.java | 2 +- .../logistics/logisticChainTests/CollectionChainTest.java | 2 +- .../logistics/logisticChainTests/CompleteLogisticChainTest.java | 2 +- .../logistics/lspCreationTests/CollectionLSPCreationTest.java | 2 +- .../logistics/lspCreationTests/CompleteLSPCreationTest.java | 2 +- .../logistics/lspMobsimTests/CollectionLSPMobsimTest.java | 2 +- .../freight/logistics/lspMobsimTests/CompleteLSPMobsimTest.java | 2 +- .../lspMobsimTests/FirstAndSecondReloadLSPMobsimTest.java | 2 +- .../logistics/lspMobsimTests/FirstReloadLSPMobsimTest.java | 2 +- .../freight/logistics/lspMobsimTests/MainRunLSPMobsimTest.java | 2 +- .../logistics/lspMobsimTests/MainRunOnlyLSPMobsimTest.java | 2 +- .../MultipleIterationsCollectionLSPMobsimTest.java | 2 +- .../lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java | 2 +- .../MultipleIterationsFirstAndSecondReloadLSPMobsimTest.java | 2 +- .../MultipleIterationsFirstReloadLSPMobsimTest.java | 2 +- .../lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java | 2 +- .../MultipleShipmentsCollectionLSPMobsimTest.java | 2 +- .../lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java | 2 +- .../MultipleShipmentsFirstAndSecondReloadLSPMobsimTest.java | 2 +- .../MultipleShipmentsFirstReloadLSPMobsimTest.java | 2 +- .../lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java | 2 +- .../RepeatedMultipleShipmentsCompleteLSPMobsimTest.java | 2 +- .../freight/logistics/lspPlanTests/CollectionLSPPlanTest.java | 2 +- .../freight/logistics/lspPlanTests/CompleteLSPPlanTest.java | 2 +- .../CollectionLSPShipmentAssigmentTest.java | 2 +- .../CompleteLSPShipmentAssignerTest.java | 2 +- .../lspShipmentTest/CollectionShipmentBuilderTest.java | 2 +- .../logistics/lspShipmentTest/CompleteShipmentBuilderTest.java | 2 +- .../lspShipmentTest/DistributionShipmentBuilderTest.java | 2 +- .../resourceImplementations/CollectionLSPSchedulingTest.java | 2 +- .../resourceImplementations/CompleteLSPSchedulingTest.java | 2 +- .../logistics/resourceImplementations/FirstHubElementTest.java | 2 +- .../resourceImplementations/FirstReloadLSPSchedulingTest.java | 2 +- .../resourceImplementations/FirstReloadResourceTest.java | 2 +- .../resourceImplementations/MainRunLSPSchedulingTest.java | 2 +- .../MultipleShipmentsCollectionLSPSchedulingTest.java | 2 +- .../MultipleShipmentsCompleteLSPSchedulingTest.java | 2 +- .../MultipleShipmentsFirstReloadLSPSchedulingTest.java | 2 +- .../MultipleShipmentsMainRunLSPSchedulingTest.java | 2 +- .../MultipleShipmentsSecondReloadLSPSchedulingTest.java | 2 +- .../resourceImplementations/SecondReloadLSPSchedulingTest.java | 2 +- .../resourceImplementations/SecondReloadResourceTest.java | 2 +- 61 files changed, 61 insertions(+), 61 deletions(-) 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 2b9e2f95..233aae23 100644 --- a/src/test/java/org/matsim/freight/logistics/adapterTests/CollectionResourceTest.java +++ b/src/test/java/org/matsim/freight/logistics/adapterTests/CollectionResourceTest.java @@ -24,7 +24,7 @@ import java.util.ArrayList; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 497cda26..5e08e004 100644 --- a/src/test/java/org/matsim/freight/logistics/adapterTests/DistributionResourceTest.java +++ b/src/test/java/org/matsim/freight/logistics/adapterTests/DistributionResourceTest.java @@ -24,7 +24,7 @@ import java.util.ArrayList; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 69560b0c..ea75f74a 100644 --- a/src/test/java/org/matsim/freight/logistics/adapterTests/MainRunResourceTest.java +++ b/src/test/java/org/matsim/freight/logistics/adapterTests/MainRunResourceTest.java @@ -24,7 +24,7 @@ import java.util.ArrayList; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 3f2f5ddf..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,7 +4,7 @@ import java.io.ByteArrayOutputStream; import java.util.ArrayList; import java.util.List; -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; 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 6f07563c..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 @@ -25,7 +25,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.matsim.freight.logistics.example.lsp.initialPlans.ExampleSchedulingOfTransportChainHubsVsDirect.SolutionType; import org.matsim.testcases.MatsimTestUtils; 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 ff717fe3..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 @@ -25,7 +25,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.matsim.testcases.MatsimTestUtils; public class ExampleTwoEchelonGridTest { 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 ddb00643..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 @@ -25,7 +25,7 @@ import java.util.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 fe4ac3fd..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 @@ -28,7 +28,7 @@ import java.util.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 d52b2a7c..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,7 +1,7 @@ package org.matsim.freight.logistics.example.lsp.lspScoring; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 342cbcfe..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 @@ -26,7 +26,7 @@ import java.util.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 51f74347..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 @@ -5,7 +5,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.matsim.testcases.MatsimTestUtils; /** 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 4f31982b..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 @@ -8,7 +8,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 4fdf6d5b..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 @@ -5,7 +5,7 @@ import java.util.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 1c93a9a7..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 @@ -28,7 +28,7 @@ import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 110e0806..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 @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.Random; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 e3a34251..9d3083cc 100644 --- a/src/test/java/org/matsim/freight/logistics/io/LSPReadWriteTest.java +++ b/src/test/java/org/matsim/freight/logistics/io/LSPReadWriteTest.java @@ -2,7 +2,7 @@ import java.util.Collections; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.matsim.freight.carriers.CarrierPlanXmlReader; import org.matsim.freight.carriers.CarrierVehicleTypeReader; import org.matsim.freight.carriers.CarrierVehicleTypes; 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 dee6c548..627986bb 100644 --- a/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/CollectionElementTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/CollectionElementTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 1ec76af3..3e6c2004 100644 --- a/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/DistributionElementTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/DistributionElementTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 e8fe66f9..a4c42ec5 100644 --- a/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/MainRunElementTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/MainRunElementTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 d84d346e..8fd6e2a0 100644 --- a/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/SecondHubElementTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/SecondHubElementTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 7baddcd5..0d1e0729 100644 --- a/src/test/java/org/matsim/freight/logistics/logisticChainTests/CollectionChainTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainTests/CollectionChainTest.java @@ -24,7 +24,7 @@ import java.util.ArrayList; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 775e500d..11026136 100644 --- a/src/test/java/org/matsim/freight/logistics/logisticChainTests/CompleteLogisticChainTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainTests/CompleteLogisticChainTest.java @@ -24,7 +24,7 @@ import java.util.ArrayList; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 4e94369e..f53e9427 100644 --- a/src/test/java/org/matsim/freight/logistics/lspCreationTests/CollectionLSPCreationTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspCreationTests/CollectionLSPCreationTest.java @@ -24,7 +24,7 @@ import java.util.ArrayList; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 b5be7fbe..4d204960 100644 --- a/src/test/java/org/matsim/freight/logistics/lspCreationTests/CompleteLSPCreationTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspCreationTests/CompleteLSPCreationTest.java @@ -24,7 +24,7 @@ import java.util.ArrayList; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 4ae9a693..b6fee357 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CollectionLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CollectionLSPMobsimTest.java @@ -32,7 +32,7 @@ import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 9c0159e1..dc0b22f8 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CompleteLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CompleteLSPMobsimTest.java @@ -25,7 +25,7 @@ import java.util.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 cb4c818c..3d05b14f 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstAndSecondReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstAndSecondReloadLSPMobsimTest.java @@ -28,7 +28,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 463a5831..126ee97d 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstReloadLSPMobsimTest.java @@ -28,7 +28,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 80b2cf48..b5a19980 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunLSPMobsimTest.java @@ -28,7 +28,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 6f4a04df..4218f588 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunOnlyLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunOnlyLSPMobsimTest.java @@ -28,7 +28,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 7078e7a5..263fe2cc 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java @@ -28,7 +28,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 8d9e1b4c..6626f425 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java @@ -28,7 +28,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 7ae2b7e1..ad98c3a6 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstAndSecondReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstAndSecondReloadLSPMobsimTest.java @@ -28,7 +28,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 135041ed..04f673cc 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java @@ -28,7 +28,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 d512bbb4..a64fd438 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java @@ -28,7 +28,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 7edacf00..b1b45de2 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java @@ -28,7 +28,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 e1df32e0..01fb5532 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java @@ -30,7 +30,7 @@ import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 17fd3efd..c2c77a0e 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstAndSecondReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstAndSecondReloadLSPMobsimTest.java @@ -28,7 +28,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 383d5eae..62c8f1c9 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java @@ -28,7 +28,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 a6a33d45..f55752ea 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java @@ -28,7 +28,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 6ff445e3..b98c213d 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java @@ -28,7 +28,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.Test; +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; 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 40a8a869..b726b248 100644 --- a/src/test/java/org/matsim/freight/logistics/lspPlanTests/CollectionLSPPlanTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspPlanTests/CollectionLSPPlanTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 55f21fcf..611ca8f4 100644 --- a/src/test/java/org/matsim/freight/logistics/lspPlanTests/CompleteLSPPlanTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspPlanTests/CompleteLSPPlanTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 27be3975..4d266375 100644 --- a/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CollectionLSPShipmentAssigmentTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CollectionLSPShipmentAssigmentTest.java @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Collections; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 b9b9b4ef..4875d05f 100644 --- a/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CompleteLSPShipmentAssignerTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CompleteLSPShipmentAssignerTest.java @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Collections; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 a3189b4b..d117e117 100644 --- a/src/test/java/org/matsim/freight/logistics/lspShipmentTest/CollectionShipmentBuilderTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspShipmentTest/CollectionShipmentBuilderTest.java @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Collections; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 06181727..6049dae0 100644 --- a/src/test/java/org/matsim/freight/logistics/lspShipmentTest/CompleteShipmentBuilderTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspShipmentTest/CompleteShipmentBuilderTest.java @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Collections; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 713dbe1e..05082fd6 100644 --- a/src/test/java/org/matsim/freight/logistics/lspShipmentTest/DistributionShipmentBuilderTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspShipmentTest/DistributionShipmentBuilderTest.java @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Collections; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 dd1db403..48bf8b00 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/CollectionLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/CollectionLSPSchedulingTest.java @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.Random; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 e8a6f124..2bf1c997 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/CompleteLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/CompleteLSPSchedulingTest.java @@ -28,7 +28,7 @@ import java.util.Map.Entry; import java.util.Random; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 2228fbe5..b01819a8 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstHubElementTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstHubElementTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 eb5bdb58..6d8dedda 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadLSPSchedulingTest.java @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.Map.Entry; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 0236b5f2..3a3f2e34 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadResourceTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadResourceTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 ac8b523a..777aa4de 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MainRunLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MainRunLSPSchedulingTest.java @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.Map.Entry; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 18ef1675..c4329490 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.Random; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 6ca88bee..5ff47ace 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java @@ -28,7 +28,7 @@ import java.util.Map.Entry; import java.util.Random; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 230bdb6f..081929e7 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.Map.Entry; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 cc837ac8..5b25469c 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.Map.Entry; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 c7d24afe..8cd5719a 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java @@ -27,7 +27,7 @@ import java.util.Iterator; import java.util.Map.Entry; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 0db4a4cd..19886d02 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadLSPSchedulingTest.java @@ -27,7 +27,7 @@ import java.util.Iterator; import java.util.Map.Entry; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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; 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 dc7732d1..2db33026 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadResourceTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadResourceTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeEach; -import org.junit.Test; +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;