Resolve merge conflicts

Author: vpaturet

application/src/test/java/org/opentripplanner/updater/trip/siri/SiriEtBuilder.java

@@ -174,11 +174,6 @@ public SiriEtBuilder withOccupancy(OccupancyEnumeration occupancy) {
     return this;
   }
 
-  public SiriEtBuilder withPredictionInaccurate(boolean predictionInaccurate) {
-    evj.setPredictionInaccurate(predictionInaccurate);
-    return this;
-  }
-
   public SiriEtBuilder withVehicleJourneyRef(String id) {
     var ref = new VehicleJourneyRef();
     ref.setValue(id);

application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/cancellation/CancelledRecordedCallTest.java

@@ -11,11 +11,6 @@
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
 import org.opentripplanner.updater.trip.SiriTestHelper;
 
-/**
- * When a RecordedCall has both cancellation=true and an actual departure time, the cancelled
- * state should take precedence over the recorded state. This matches the legacy SIRI adapter
- * behavior where [C] is shown instead of [R].
- */
 class CancelledRecordedCallTest implements RealtimeTestConstants {
 
   private final TransitTestEnvironmentBuilder ENV_BUILDER = TransitTestEnvironment.of();
@@ -28,11 +23,11 @@ class CancelledRecordedCallTest implements RealtimeTestConstants {
     .addStop(STOP_B, "0:01:10", "0:01:11");
 
   /**
-   * A RecordedCall with both cancellation=true and an actual departure time should show [C]
-   * (cancelled), not [R] (recorded). Cancelled takes precedence.
+   * A RecordedCall with both cancellation=true and an actual departure time should have both status
+   * [C,R]
    */
   @Test
-  void cancelledRecordedCallShouldShowCancelled() {
+  void cancelledRecordedCall() {
     var env = ENV_BUILDER.addTrip(TRIP_INPUT).build();
     var siri = SiriTestHelper.of(env);
 
@@ -51,7 +46,7 @@ void cancelledRecordedCallShouldShowCancelled() {
 
     assertSuccess(result);
     assertEquals(
-      "MODIFIED | A [C] 0:01:01 0:01:01 | B 0:01:10 0:01:10",
+      "MODIFIED | A [C,R] 0:01:01 0:01:01 | B 0:01:10 0:01:10",
       env.tripData(TRIP_1_ID).showTimetable()
     );
   }

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

@@ -145,50 +145,4 @@ void testChangeQuayThenUpdateTimesKeepsQuayChange() {
     );
     assertThat(env.raptorData().summarizePatterns()).containsExactly("F:Route1::001:RT[MODIFIED]");
   }
-
-  /**
-   * Change quay (B to C) producing a MODIFIED pattern, then send a second update referencing the
-   * original stop B, reverting the pattern back to the scheduled one.
-   */
-  @Test
-  void testChangeQuayThenRevertToOriginalStops() {
-    var env = ENV_BUILDER.addTrip(TRIP_INPUT).build();
-    var siri = SiriTestHelper.of(env);
-
-    // Step 1: Change quay from B to C (same station)
-    var quayChange = siri
-      .etBuilder()
-      .withDatedVehicleJourneyRef(TRIP_1_ID)
-      .withRecordedCalls(builder -> builder.call(STOP_A).departAimedActual("00:00:11", "00:00:15"))
-      .withEstimatedCalls(builder ->
-        builder.call(STOP_C).arriveAimedExpected("00:00:20", "00:00:33")
-      )
-      .buildEstimatedTimetableDeliveries();
-
-    var result1 = siri.applyEstimatedTimetable(quayChange);
-    assertSuccess(result1);
-    assertEquals(
-      "MODIFIED | A [R] 0:00:15 0:00:15 | C 0:00:33 0:00:33",
-      env.tripData(TRIP_1_ID).showTimetable()
-    );
-
-    // Step 2: Revert to original stop B with updated times
-    var revert = siri
-      .etBuilder()
-      .withDatedVehicleJourneyRef(TRIP_1_ID)
-      .withRecordedCalls(builder -> builder.call(STOP_A).departAimedActual("00:00:11", "00:00:16"))
-      .withEstimatedCalls(builder ->
-        builder.call(STOP_B).arriveAimedExpected("00:00:20", "00:00:30")
-      )
-      .buildEstimatedTimetableDeliveries();
-
-    var result2 = siri.applyEstimatedTimetable(revert);
-    assertSuccess(result2);
-    assertEquals(
-      "UPDATED | A [R] 0:00:16 0:00:16 | B 0:00:30 0:00:30",
-      env.tripData(TRIP_1_ID).showTimetable()
-    );
-    // Pattern reverts to the scheduled one (not an RT pattern), but trip state is UPDATED
-    assertThat(env.raptorData().summarizePatterns()).containsExactly("F:Pattern1[UPDATED]");
-  }
 }