From 49f29b4cc0dcbb1e36e7d049f3f856384b9dbc57 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Tue, 20 Aug 2024 14:06:52 +0200 Subject: [PATCH] Update GTFS unit tests --- .../ext/siri/SiriTimetableSnapshotSourceTest.java | 4 ++-- .../trip/moduletests/addition/AddedTest.java | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java index b34f47205b6..b484103cbab 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java @@ -93,7 +93,7 @@ void testAddJourneyWithNewRoute() { .withEstimatedCalls(builder -> builder.call(env.stopD1).arriveAimedExpected("00:03", "00:04")) .buildEstimatedTimetableDeliveries(); - assertEquals(1, env.getTransitService().getAllRoutes().size()); + int numRoutes = env.getTransitService().getAllRoutes().size(); var result = env.applyEstimatedTimetable(updates); assertEquals(1, result.successful()); @@ -103,7 +103,7 @@ void testAddJourneyWithNewRoute() { env.getScheduledTimetable("newJourney") ); TransitService transitService = env.getTransitService(); - assertEquals(2, transitService.getAllRoutes().size()); + assertEquals(numRoutes + 1, transitService.getAllRoutes().size()); FeedScopedId newRouteId = TransitModelForTest.id(newRouteRef); Route newRoute = transitService.getRouteForId(newRouteId); assertNotNull(newRoute); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java index 8371c5dda3a..2e0b9d3d88e 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java @@ -16,9 +16,12 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.opentripplanner.model.PickDrop; +import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.RealTimeState; +import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.transit.service.TransitService; import org.opentripplanner.updater.spi.UpdateSuccess; import org.opentripplanner.updater.trip.RealtimeTestEnvironment; import org.opentripplanner.updater.trip.TripUpdateBuilder; @@ -62,8 +65,12 @@ void addedTripWithNewRoute() { assertEquals(TripUpdateBuilder.ROUTE_NAME, route.getName()); assertEquals(TransitMode.RAIL, route.getMode()); - var fromTransitModel = env.getTransitService().getRouteForId(route.getId()); + TransitService transitService = env.getTransitService(); + var fromTransitModel = transitService.getRouteForId(route.getId()); assertEquals(fromTransitModel, route); + var patternsForRoute = transitService.getPatternsForRoute(route); + assertEquals(1, patternsForRoute.size()); + assertEquals(pattern, patternsForRoute.stream().findFirst().orElseThrow()); assertEquals(PickDrop.CALL_AGENCY, pattern.getBoardType(0)); assertEquals(PickDrop.CALL_AGENCY, pattern.getAlightType(0)); @@ -122,6 +129,12 @@ void repeatedlyAddedTripWithNewRoute() { private TripPattern assertAddedTrip(String tripId, RealtimeTestEnvironment env) { var snapshot = env.getTimetableSnapshot(); + + TransitService transitService = env.getTransitService(); + Trip trip = transitService.getTripForId(TransitModelForTest.id(ADDED_TRIP_ID)); + assertNotNull(trip); + assertNotNull(transitService.getPatternForTrip(trip)); + var stopA = env.transitModel.getStopModel().getRegularStop(env.stopA1.getId()); // Get the trip pattern of the added trip which goes through stopA var patternsAtA = env.getTimetableSnapshot().getPatternsForStop(stopA);