Fix arrive by snapshot test

ibi-group · Sep 6, 2024 · 8a96f3a · 8a96f3a
1 parent 34c2601
commit 8a96f3a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/org/opentripplanner/model/plan/Itinerary.java b/src/main/java/org/opentripplanner/model/plan/Itinerary.java
@@ -162,6 +162,9 @@ public boolean isOnStreetAllTheWay() {
     return isStreetOnly();
   }
 
+  /**
+   * Does this itinerary contain only street or flex legs?
+   */
   public boolean isOnStreetAndFlexOnly() {
     return legs.stream().allMatch(l -> l.isStreetLeg() || l.isFlexibleTrip());
   }

diff --git a/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java b/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java
@@ -399,6 +399,7 @@ public void setTimetableView(boolean timetableView) {
   /**
    * Whether the trip should depart at dateTime (false, the default), or arrive at dateTime.
    */
+  @Deprecated
   public boolean arriveBy() {
     return arriveBy;
   }

diff --git a/...ipplanner/routing/algorithm/filterchain/filters/system/OutsideSearchWindowFilterTest.java b/...ipplanner/routing/algorithm/filterchain/filters/system/OutsideSearchWindowFilterTest.java
@@ -18,7 +18,7 @@
 import org.opentripplanner.model.plan.TestItineraryBuilder;
 import org.opentripplanner.routing.api.request.SearchDirection;
 
-public class OutsideSearchWindowFilterTest implements PlanTestConstants {
+class OutsideSearchWindowFilterTest implements PlanTestConstants {
 
   private static final Duration SEARCH_WINDOW_10m = Duration.ofMinutes(10);
   private final int startTime = TimeUtils.time("09:30");
@@ -38,7 +38,7 @@ static List<Arguments> filterOnSearchWindowTestCases() {
 
   @ParameterizedTest(name = "{0}, edt: {1}, sw: 10m, expects flagged for removal: {2}")
   @MethodSource("filterOnSearchWindowTestCases")
-  public void filterOnSearchWindow(String description, String edt, boolean flaggedForRemoval) {
+  void filterOnSearchWindow(String description, String edt, boolean flaggedForRemoval) {
     List<Itinerary> expected = flaggedForRemoval ? input : List.of();
     var subject = new OutsideSearchWindowFilter(
       TestItineraryBuilder.newTime(TimeUtils.time(edt)).toInstant(),

diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/TransitSnapshotTest.java b/src/test/java/org/opentripplanner/routing/algorithm/mapping/TransitSnapshotTest.java
@@ -138,7 +138,7 @@ public void test_trip_planning_with_transit_stop() {
     request.setFrom(ps);
     request.setTo(p3);
 
-    expectArriveByToMatchDepartAtAndSnapshot(request);
+    expectRequestResponseToMatchSnapshot(request);
   }
 
   @Test