Repurpose the RealtimeTestEnvironment into a TransitTestEnvironment

application/src/ext-test/java/org/opentripplanner/ext/trias/service/OjpServiceTest.java

@@ -6,8 +6,6 @@
 import static org.opentripplanner.transit.model._data.TimetableRepositoryForTest.id;
 
 import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalTime;
 import java.util.List;
 import java.util.Set;
 import org.junit.jupiter.api.Test;
@@ -21,21 +19,24 @@
 import org.opentripplanner.routing.graphfinder.PlaceAtDistance;
 import org.opentripplanner.routing.graphfinder.PlaceType;
 import org.opentripplanner.street.search.state.TestStateBuilder;
+import org.opentripplanner.transit.model._data.TransitTestEnvironment;
+import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model._data.TripInput;
 import org.opentripplanner.transit.model.basic.TransitMode;
 import org.opentripplanner.transit.model.framework.EntityNotFoundException;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.service.ArrivalDeparture;
 import org.opentripplanner.transit.service.TransitService;
-import org.opentripplanner.updater.trip.RealtimeTestConstants;
-import org.opentripplanner.updater.trip.RealtimeTestEnvironment;
-import org.opentripplanner.updater.trip.RealtimeTestEnvironmentBuilder;
-import org.opentripplanner.updater.trip.TripInput;
-import org.opentripplanner.utils.time.TimeUtils;
 
-class OjpServiceTest implements RealtimeTestConstants {
+class OjpServiceTest {
 
-  private final RealtimeTestEnvironmentBuilder envBuilder = RealtimeTestEnvironment.of();
+  private final TransitTestEnvironmentBuilder envBuilder = TransitTestEnvironment.of();
+
+  private static final String STOP_A_ID = "A";
+  private static final String STOP_B_ID = "B";
+  private static final String STOP_C_ID = "C";
+  private static final String STATION_OMEGA_ID = "OMEGA";
 
   private final RegularStop STOP_A = envBuilder.stopAtStation(STOP_A_ID, STATION_OMEGA_ID);
   private final RegularStop STOP_B = envBuilder.stop(STOP_B_ID);
@@ -47,11 +48,9 @@ class OjpServiceTest implements RealtimeTestConstants {
     .addStop(STOP_C, "12:20", "12:21")
     .build();
 
-  public static final OjpService.StopEventRequestParams PARAMS = params(100);
-
-  private static OjpService.StopEventRequestParams params(int departures) {
+  private OjpService.StopEventRequestParams params(TransitTestEnvironment env, int departures) {
     return new OjpService.StopEventRequestParams(
-      instant("12:00"),
+      env.localTimeParser().instant("12:00"),
       ArrivalDeparture.BOTH,
       Duration.ofHours(2),
       1000,
@@ -72,20 +71,20 @@ public static List<FeedScopedId> stopPointRefCases() {
   @ParameterizedTest
   @MethodSource("stopPointRefCases")
   void stopPointRef(FeedScopedId ref) {
-    var env = envBuilder.addTrip(TRIP_INPUT).build();
+    var env = envBuilder.withTrip(TRIP_INPUT).build();
     var service = new OjpService(env.getTransitService(), new DirectGraphFinder(e -> List.of()));
-    var result = service.findCallsAtStop(ref, PARAMS);
+    var result = service.findCallsAtStop(ref, params(env, 100));
     assertThat(result).hasSize(1);
     var stopId = result.getFirst().tripTimeOnDate().getStop().getId();
     assertEquals(STOP_A.getId(), stopId);
   }
 
   @Test
   void notFound() {
-    var env = envBuilder.addTrip(TRIP_INPUT).build();
+    var env = envBuilder.withTrip(TRIP_INPUT).build();
     var service = new OjpService(env.getTransitService(), new DirectGraphFinder(e -> List.of()));
     assertThrows(EntityNotFoundException.class, () ->
-      service.findCallsAtStop(id("unknown"), PARAMS)
+      service.findCallsAtStop(id("unknown"), params(env, 100))
     );
   }
 
@@ -117,25 +116,20 @@ public List<PlaceAtDistance> findClosestPlaces(
         return List.of();
       }
     };
-    var env = envBuilder.addTrip(TRIP_INPUT).build();
+    var env = envBuilder.withTrip(TRIP_INPUT).build();
     var service = new OjpService(env.getTransitService(), finder);
-    var result = service.findCallsAtStop(WgsCoordinate.GREENWICH, PARAMS);
+    var result = service.findCallsAtStop(WgsCoordinate.GREENWICH, params(env, 100));
     assertThat(result).hasSize(1);
     var stopId = result.getFirst().tripTimeOnDate().getStop().getId();
     assertEquals(STOP_A.getId(), stopId);
   }
 
   @Test
   void tooManyDepartures() {
-    var env = envBuilder.addTrip(TRIP_INPUT).build();
+    var env = envBuilder.withTrip(TRIP_INPUT).build();
     var service = new OjpService(env.getTransitService(), new DirectGraphFinder(e -> List.of()));
     assertThrows(IllegalArgumentException.class, () ->
-      service.findCallsAtStop(STOP_A.getId(), params(101))
+      service.findCallsAtStop(STOP_A.getId(), params(env, 101))
     );
   }
-
-  private static Instant instant(String time) {
-    var localTime = LocalTime.ofSecondOfDay(TimeUtils.time(time));
-    return localTime.atDate(SERVICE_DATE).atZone(TIME_ZONE).toInstant();
-  }
 }

application/src/test/java/org/opentripplanner/DateTimeHelper.java → application/src/test/java/org/opentripplanner/LocalTimeParser.java

@@ -1,16 +1,23 @@
 package org.opentripplanner;
 
+import java.time.Instant;
 import java.time.LocalDate;
+import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import org.opentripplanner.utils.time.DateUtils;
+import org.opentripplanner.utils.time.TimeUtils;
 
-public class DateTimeHelper {
+/**
+ * A helper class used in tests for parsing local time strings into absolute times given a date and
+ * a timezone.
+ */
+public class LocalTimeParser {
 
   private final ZoneId zone;
   private final LocalDate defaultDate;
 
-  public DateTimeHelper(ZoneId zone, LocalDate defaultDate) {
+  public LocalTimeParser(ZoneId zone, LocalDate defaultDate) {
     this.zone = zone;
     this.defaultDate = defaultDate;
   }
@@ -27,4 +34,13 @@ public ZonedDateTime zonedDateTime(String timeString) {
     }
     return defaultDate.atTime(time).atZone(zone);
   }
+
+  /**
+   * Takes local time on different formats like "12:34:00" or "12:34" and returns the corresponding
+   * instant at the given date on the specific timezone.
+   */
+  public Instant instant(String timeString) {
+    var localTime = LocalTime.ofSecondOfDay(TimeUtils.time(timeString));
+    return localTime.atDate(defaultDate).atZone(zone).toInstant();
+  }
 }

application/src/test/java/org/opentripplanner/apis/gtfs/datafetchers/StopCallImplTest.java

@@ -3,54 +3,59 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.Instant;
+import java.time.LocalDate;
 import java.time.OffsetDateTime;
+import java.time.ZoneId;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.apis.gtfs.model.CallSchedule;
 import org.opentripplanner.apis.gtfs.model.CallScheduledTime.ArrivalDepartureTime;
 import org.opentripplanner.apis.gtfs.model.CallScheduledTime.TimeWindow;
 import org.opentripplanner.framework.application.OTPFeature;
 import org.opentripplanner.model.TripTimeOnDate;
+import org.opentripplanner.transit.model._data.FlexTripInput;
+import org.opentripplanner.transit.model._data.TransitTestEnvironment;
+import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model._data.TripInput;
 import org.opentripplanner.transit.model.site.AreaStop;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.FlexTripInput;
-import org.opentripplanner.updater.trip.RealtimeTestConstants;
-import org.opentripplanner.updater.trip.RealtimeTestEnvironment;
-import org.opentripplanner.updater.trip.RealtimeTestEnvironmentBuilder;
-import org.opentripplanner.updater.trip.TripInput;
 import org.opentripplanner.utils.time.ServiceDateUtils;
 
-class StopCallImplTest implements RealtimeTestConstants {
+class StopCallImplTest {
 
+  private static final LocalDate SERVICE_DATE = LocalDate.of(2023, 6, 3);
+  private static final ZoneId TIME_ZONE = ZoneId.of("Europe/Paris");
   private static final Instant MIDNIGHT = ServiceDateUtils.asStartOfService(
     SERVICE_DATE,
     TIME_ZONE
   ).toInstant();
-  private static final OffsetDateTime NOON = OffsetDateTime.parse("2024-05-08T12:00+02:00");
+
+  private static final OffsetDateTime NOON = OffsetDateTime.parse("2023-06-03T12:00+02:00");
   private static final OffsetDateTime TEN_AM = NOON.minusHours(2);
-  private final RealtimeTestEnvironmentBuilder envBuilder = RealtimeTestEnvironment.of();
-  private final RegularStop STOP_A = envBuilder.stop(STOP_A_ID);
-  private final RegularStop STOP_B = envBuilder.stop(STOP_B_ID);
-  private final RegularStop STOP_C = envBuilder.stop(STOP_C_ID);
-  private final AreaStop STOP_D = envBuilder.areaStop(STOP_D_ID);
-  private final AreaStop STOP_E = envBuilder.areaStop(STOP_E_ID);
+  private final TransitTestEnvironmentBuilder envBuilder = TransitTestEnvironment.of(SERVICE_DATE);
+  private final RegularStop STOP_A = envBuilder.stop("A");
+  private final RegularStop STOP_B = envBuilder.stop("B");
+  private final RegularStop STOP_C = envBuilder.stop("C");
+  private final AreaStop STOP_D = envBuilder.areaStop("D");
+  private final AreaStop STOP_E = envBuilder.areaStop("E");
 
-  private final TripInput TRIP_INPUT = TripInput.of(TRIP_1_ID)
+  private final TripInput TRIP_INPUT = TripInput.of("Trip1")
     .addStop(STOP_A, "12:00:00", "12:00:00")
     .addStop(STOP_B, "12:30:00", "12:30:00")
     .addStop(STOP_C, "13:00:00", "13:00:00")
     .build();
 
-  private final FlexTripInput FLEX_TRIP_INPUT = FlexTripInput.of(TRIP_1_ID)
+  private final FlexTripInput FLEX_TRIP_INPUT = FlexTripInput.of("FlexTrip1")
     .addStop(STOP_D, "10:00", "10:30")
     .addStop(STOP_E, "11:00", "11:30")
     .build();
 
   @Test
   void fixedTrip() throws Exception {
-    var realtimeEnv = envBuilder.addTrip(TRIP_INPUT).build();
-    var tripTimes = realtimeEnv.getTripTimesForTrip(TRIP_1_ID);
-    var pattern = realtimeEnv.getPatternForTrip(TRIP_1_ID);
+    var realtimeEnv = envBuilder.withTrip(TRIP_INPUT).build();
+    var tripData = realtimeEnv.tripData("Trip1");
+    var tripTimes = tripData.tripTimes();
+    var pattern = tripData.tripPattern();
 
     var call = new TripTimeOnDate(tripTimes, 0, pattern, SERVICE_DATE, MIDNIGHT);
 
@@ -68,9 +73,10 @@ void fixedTrip() throws Exception {
   @Test
   void flexTrip() {
     OTPFeature.FlexRouting.testOn(() -> {
-      var realtimeEnv = envBuilder.addFlexTrip(FLEX_TRIP_INPUT).build();
-      var tripTimes = realtimeEnv.getTripTimesForTrip(TRIP_1_ID);
-      var pattern = realtimeEnv.getPatternForTrip(TRIP_1_ID);
+      var realtimeEnv = envBuilder.withFlexTrip(FLEX_TRIP_INPUT).build();
+      var tripData = realtimeEnv.tripData("FlexTrip1");
+      var tripTimes = tripData.tripTimes();
+      var pattern = tripData.tripPattern();
 
       var call = new TripTimeOnDate(tripTimes, 0, pattern, SERVICE_DATE, MIDNIGHT);
 

application/src/test/java/org/opentripplanner/apis/gtfs/service/ApiTransitServiceTest.java

@@ -1,7 +1,6 @@
 package org.opentripplanner.apis.gtfs.service;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.opentripplanner.transit.model._data.TimetableRepositoryForTest.id;
 import static org.opentripplanner.updater.spi.UpdateResultAssertions.assertSuccess;
@@ -10,20 +9,22 @@
 import com.google.transit.realtime.GtfsRealtime;
 import java.time.Duration;
 import java.time.Instant;
+import java.time.LocalDate;
 import java.time.LocalTime;
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.model.TripTimeOnDate;
 import org.opentripplanner.model.plan.leg.ScheduledTransitLegBuilder;
 import org.opentripplanner.model.plan.leg.StreetLeg;
 import org.opentripplanner.street.search.TraverseMode;
+import org.opentripplanner.transit.model._data.TransitTestEnvironment;
+import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model._data.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.service.ArrivalDeparture;
-import org.opentripplanner.updater.trip.RealtimeTestConstants;
-import org.opentripplanner.updater.trip.RealtimeTestEnvironment;
-import org.opentripplanner.updater.trip.RealtimeTestEnvironmentBuilder;
-import org.opentripplanner.updater.trip.TripInput;
+import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.TripUpdateBuilder;
 
 /**
@@ -34,13 +35,18 @@
  * <p>
  * The core problem is that OTP doesn't have a clear internal API for applying real-time updates.
  */
-class ApiTransitServiceTest implements RealtimeTestConstants {
+class ApiTransitServiceTest {
 
+  private static final LocalDate SERVICE_DATE = LocalDate.of(2024, 5, 8);
+  private static final ZoneId TIME_ZONE = ZoneId.of("Europe/Paris");
   private static final ZonedDateTime ANY_TIME = ZonedDateTime.parse("2022-01-01T12:00:00+00:00");
-  private final RealtimeTestEnvironmentBuilder envBuilder = RealtimeTestEnvironment.of();
-  private final RegularStop STOP_A = envBuilder.stop(STOP_A_ID);
-  private final RegularStop STOP_B = envBuilder.stop(STOP_B_ID);
-  private final RegularStop STOP_C = envBuilder.stop(STOP_C_ID);
+  private static final String TRIP_1_ID = "TestTrip1";
+  private static final String TRIP_2_ID = "TestTrip2";
+
+  private final TransitTestEnvironmentBuilder envBuilder = TransitTestEnvironment.of(SERVICE_DATE);
+  private final RegularStop STOP_A = envBuilder.stop("A");
+  private final RegularStop STOP_B = envBuilder.stop("B");
+  private final RegularStop STOP_C = envBuilder.stop("C");
 
   private final TripInput TRIP1_INPUT = TripInput.of(TRIP_1_ID)
     .addStop(STOP_A, "12:00:00", "12:00:00")
@@ -60,10 +66,10 @@ class ApiTransitServiceTest implements RealtimeTestConstants {
 
   @Test
   void justScheduledTrips() {
-    var env = envBuilder.addTrip(TRIP1_INPUT).addTrip(TRIP2_INPUT).build();
+    var env = envBuilder.withTrip(TRIP1_INPUT).withTrip(TRIP2_INPUT).build();
     var service = new ApiTransitService(env.getTransitService());
 
-    var pattern = env.getPatternForTrip(TRIP_1_ID);
+    var pattern = env.tripData(TRIP_1_ID).tripPattern();
     var calls = service.getTripTimeOnDatesForPatternAtStopIncludingTripsWithSkippedStops(
       STOP_A,
       pattern,
@@ -85,9 +91,14 @@ void justScheduledTrips() {
    */
   @Test
   void skipStopInMultipleTripsInPattern() {
-    var env = envBuilder.addTrip(TRIP1_INPUT).addTrip(TRIP2_INPUT).build();
-    var res = env.applyTripUpdates(
-      List.of(skipSecondStop(TRIP_1_ID), skipSecondStop(TRIP_2_ID)),
+    var env = envBuilder.withTrip(TRIP1_INPUT).withTrip(TRIP2_INPUT).build();
+    var rt = GtfsRtTestHelper.of(env);
+
+    var res = rt.applyTripUpdates(
+      List.of(
+        skipSecondStop(rt.tripUpdateScheduled(TRIP_1_ID)),
+        skipSecondStop(rt.tripUpdateScheduled(TRIP_2_ID))
+      ),
       FULL_DATASET
     );
     assertSuccess(res);
@@ -111,37 +122,38 @@ void skipStopInMultipleTripsInPattern() {
 
   @Test
   void transitLegCalls() {
-    var env = envBuilder.addTrip(TRIP1_INPUT).build();
+    var env = envBuilder.withTrip(TRIP1_INPUT).build();
     var service = new ApiTransitService(env.getTransitService());
 
-    var tripTimes = env.getTripTimesForTrip(TRIP_1_ID);
-    var pattern = env.getPatternForTrip(TRIP_1_ID);
+    var tripData = env.tripData(TRIP_1_ID);
+    var tripTimes = tripData.tripTimes();
+    var pattern = tripData.tripPattern();
 
     var leg = new ScheduledTransitLegBuilder()
       .withTripPattern(pattern)
       .withTripTimes(tripTimes)
       .withStartTime(ANY_TIME)
       .withEndTime(ANY_TIME)
       .withServiceDate(SERVICE_DATE)
-      .withZoneId(TIME_ZONE)
+      .withZoneId(env.timeZone())
       .withDistanceMeters(1000)
       .withBoardStopIndexInPattern(0)
       .withAlightStopIndexInPattern(2)
       .build();
     var calls = service.findStopCalls(leg);
     assertEquals(
       "[" +
-      "TripTimeOnDate{trip: Trip{F:TestTrip1 Rroute-1}, stopPosition: 0, arrival: 12:00, departure: 12:00, serviceDate: 2024-05-08}, " +
-      "TripTimeOnDate{trip: Trip{F:TestTrip1 Rroute-1}, stopPosition: 1, arrival: 12:30, departure: 12:30, serviceDate: 2024-05-08}, " +
-      "TripTimeOnDate{trip: Trip{F:TestTrip1 Rroute-1}, stopPosition: 2, arrival: 13:00, departure: 13:00, serviceDate: 2024-05-08}" +
+      "TripTimeOnDate{trip: Trip{F:TestTrip1 RRoute1}, stopPosition: 0, arrival: 12:00, departure: 12:00, serviceDate: 2024-05-08}, " +
+      "TripTimeOnDate{trip: Trip{F:TestTrip1 RRoute1}, stopPosition: 1, arrival: 12:30, departure: 12:30, serviceDate: 2024-05-08}, " +
+      "TripTimeOnDate{trip: Trip{F:TestTrip1 RRoute1}, stopPosition: 2, arrival: 13:00, departure: 13:00, serviceDate: 2024-05-08}" +
       "]",
       calls.toString()
     );
   }
 
   @Test
   void streetLegCalls() {
-    var env = envBuilder.addTrip(TRIP1_INPUT).build();
+    var env = envBuilder.withTrip(TRIP1_INPUT).build();
     var service = new ApiTransitService(env.getTransitService());
 
     var leg = StreetLeg.of()
@@ -154,9 +166,7 @@ void streetLegCalls() {
     assertThat(calls).isEmpty();
   }
 
-  private static GtfsRealtime.TripUpdate skipSecondStop(String tripId) {
-    return new TripUpdateBuilder(tripId, SERVICE_DATE, SCHEDULED, TIME_ZONE)
-      .addSkippedStop(1)
-      .build();
+  private static GtfsRealtime.TripUpdate skipSecondStop(TripUpdateBuilder builder) {
+    return builder.addSkippedStop(1).build();
   }
 }