Add module test for SIRI routable pickup/dropoff

Author: vpaturet

application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/update/BoardingActivityWithCoordinateWithDriverTest.java

@@ -0,0 +1,83 @@
+package org.opentripplanner.updater.trip.siri.moduletests.update;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.opentripplanner.updater.spi.UpdateResultAssertions.assertSuccess;
+
+import org.junit.jupiter.api.Test;
+import org.opentripplanner.model.PickDrop;
+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.updater.trip.RealtimeTestConstants;
+import org.opentripplanner.updater.trip.SiriTestHelper;
+import uk.org.siri.siri21.ArrivalBoardingActivityEnumeration;
+import uk.org.siri.siri21.DepartureBoardingActivityEnumeration;
+
+class BoardingActivityWithCoordinateWithDriverTest implements RealtimeTestConstants {
+
+  private final TransitTestEnvironmentBuilder ENV_BUILDER = TransitTestEnvironment.of();
+  private final RegularStop STOP_A = ENV_BUILDER.stop(STOP_A_ID);
+  private final RegularStop STOP_B = ENV_BUILDER.stop(STOP_B_ID);
+  private final RegularStop STOP_C = ENV_BUILDER.stop(STOP_C_ID);
+
+  /**
+   * When a stop has COORDINATE_WITH_DRIVER pickup/dropoff and SIRI sends
+   * BOARDING/ALIGHTING boarding activities, the trip should stay UPDATED
+   * (not MODIFIED), because both are routable — SIRI boarding activities
+   * are less specific than the planned PickDrop value.
+   */
+  @Test
+  void boardingActivityShouldNotOverrideCoordinateWithDriver() {
+    var tripInput = TripInput.of(TRIP_1_ID)
+      .withWithTripOnServiceDate(TRIP_1_ID)
+      .addStop(STOP_A, "0:00:10", "0:00:11")
+      .addStop(
+        STOP_B,
+        "0:00:20",
+        "0:00:21",
+        PickDrop.COORDINATE_WITH_DRIVER,
+        PickDrop.COORDINATE_WITH_DRIVER
+      )
+      .addStop(STOP_C, "0:00:30", "0:00:31");
+
+    var env = ENV_BUILDER.addTrip(tripInput).build();
+    var siri = SiriTestHelper.of(env);
+
+    // Verify scheduled pattern has COORDINATE_WITH_DRIVER at stop B
+    var scheduledPattern = env.tripData(TRIP_1_ID).scheduledTripPattern();
+    assertEquals(PickDrop.COORDINATE_WITH_DRIVER, scheduledPattern.getBoardType(1));
+    assertEquals(PickDrop.COORDINATE_WITH_DRIVER, scheduledPattern.getAlightType(1));
+
+    var updates = siri
+      .etBuilder()
+      .withDatedVehicleJourneyRef(TRIP_1_ID)
+      .withEstimatedCalls(builder ->
+        builder
+          .call(STOP_A)
+          .departAimedExpected("00:00:11", "00:00:11")
+          .call(STOP_B)
+          .arriveAimedExpected("00:00:20", "00:00:20")
+          .withArrivalBoardingActivity(ArrivalBoardingActivityEnumeration.ALIGHTING)
+          .departAimedExpected("00:00:21", "00:00:21")
+          .withDepartureBoardingActivity(DepartureBoardingActivityEnumeration.BOARDING)
+          .call(STOP_C)
+          .arriveAimedExpected("00:00:30", "00:00:30")
+      )
+      .buildEstimatedTimetableDeliveries();
+
+    var result = siri.applyEstimatedTimetable(updates);
+    assertSuccess(result);
+
+    // Trip should stay UPDATED — BOARDING/ALIGHTING should not override COORDINATE_WITH_DRIVER
+    assertEquals(
+      "UPDATED | A 0:00:11 0:00:11 | B 0:00:20 0:00:21 | C 0:00:30 0:00:30",
+      env.tripData(TRIP_1_ID).showTimetable()
+    );
+
+    // Verify the pattern's pickup/dropoff at stop B is still COORDINATE_WITH_DRIVER
+    var realtimePattern = env.tripData(TRIP_1_ID).tripPattern();
+    assertEquals(PickDrop.COORDINATE_WITH_DRIVER, realtimePattern.getBoardType(1));
+    assertEquals(PickDrop.COORDINATE_WITH_DRIVER, realtimePattern.getAlightType(1));
+  }
+}