diff --git a/contribs/vsp/src/test/java/org/matsim/contrib/vsp/pt/fare/ChainedPtFareHandlerTest.java b/contribs/vsp/src/test/java/org/matsim/contrib/vsp/pt/fare/ChainedPtFareHandlerTest.java index f3f7836a943..6b9edf0886c 100644 --- a/contribs/vsp/src/test/java/org/matsim/contrib/vsp/pt/fare/ChainedPtFareHandlerTest.java +++ b/contribs/vsp/src/test/java/org/matsim/contrib/vsp/pt/fare/ChainedPtFareHandlerTest.java @@ -70,12 +70,9 @@ void testChainedPtFareHandler() { distanceBased2.setTransactionPartner(DISTANCE_BASED_TRANSACTION_PARTNER); distanceBased2.setMinFare(7.0); - PtFareParams fareZoneBased1; - ptFareConfigGroup.addPtFareParameterSet(fareZoneBased1); - ptFareConfigGroup.addPtFareParameterSet(fareZoneBased); - ptFareConfigGroup.addParameterSet(distanceBased); - ptFareConfigGroup.addParameterSet(distanceBased2); + ptFareConfigGroup.addPtFareParameterSet(distanceBased); + ptFareConfigGroup.addPtFareParameterSet(distanceBased2); ptFareConfigGroup.setUpperBoundFactor(2.0); diff --git a/contribs/vsp/src/test/java/org/matsim/contrib/vsp/pt/fare/PtFareConfigGroupTest.java b/contribs/vsp/src/test/java/org/matsim/contrib/vsp/pt/fare/PtFareConfigGroupTest.java index ed32e9ac859..a7c2f76fe85 100644 --- a/contribs/vsp/src/test/java/org/matsim/contrib/vsp/pt/fare/PtFareConfigGroupTest.java +++ b/contribs/vsp/src/test/java/org/matsim/contrib/vsp/pt/fare/PtFareConfigGroupTest.java @@ -19,11 +19,11 @@ void testSamePriority_throws() { PtFareConfigGroup ptFareConfigGroup = ConfigUtils.addOrGetModule(config, PtFareConfigGroup.class); FareZoneBasedPtFareParams fareZoneBased = new FareZoneBasedPtFareParams(); fareZoneBased.setOrder(5); - ptFareConfigGroup.addParameterSet(fareZoneBased); + ptFareConfigGroup.addPtFareParameterSet(fareZoneBased); DistanceBasedPtFareParams distanceBased = new DistanceBasedPtFareParams(); distanceBased.setOrder(5); - ptFareConfigGroup.addParameterSet(distanceBased); + ptFareConfigGroup.addPtFareParameterSet(distanceBased); Assertions.assertThrows(IllegalArgumentException.class, () -> ptFareConfigGroup.checkConsistency(config)); } @@ -34,11 +34,11 @@ void test_ok() { PtFareConfigGroup ptFareConfigGroup = ConfigUtils.addOrGetModule(config, PtFareConfigGroup.class); FareZoneBasedPtFareParams fareZoneBased = new FareZoneBasedPtFareParams(); fareZoneBased.setOrder(5); - ptFareConfigGroup.addParameterSet(fareZoneBased); + ptFareConfigGroup.addPtFareParameterSet(fareZoneBased); DistanceBasedPtFareParams distanceBased = new DistanceBasedPtFareParams(); distanceBased.setOrder(10); - ptFareConfigGroup.addParameterSet(distanceBased); + ptFareConfigGroup.addPtFareParameterSet(distanceBased); ptFareConfigGroup.checkConsistency(config); } diff --git a/contribs/vsp/src/test/java/org/matsim/contrib/vsp/pt/fare/PtTripFareEstimatorTest.java b/contribs/vsp/src/test/java/org/matsim/contrib/vsp/pt/fare/PtTripFareEstimatorTest.java index b74f341e4de..7c7126b66f9 100644 --- a/contribs/vsp/src/test/java/org/matsim/contrib/vsp/pt/fare/PtTripFareEstimatorTest.java +++ b/contribs/vsp/src/test/java/org/matsim/contrib/vsp/pt/fare/PtTripFareEstimatorTest.java @@ -76,7 +76,7 @@ public void setUp() throws Exception { distanceClassLongFareParams.setFareIntercept(1.0); distanceClassLongFareParams.setFareSlope(0.01); - fare.addParameterSet(distanceFare); + fare.addPtFareParameterSet(distanceFare); controler = MATSimApplication.prepare(TestScenario.class, config); injector = controler.getInjector();