From e15c3d0cf376a252202f9e6a581a4461e688bd93 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Wed, 25 Sep 2024 10:09:42 +0200 Subject: [PATCH] Fix merge conflicts --- .../transit/model/_data/PatternTestModel.java | 13 ++++++------- .../trip/RealtimeTestEnvironmentBuilder.java | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/test/java/org/opentripplanner/transit/model/_data/PatternTestModel.java b/src/test/java/org/opentripplanner/transit/model/_data/PatternTestModel.java index c3afd0ddf61..0b149ae4ee4 100644 --- a/src/test/java/org/opentripplanner/transit/model/_data/PatternTestModel.java +++ b/src/test/java/org/opentripplanner/transit/model/_data/PatternTestModel.java @@ -29,18 +29,17 @@ public class PatternTestModel { * Creates a trip pattern that has a stop pattern, trip times and a trip with a service id. */ public static TripPattern pattern() { - var pattern = TransitModelForTest - .tripPattern("1", ROUTE_1) - .withStopPattern(STOP_PATTERN) - .build(); - var tt = ScheduledTripTimes .of() .withTrip(TRIP) .withArrivalTimes("10:00 10:05") .withDepartureTimes("10:00 10:05") .build(); - pattern.add(tt); - return pattern; + + return TransitModelForTest + .tripPattern("1", ROUTE_1) + .withStopPattern(STOP_PATTERN) + .withScheduledTimeTableBuilder(builder -> builder.addTripTimes(tt)) + .build(); } } diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironmentBuilder.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironmentBuilder.java index 7a79b27923e..88f4bf41012 100644 --- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironmentBuilder.java +++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironmentBuilder.java @@ -88,8 +88,8 @@ private Trip createTrip(TripInput tripInput) { tripInput.stops().stream().map(TripInput.StopCall::stop).toList() ) ) + .withScheduledTimeTableBuilder(builder -> builder.addTripTimes(tripTimes)) .build(); - pattern.add(tripTimes); transitModel.addTripPattern(pattern.getId(), pattern);