Add test for priorities

leonardehrenfried · leonardehrenfried · commit 49bbdafaa9bc · 2025-12-18T12:38:14.000+01:00
diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/AreasTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/AreasTest.java
@@ -6,7 +6,6 @@
 import static org.opentripplanner.transit.model._data.TimetableRepositoryForTest.id;
 
 import com.google.common.collect.Multimaps;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import org.junit.jupiter.api.Test;
@@ -54,21 +53,19 @@ class AreasTest implements PlanTestConstants {
 
   private static final GtfsFaresV2Service SERVICE = GtfsFaresV2Service.of()
     .withLegRules(
-      List.of(
-        FareLegRule.of(id("2"), SINGLE_TO_OUTER)
-          .withLegGroupId(LEG_GROUP1)
-          .withToAreaId(OUTER_ZONE)
-          .build(),
-        FareLegRule.of(id("3"), SINGLE_FROM_OUTER)
-          .withLegGroupId(LEG_GROUP1)
-          .withFromAreaId(OUTER_ZONE)
-          .build(),
-        FareLegRule.of(id("6"), INNER_TO_OUTER_ZONE_SINGLE)
-          .withLegGroupId(LEG_GROUP1)
-          .withFromAreaId(INNER_ZONE)
-          .withToAreaId(OUTER_ZONE)
-          .build()
-      )
+      FareLegRule.of(id("2"), SINGLE_TO_OUTER)
+        .withLegGroupId(LEG_GROUP1)
+        .withToAreaId(OUTER_ZONE)
+        .build(),
+      FareLegRule.of(id("3"), SINGLE_FROM_OUTER)
+        .withLegGroupId(LEG_GROUP1)
+        .withFromAreaId(OUTER_ZONE)
+        .build(),
+      FareLegRule.of(id("6"), INNER_TO_OUTER_ZONE_SINGLE)
+        .withLegGroupId(LEG_GROUP1)
+        .withFromAreaId(INNER_ZONE)
+        .withToAreaId(OUTER_ZONE)
+        .build()
     )
     .withStopAreas(
       Multimaps.forMap(
diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/CostedTransferAcrossNetworksTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/CostedTransferAcrossNetworksTest.java
@@ -25,16 +25,14 @@ class CostedTransferAcrossNetworksTest implements PlanTestConstants, FareTestCon
 
   private final GtfsFaresV2Service service = GtfsFaresV2Service.of()
     .withLegRules(
-      List.of(
-        FareLegRule.of(LEG_GROUP_A, FARE_PRODUCT_A)
-          .withLegGroupId(LEG_GROUP_A)
-          .withNetworkId(NETWORK_A.getId())
-          .build(),
-        FareLegRule.of(LEG_GROUP_B, FARE_PRODUCT_B)
-          .withLegGroupId(LEG_GROUP_B)
-          .withNetworkId(NETWORK_B.getId())
-          .build()
-      )
+      FareLegRule.of(LEG_GROUP_A, FARE_PRODUCT_A)
+        .withLegGroupId(LEG_GROUP_A)
+        .withNetworkId(NETWORK_A.getId())
+        .build(),
+      FareLegRule.of(LEG_GROUP_B, FARE_PRODUCT_B)
+        .withLegGroupId(LEG_GROUP_B)
+        .withNetworkId(NETWORK_B.getId())
+        .build()
     )
     .withTransferRules(
       List.of(
diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/CostedTransferInNetworkTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/CostedTransferInNetworkTest.java
@@ -27,16 +27,14 @@ class CostedTransferInNetworkTest implements PlanTestConstants, FareTestConstant
 
   private static final GtfsFaresV2Service SERVICE = GtfsFaresV2Service.of()
     .withLegRules(
-      List.of(
-        FareLegRule.of(id("r1"), FARE_PRODUCT_A)
-          .withLegGroupId(LEG_GROUP)
-          .withNetworkId(NETWORK_A.getId())
-          .build(),
-        FareLegRule.of(id("r2"), FARE_PRODUCT_B)
-          .withLegGroupId(LEG_GROUP)
-          .withNetworkId(NETWORK_A.getId())
-          .build()
-      )
+      FareLegRule.of(id("r1"), FARE_PRODUCT_A)
+        .withLegGroupId(LEG_GROUP)
+        .withNetworkId(NETWORK_A.getId())
+        .build(),
+      FareLegRule.of(id("r2"), FARE_PRODUCT_B)
+        .withLegGroupId(LEG_GROUP)
+        .withNetworkId(NETWORK_A.getId())
+        .build()
     )
     .withTransferRules(
       List.of(
diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/DepartureToArrivalTimeLimitTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/DepartureToArrivalTimeLimitTest.java
@@ -21,9 +21,7 @@ class DepartureToArrivalTimeLimitTest implements PlanTestConstants, FareTestCons
   private static final FeedScopedId LEG_GROUP = id("leg-group-a");
 
   private static final GtfsFaresV2Service SERVICE = GtfsFaresV2Service.of()
-    .withLegRules(
-      List.of(FareLegRule.of(id("r1"), FARE_PRODUCT_A).withLegGroupId(LEG_GROUP).build())
-    )
+    .withLegRules(FareLegRule.of(id("r1"), FARE_PRODUCT_A).withLegGroupId(LEG_GROUP).build())
     .withTransferRules(
       List.of(
         FareTransferRule.of()
diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/DepartureToDepartureTimeLimitTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/DepartureToDepartureTimeLimitTest.java
@@ -21,9 +21,7 @@ class DepartureToDepartureTimeLimitTest implements PlanTestConstants, FareTestCo
   private static final FeedScopedId LEG_GROUP = id("leg-group-a");
 
   private static final GtfsFaresV2Service SERVICE = GtfsFaresV2Service.of()
-    .withLegRules(
-      List.of(FareLegRule.of(id("r1"), FARE_PRODUCT_A).withLegGroupId(LEG_GROUP).build())
-    )
+    .withLegRules(FareLegRule.of(id("r1"), FARE_PRODUCT_A).withLegGroupId(LEG_GROUP).build())
     .withTransferRules(
       List.of(
         FareTransferRule.of()
diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FlexLegTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FlexLegTest.java
@@ -20,13 +20,11 @@ class FlexLegTest implements PlanTestConstants, FareTestConstants {
 
   private static final GtfsFaresV2Service SERVICE = GtfsFaresV2Service.of()
     .withLegRules(
-      List.of(
-        FareLegRule.of(id("r1"), FARE_PRODUCT_A)
-          .withLegGroupId(LEG_GROUP)
-          .withFromAreaId(STOP_AREA)
-          .withToAreaId(STOP_AREA)
-          .build()
-      )
+      FareLegRule.of(id("r1"), FARE_PRODUCT_A)
+        .withLegGroupId(LEG_GROUP)
+        .withFromAreaId(STOP_AREA)
+        .withToAreaId(STOP_AREA)
+        .build()
     )
     .withTransferRules(List.of())
     .withStopAreas(ImmutableMultimap.of(A.stop.getId(), STOP_AREA))
diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferAcrossNetworksTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferAcrossNetworksTest.java
@@ -25,16 +25,14 @@ class FreeTransferAcrossNetworksTest implements PlanTestConstants, FareTestConst
 
   GtfsFaresV2Service service = GtfsFaresV2Service.of()
     .withLegRules(
-      List.of(
-        FareLegRule.of(LEG_GROUP_A, FARE_PRODUCT_A)
-          .withLegGroupId(LEG_GROUP_A)
-          .withNetworkId(NETWORK_A.getId())
-          .build(),
-        FareLegRule.of(LEG_GROUP_B, FARE_PRODUCT_B)
-          .withLegGroupId(LEG_GROUP_B)
-          .withNetworkId(NETWORK_B.getId())
-          .build()
-      )
+      FareLegRule.of(LEG_GROUP_A, FARE_PRODUCT_A)
+        .withLegGroupId(LEG_GROUP_A)
+        .withNetworkId(NETWORK_A.getId())
+        .build(),
+      FareLegRule.of(LEG_GROUP_B, FARE_PRODUCT_B)
+        .withLegGroupId(LEG_GROUP_B)
+        .withNetworkId(NETWORK_B.getId())
+        .build()
     )
     .withTransferRules(
       List.of(
diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferInNetworkTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferInNetworkTest.java
@@ -35,12 +35,10 @@ class FreeTransferInNetworkTest implements PlanTestConstants {
 
   GtfsFaresV2Service service = GtfsFaresV2Service.of()
     .withLegRules(
-      List.of(
-        FareLegRule.of(id("6"), REGULAR)
-          .withLegGroupId(LEG_GROUP)
-          .withNetworkId(NETWORK.getId())
-          .build()
-      )
+      FareLegRule.of(id("6"), REGULAR)
+        .withLegGroupId(LEG_GROUP)
+        .withNetworkId(NETWORK.getId())
+        .build()
     )
     .withTransferRules(
       List.of(
diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferTimeLimitTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferTimeLimitTest.java
@@ -27,12 +27,10 @@ class FreeTransferTimeLimitTest implements PlanTestConstants, FareTestConstants
 
   private static final GtfsFaresV2Service SERVICE = GtfsFaresV2Service.of()
     .withLegRules(
-      List.of(
-        FareLegRule.of(id("r1"), FARE_PRODUCT_A)
-          .withLegGroupId(LEG_GROUP)
-          .withNetworkId(NETWORK_A.getId())
-          .build()
-      )
+      FareLegRule.of(id("r1"), FARE_PRODUCT_A)
+        .withLegGroupId(LEG_GROUP)
+        .withNetworkId(NETWORK_A.getId())
+        .build()
     )
     .withTransferRules(
       List.of(
diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2ServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2ServiceTest.java
@@ -7,7 +7,6 @@
 import static org.opentripplanner.transit.model._data.TimetableRepositoryForTest.id;
 
 import java.time.Duration;
-import java.util.List;
 import java.util.Set;
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.core.model.id.FeedScopedId;
@@ -61,21 +60,19 @@ class GtfsFaresV2ServiceTest implements PlanTestConstants {
 
   private static final GtfsFaresV2Service SERVICE = GtfsFaresV2Service.of()
     .withLegRules(
-      List.of(
-        FareLegRule.of(id("1"), ALL_NETWORKS_SINGLE).withLegGroupId(LEG_GROUP1).build(),
-        FareLegRule.of(id("4"), ALL_NETWORKS_DAY_PASS).withLegGroupId(LEG_GROUP1).build(),
-        FareLegRule.of(id("5"), EXPRESS_DAY_PASS)
-          .withLegGroupId(LEG_GROUP1)
-          .withNetworkId(expressNetwork)
-          .build(),
-        FareLegRule.of(id("5"), LOCAL_DAY_PASS)
-          .withLegGroupId(LEG_GROUP1)
-          .withNetworkId(localNetwork)
-          .build(),
-        FareLegRule.of(MONTHLY_PASS.id(), MONTHLY_PASS)
-          .withLegGroupId(id("another-leg-group"))
-          .build()
-      )
+      FareLegRule.of(id("1"), ALL_NETWORKS_SINGLE).withLegGroupId(LEG_GROUP1).build(),
+      FareLegRule.of(id("4"), ALL_NETWORKS_DAY_PASS).withLegGroupId(LEG_GROUP1).build(),
+      FareLegRule.of(id("5"), EXPRESS_DAY_PASS)
+        .withLegGroupId(LEG_GROUP1)
+        .withNetworkId(expressNetwork)
+        .build(),
+      FareLegRule.of(id("5"), LOCAL_DAY_PASS)
+        .withLegGroupId(LEG_GROUP1)
+        .withNetworkId(localNetwork)
+        .build(),
+      FareLegRule.of(MONTHLY_PASS.id(), MONTHLY_PASS)
+        .withLegGroupId(id("another-leg-group"))
+        .build()
     )
     .build();
 
diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/OverlappingTimeframeTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/OverlappingTimeframeTest.java
@@ -35,14 +35,12 @@ void oneLeg() {
   private static GtfsFaresV2Service buildService(LocalDate serviceDate) {
     return GtfsFaresV2Service.of()
       .withLegRules(
-        List.of(
-          FareLegRule.of(id("r1"), FARE_PRODUCT_A)
-            .withFromTimeframes(List.of(TIMEFRAME_ALL_DAY))
-            .build(),
-          FareLegRule.of(id("r2"), FARE_PRODUCT_B)
-            .withFromTimeframes(List.of(TIMEFRAME_THREE_TO_FIVE))
-            .build()
-        )
+        FareLegRule.of(id("r1"), FARE_PRODUCT_A)
+          .withFromTimeframes(List.of(TIMEFRAME_ALL_DAY))
+          .build(),
+        FareLegRule.of(id("r2"), FARE_PRODUCT_B)
+          .withFromTimeframes(List.of(TIMEFRAME_THREE_TO_FIVE))
+          .build()
       )
       .addServiceId(TIMEFRAME_THREE_TO_FIVE.serviceId(), serviceDate)
       .addServiceId(TIMEFRAME_ALL_DAY.serviceId(), serviceDate)
diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/OverlappingTimeframesWithPriorityTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/OverlappingTimeframesWithPriorityTest.java
@@ -0,0 +1,50 @@
+package org.opentripplanner.ext.fares.service.gtfs.v2;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.opentripplanner.transit.model._data.TimetableRepositoryForTest.id;
+
+import java.time.LocalDate;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.opentripplanner.ext.fares.model.FareLegRule;
+import org.opentripplanner.ext.fares.model.FareTestConstants;
+import org.opentripplanner.model.fare.FareOffer;
+import org.opentripplanner.model.plan.PlanTestConstants;
+import org.opentripplanner.model.plan.TestItinerary;
+import org.opentripplanner.model.plan.TestTransitLeg;
+
+class OverlappingTimeframesWithPriorityTest implements PlanTestConstants, FareTestConstants {
+
+  @Test
+  void priorityLeadsToSingleResult() {
+    var leg = TestTransitLeg.of()
+      .withStartTime("15:00")
+      .withEndTime("15:10")
+      .withServiceId(TIMEFRAME_THREE_TO_FIVE.serviceId())
+      .build();
+    var it = TestItinerary.of(leg).build();
+    var result = buildService(leg.serviceDate()).calculateFares(it);
+
+    assertThat(result.itineraryProducts()).isEmpty();
+    assertThat(result.offersForLeg(leg)).containsExactly(
+      FareOffer.of(leg.startTime(), FARE_PRODUCT_A)
+    );
+  }
+
+  private static GtfsFaresV2Service buildService(LocalDate serviceDate) {
+    return GtfsFaresV2Service.of()
+      .withLegRules(
+        FareLegRule.of(id("r1"), FARE_PRODUCT_A)
+          .withFromTimeframes(List.of(TIMEFRAME_ALL_DAY))
+          .withPriority(1)
+          .build(),
+        FareLegRule.of(id("r2"), FARE_PRODUCT_B)
+          .withFromTimeframes(List.of(TIMEFRAME_THREE_TO_FIVE))
+          .withPriority(0)
+          .build()
+      )
+      .addServiceId(TIMEFRAME_THREE_TO_FIVE.serviceId(), serviceDate)
+      .addServiceId(TIMEFRAME_ALL_DAY.serviceId(), serviceDate)
+      .build();
+  }
+}
diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/TimeframeTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/TimeframeTest.java
@@ -58,14 +58,12 @@ void twoLegs() {
   private static GtfsFaresV2Service buildService(LocalDate serviceDate) {
     return GtfsFaresV2Service.of()
       .withLegRules(
-        List.of(
-          FareLegRule.of(id("r1"), FARE_PRODUCT_A)
-            .withFromTimeframes(List.of(TIMEFRAME_TWELVE_TO_TWO))
-            .build(),
-          FareLegRule.of(id("r2"), FARE_PRODUCT_B)
-            .withFromTimeframes(List.of(TIMEFRAME_THREE_TO_FIVE))
-            .build()
-        )
+        FareLegRule.of(id("r1"), FARE_PRODUCT_A)
+          .withFromTimeframes(List.of(TIMEFRAME_TWELVE_TO_TWO))
+          .build(),
+        FareLegRule.of(id("r2"), FARE_PRODUCT_B)
+          .withFromTimeframes(List.of(TIMEFRAME_THREE_TO_FIVE))
+          .build()
       )
       .addServiceId(TIMEFRAME_THREE_TO_FIVE.serviceId(), serviceDate)
       .addServiceId(TIMEFRAME_TWELVE_TO_TWO.serviceId(), serviceDate)
diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2ServiceBuilder.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2ServiceBuilder.java
@@ -4,6 +4,7 @@
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
 import java.time.LocalDate;
+import java.util.Arrays;
 import java.util.List;
 import org.opentripplanner.core.model.id.FeedScopedId;
 import org.opentripplanner.ext.fares.model.FareLegRule;
@@ -21,6 +22,10 @@ public GtfsFaresV2ServiceBuilder withLegRules(List<FareLegRule> legRules) {
     return this;
   }
 
+  public GtfsFaresV2ServiceBuilder withLegRules(FareLegRule... legRules) {
+    return withLegRules(Arrays.stream(legRules).toList());
+  }
+
   public GtfsFaresV2ServiceBuilder withTransferRules(List<FareTransferRule> fareTransferRules) {
     this.fareTransferRules = fareTransferRules;
     return this;
