diff --git a/contribs/roadpricing/src/test/java/org/matsim/contrib/roadpricing/TollTravelCostCalculatorTest.java b/contribs/roadpricing/src/test/java/org/matsim/contrib/roadpricing/TollTravelCostCalculatorTest.java index d9ed7b926e9..4eecbfef4df 100644 --- a/contribs/roadpricing/src/test/java/org/matsim/contrib/roadpricing/TollTravelCostCalculatorTest.java +++ b/contribs/roadpricing/src/test/java/org/matsim/contrib/roadpricing/TollTravelCostCalculatorTest.java @@ -24,6 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import java.util.List; +import java.util.Map; import jakarta.inject.Provider; import org.junit.jupiter.api.Test; @@ -126,11 +127,11 @@ void testDisutilityResults() { void testDistanceTollRouter() { Config config = utils.createConfig(); config.routing().setNetworkRouteConsistencyCheck(RoutingConfigGroup.NetworkRouteConsistencyCheck.disable); - MutableScenario scenario = (MutableScenario) ScenarioUtils.createScenario(ConfigUtils.createConfig()); + MutableScenario scenario = (MutableScenario) ScenarioUtils.createScenario(config); RoadPricingTestUtils.createNetwork2(scenario); Network network = scenario.getNetwork(); // a basic toll where only the morning hours are tolled - RoadPricingSchemeImpl toll = RoadPricingUtils.addOrGetMutableRoadPricingScheme(ScenarioUtils.createScenario( ConfigUtils.createConfig() ) ); + RoadPricingSchemeImpl toll = RoadPricingUtils.addOrGetMutableRoadPricingScheme(ScenarioUtils.createScenario( config ) ); toll.setType(RoadPricingScheme.TOLL_TYPE_DISTANCE); toll.addLink(Id.create("5", Link.class)); toll.addLink(Id.create("11", Link.class)); @@ -308,11 +309,10 @@ void testLinkTollRouter() { void testCordonTollRouter() { Config config = utils.createConfig(); config.routing().setNetworkRouteConsistencyCheck(RoutingConfigGroup.NetworkRouteConsistencyCheck.disable); - MutableScenario scenario = (MutableScenario) ScenarioUtils.createScenario(ConfigUtils.createConfig()); + MutableScenario scenario = (MutableScenario) ScenarioUtils.createScenario(config); RoadPricingTestUtils.createNetwork2(scenario); - Network network = scenario.getNetwork(); // a basic toll where only the morning hours are tolled - RoadPricingSchemeImpl toll = RoadPricingUtils.addOrGetMutableRoadPricingScheme(ScenarioUtils.createScenario( ConfigUtils.createConfig() ) ); + RoadPricingSchemeImpl toll = RoadPricingUtils.addOrGetMutableRoadPricingScheme(ScenarioUtils.createScenario( config ) ); // toll.setType(RoadPricingScheme.TOLL_TYPE_CORDON); toll.setType(RoadPricingScheme.TOLL_TYPE_LINK); toll.addLink(Id.create("5", Link.class));