Adapt tests to new realtime code

opentripplanner · Sep 11, 2024 · 88ec563 · 88ec563
1 parent 0d7c491
commit 88ec563
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java
@@ -2,12 +2,11 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.opentripplanner.transit.model._data.TransitModelForTest.id;
 import static org.opentripplanner.updater.spi.UpdateResultAssertions.assertFailure;
-import static org.opentripplanner.updater.trip.RealtimeTestEnvironment.SERVICE_DATE;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.opentripplanner.transit.model._data.TransitModelForTest;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.network.Route;
 import org.opentripplanner.transit.model.timetable.RealTimeState;
@@ -18,12 +17,12 @@
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
 import org.opentripplanner.updater.trip.RealtimeTestEnvironment;
 import org.opentripplanner.updater.trip.TripInput;
-import uk.org.siri.siri20.EstimatedTimetableDeliveryStructure;
 
 class SiriTimetableSnapshotSourceTest implements RealtimeTestConstants {
 
   private static final TripInput TRIP_1_INPUT = TripInput
     .of(TRIP_1_ID)
+    .withRoute(ROUTE_1.copy().withOperator(OPERATOR1).build())
     .addStop(STOP_A1, "0:00:10", "0:00:11")
     .addStop(STOP_B1, "0:00:20", "0:00:21")
     .build();
@@ -54,9 +53,9 @@ void testCancelTrip() {
 
   @Test
   void testAddJourneyWithExistingRoute() {
-    var env = RealtimeTestEnvironment.siri();
+    var env = RealtimeTestEnvironment.siri().addTrip(TRIP_1_INPUT).build();
 
-    Route route = env.getTransitService().getRouteForId(env.route1Id);
+    Route route = ROUTE_1;
     int numPatternForRoute = env.getTransitService().getPatternsForRoute(route).size();
 
     String newJourneyId = "newJourney";
@@ -70,7 +69,7 @@ void testAddJourneyWithExistingRoute() {
       "SCHEDULED | C1 0:01 0:01 | D1 0:03 0:03",
       env.getScheduledTimetable(newJourneyId)
     );
-    FeedScopedId tripId = TransitModelForTest.id(newJourneyId);
+    FeedScopedId tripId = id(newJourneyId);
     TransitService transitService = env.getTransitService();
     Trip trip = transitService.getTripForId(tripId);
     assertNotNull(trip);
@@ -109,7 +108,7 @@ void testAddJourneyWithNewRoute() {
     );
     TransitService transitService = env.getTransitService();
     assertEquals(numRoutes + 1, transitService.getAllRoutes().size());
-    FeedScopedId newRouteId = TransitModelForTest.id(newRouteRef);
+    FeedScopedId newRouteId = id(newRouteRef);
     Route newRoute = transitService.getRouteForId(newRouteId);
     assertNotNull(newRoute);
     assertEquals(1, transitService.getPatternsForRoute(newRoute).size());
@@ -495,8 +494,7 @@ private static SiriEtBuilder createValidAddedJourney(RealtimeTestEnvironment env
       .withOperatorRef(OPERATOR_1_ID)
       .withLineRef(ROUTE_1_ID)
       .withRecordedCalls(builder -> builder.call(STOP_C1).departAimedActual("00:01", "00:02"))
-      .withEstimatedCalls(builder -> builder.call(STOP_D1).arriveAimedExpected("00:03", "00:04")
-      );
+      .withEstimatedCalls(builder -> builder.call(STOP_D1).arriveAimedExpected("00:03", "00:04"));
   }
 
   private static SiriEtBuilder updatedJourneyBuilder(RealtimeTestEnvironment env) {

diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestConstants.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestConstants.java
@@ -1,10 +1,13 @@
 package org.opentripplanner.updater.trip;
 
+import static org.opentripplanner.transit.model._data.TransitModelForTest.id;
+
 import java.time.LocalDate;
 import java.time.ZoneId;
 import org.opentripplanner.transit.model._data.TransitModelForTest;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.network.Route;
+import org.opentripplanner.transit.model.organization.Operator;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.model.site.Station;
 import org.opentripplanner.transit.service.StopModel;
@@ -18,6 +21,7 @@ public interface RealtimeTestConstants {
   String TRIP_1_ID = "TestTrip1";
   String TRIP_2_ID = "TestTrip2";
   String OPERATOR_1_ID = "TestOperator1";
+  Operator OPERATOR1 = Operator.of(id(OPERATOR_1_ID)).withName(OPERATOR_1_ID).build();
   String ROUTE_1_ID = "TestRoute1";
 
   TransitModelForTest TEST_MODEL = TransitModelForTest.of();

diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
@@ -18,11 +18,6 @@
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.network.TripPattern;
 import org.opentripplanner.transit.model.organization.Operator;
-import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.transit.model.site.Station;
-import org.opentripplanner.transit.model.site.StopLocation;
-import org.opentripplanner.transit.model.timetable.Trip;
-import org.opentripplanner.transit.model.timetable.TripOnServiceDate;
 import org.opentripplanner.transit.model.timetable.TripTimes;
 import org.opentripplanner.transit.model.timetable.TripTimesStringBuilder;
 import org.opentripplanner.transit.service.DefaultTransitService;
@@ -75,7 +70,10 @@ public static RealtimeTestEnvironmentBuilder gtfs() {
   RealtimeTestEnvironment(SourceType sourceType, TransitModel transitModel) {
     Objects.requireNonNull(sourceType);
     this.transitModel = transitModel;
-    operator1 = Operator.of(operator1Id).withName("Operator 1").build();
+    var operator1 = Operator
+      .of(id(OPERATOR_1_ID))
+      .withName("Name of %s".formatted(OPERATOR_1_ID))
+      .build();
     transitModel.getOperators().add(operator1);
 
     this.transitModel.index();

diff --git a/src/test/java/org/opentripplanner/updater/trip/TripInput.java b/src/test/java/org/opentripplanner/updater/trip/TripInput.java
@@ -20,7 +20,7 @@ public static class TripInputBuilder implements RealtimeTestConstants {
     private final String id;
     private final List<StopCall> stops = new ArrayList<>();
     // can be made configurable if needed
-    private final Route route = ROUTE_1;
+    private Route route = ROUTE_1;
 
     TripInputBuilder(String id) {
       this.id = id;
@@ -36,6 +36,11 @@ public TripInputBuilder addStop(RegularStop stopId, String arrivalTime, String d
     public TripInput build() {
       return new TripInput(id, route, stops);
     }
+
+    public TripInputBuilder withRoute(Route route) {
+      this.route = route;
+      return this;
+    }
   }
 
   record StopCall(RegularStop stop, int arrivalTime, int departureTime) {}