add test for #6391

Author: miklcct

application/src/test/java/org/opentripplanner/updater/trip/TripUpdateBuilder.java

@@ -65,6 +65,30 @@ public TripUpdateBuilder addDelayedStopTime(int stopSequence, int delay) {
     return addStopTime(null, -1, stopSequence, delay, delay, DEFAULT_SCHEDULE_RELATIONSHIP, null);
   }
 
+  public TripUpdateBuilder addDelayedArrivalStopTime(int stopSequence, int arrivalDelay) {
+    return addStopTime(
+      null,
+      -1,
+      stopSequence,
+      arrivalDelay,
+      NO_DELAY,
+      DEFAULT_SCHEDULE_RELATIONSHIP,
+      null
+    );
+  }
+
+  public TripUpdateBuilder addDelayedDepartureStopTime(int stopSequence, int departureDelay) {
+    return addStopTime(
+      null,
+      -1,
+      stopSequence,
+      NO_DELAY,
+      departureDelay,
+      DEFAULT_SCHEDULE_RELATIONSHIP,
+      null
+    );
+  }
+
   public TripUpdateBuilder addDelayedStopTime(
     int stopSequence,
     int arrivalDelay,
@@ -166,6 +190,14 @@ private TripUpdateBuilder addStopTime(
       departureBuilder.setDelay(departureDelay);
     }
 
+    if (!arrivalBuilder.hasTime() && !arrivalBuilder.hasDelay()) {
+      stopTimeUpdateBuilder.clearArrival();
+    }
+
+    if (!departureBuilder.hasTime() && !departureBuilder.hasDelay()) {
+      stopTimeUpdateBuilder.clearDeparture();
+    }
+
     return this;
   }
 

application/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java

@@ -74,16 +74,18 @@ void singleStopDelay() {
   void complexDelay() {
     var tripInput = TripInput
       .of(TRIP_2_ID)
-      .addStop(STOP_A1, "0:01:00", "0:01:01")
-      .addStop(STOP_B1, "0:01:10", "0:01:11")
-      .addStop(STOP_C1, "0:01:20", "0:01:21")
+      .addStop(STOP_A1, "0:00:00", "0:00:00")
+      .addStop(STOP_B1, "0:05:00", "0:10:00") // 5-minute dwell
+      .addStop(STOP_C1, "0:15:00", "0:16:00")
+      .addStop(STOP_D1, "0:20:00", "0:20:00")
       .build();
     var env = RealtimeTestEnvironment.gtfs().addTrip(tripInput).build();
 
     var tripUpdate = new TripUpdateBuilder(TRIP_2_ID, SERVICE_DATE, SCHEDULED, TIME_ZONE)
       .addDelayedStopTime(0, 0)
-      .addDelayedStopTime(1, 60, 80)
-      .addDelayedStopTime(2, 90, 90)
+      .addDelayedArrivalStopTime(1, 900) // 00:20 arr
+      .addDelayedStopTime(2, 540) // 00:24 arr / 00:25 dep
+      .addDelayedDepartureStopTime(3, 420) // 00:27 dep
       .build();
 
     assertSuccess(env.applyTripUpdate(tripUpdate));
@@ -119,11 +121,11 @@ void complexDelay() {
     );
 
     assertEquals(
-      "SCHEDULED | A1 0:01 0:01:01 | B1 0:01:10 0:01:11 | C1 0:01:20 0:01:21",
+      "SCHEDULED | A1 0:00 0:00 | B1 0:05 0:10 | C1 0:15 0:16 | D1 0:20 0:20",
       env.getScheduledTimetable(TRIP_2_ID)
     );
     assertEquals(
-      "UPDATED | A1 0:01 0:01:01 | B1 0:02:10 0:02:31 | C1 0:02:50 0:02:51",
+      "UPDATED | A1 0:00 0:00 | B1 0:20 0:20 | C1 0:24 0:25 | D1 0:27 0:27",
       env.getRealtimeTimetable(TRIP_2_ID)
     );
   }