Fix merge conflicts

entur · Sep 25, 2024 · e15c3d0 · e15c3d0
1 parent 7ed6c52
commit e15c3d0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 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
@@ -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
@@ -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);