diff --git a/smoke-tests/denver/router-config.json b/smoke-tests/denver/router-config.json index ed80cb617b2..e68a9cc7629 100644 --- a/smoke-tests/denver/router-config.json +++ b/smoke-tests/denver/router-config.json @@ -3,8 +3,7 @@ { "type": "vehicle-positions", "url": "https://www.rtd-denver.com/files/gtfs-rt/VehiclePosition.pb", - "feedId": "denver", - "frequencySec": 60 + "feedId": "denver" } ] } \ No newline at end of file diff --git a/smoke-tests/portland/otp-config.json b/smoke-tests/portland/otp-config.json index 084070b312c..7b0d1828144 100644 --- a/smoke-tests/portland/otp-config.json +++ b/smoke-tests/portland/otp-config.json @@ -1,5 +1,4 @@ { "otpFeatures" : { - "SandboxAPILegacyGraphQLApi": true } } \ No newline at end of file diff --git a/smoke-tests/portland/router-config.json b/smoke-tests/portland/router-config.json index 13387faff95..00d362e83d5 100644 --- a/smoke-tests/portland/router-config.json +++ b/smoke-tests/portland/router-config.json @@ -3,20 +3,19 @@ "updaters": [ { "type": "real-time-alerts", - "frequencySec": 60, "earlyStartSec": 864000, "url": "https://trimet.org/transweb/ws/V1/FeedSpecAlerts/includeFuture/true/suppressSystemWideAlerts/true/", "feedId": "TriMet" }, { "type": "stop-time-updater", - "frequencySec": 30, + "frequency": "30s", "url": "https://trimet.org/transweb/ws/V1/TripUpdate", "feedId": "TriMet" }, { "type": "vehicle-rental", - "frequencySec": 90, + "frequency": "90s", "sourceType": "gbfs", "url": "https://mds.bird.co/gbfs/v2/public/portland/gbfs.json", "geofencingZones": "true" diff --git a/smoke-tests/septa/otp-config.json b/smoke-tests/septa/otp-config.json index 084070b312c..7b0d1828144 100644 --- a/smoke-tests/septa/otp-config.json +++ b/smoke-tests/septa/otp-config.json @@ -1,5 +1,4 @@ { "otpFeatures" : { - "SandboxAPILegacyGraphQLApi": true } } \ No newline at end of file diff --git a/src/test/java/org/opentripplanner/smoketest/HoustonSmokeTest.java b/src/test/java/org/opentripplanner/smoketest/HoustonSmokeTest.java index ce60e58a8d7..be0aacd337e 100644 --- a/src/test/java/org/opentripplanner/smoketest/HoustonSmokeTest.java +++ b/src/test/java/org/opentripplanner/smoketest/HoustonSmokeTest.java @@ -1,5 +1,6 @@ package org.opentripplanner.smoketest; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.opentripplanner.client.model.RequestMode.BICYCLE; import static org.opentripplanner.client.model.RequestMode.BUS; import static org.opentripplanner.client.model.RequestMode.TRANSIT; @@ -27,10 +28,12 @@ public class HoustonSmokeTest { @Test public void routeFromSouthToNorth() { var modes = Set.of(TRANSIT, WALK); - SmokeTest.basicRouteTest( + var plan = SmokeTest.basicRouteTest( new SmokeTestRequest(galvestonRoad, northLindale, modes), List.of("WALK", "BUS", "BUS", "WALK", "TRAM", "WALK") ); + + SmokeTest.assertThatAllTransitLegsHaveFares(plan); } @Test diff --git a/src/test/java/org/opentripplanner/smoketest/PortlandSmokeTest.java b/src/test/java/org/opentripplanner/smoketest/PortlandSmokeTest.java index 538e4f9fc39..51fffeb91ff 100644 --- a/src/test/java/org/opentripplanner/smoketest/PortlandSmokeTest.java +++ b/src/test/java/org/opentripplanner/smoketest/PortlandSmokeTest.java @@ -27,10 +27,12 @@ public class PortlandSmokeTest { public void railTrip() { // this used to be across the city by since the train is interrupted in April '23 this is a // much shorter trip - SmokeTest.basicRouteTest( + var plan = SmokeTest.basicRouteTest( new SmokeTestRequest(cennentenial, hazelwood, Set.of(TRAM, WALK)), List.of("WALK", "TRAM", "WALK") ); + + SmokeTest.assertThatAllTransitLegsHaveFares(plan); } /** diff --git a/src/test/java/org/opentripplanner/smoketest/SmokeTest.java b/src/test/java/org/opentripplanner/smoketest/SmokeTest.java index d7de1c0891c..87b2030c428 100644 --- a/src/test/java/org/opentripplanner/smoketest/SmokeTest.java +++ b/src/test/java/org/opentripplanner/smoketest/SmokeTest.java @@ -135,6 +135,11 @@ static void assertThereArePatternsWithVehiclePositions() { } } + static void assertThatAllTransitLegsHaveFares(TripPlan plan) { + var transitLegs = plan.transitItineraries().stream().flatMap(i-> i.transitLegs().stream()); + transitLegs.forEach(leg -> assertFalse(leg.fareProducts().isEmpty())); + } + /** * The Fare class is a little hard to deserialize, so we have a custom deserializer as we don't * run any assertions against the fares. (That is done during unit tests.)