Merge pull request #135 from danielhep/assertions-filter-by-isTransit

Assertions: fix crash on non-transit legs

Author: leonardehrenfried

assertions/src/main/java/org/opentripplanner/assertions/ItineraryAssertions.java

@@ -162,7 +162,8 @@ public void assertMatches(TripPlan tripPlan) {
    * <p>If strict transit matching is enabled, all transit legs must match some requirement.
    */
   private ItineraryMatchResult matchesAllLegs(Itinerary itinerary) {
-    List<Leg> remainingLegs = new ArrayList<>(itinerary.legs());
+    List<Leg> remainingLegs =
+        itinerary.legs().stream().filter(Leg::isTransit).collect(Collectors.toList());
     List<String> errors = new ArrayList<>();
     List<LegMatchingState> completeMatches = new ArrayList<>();
     List<LegMatchingState> partialMatches = new ArrayList<>();

assertions/src/test/java/org/opentripplanner/assertions/ItineraryAssertionsTest.java

@@ -45,6 +45,24 @@ void singleLegMatchSuccess() {
                 .assertMatches(plan));
   }
 
+  @Test
+  void nonTransitLegsAreIgnored() {
+    TripPlan plan =
+        tripPlan(
+            itinerary(
+                walkLeg(Duration.ofMinutes(10)),
+                transitLeg("10", "Route 10", LegMode.BUS, Duration.ofMinutes(20), List.of()),
+                walkLeg(Duration.ofMinutes(10))));
+
+    assertDoesNotThrow(
+        () ->
+            new ItineraryAssertions()
+                .withStrictTransitMatching()
+                .hasLeg()
+                .withRouteShortName("10")
+                .assertMatches(plan));
+  }
+
   @Test
   void multiLegMatchSuccess() {
     TripPlan plan =
@@ -155,6 +173,28 @@ private static Itinerary itinerary(Leg... legs) {
     return new Itinerary(List.of(legs), OptionalDouble.empty());
   }
 
+  private static Leg walkLeg(Duration duration) {
+    return new Leg(
+        place("Walk From"),
+        place("Walk To"),
+        START,
+        START.plus(duration),
+        false,
+        false,
+        LegMode.WALK,
+        duration,
+        1000,
+        Optional.empty(),
+        null,
+        null,
+        List.of(),
+        OptionalDouble.empty(),
+        null,
+        new LegGeometry(GEOMETRY),
+        false,
+        Optional.empty());
+  }
+
   private static Leg transitLeg(
       String routeShortName,
       String routeLongName,