55import static org .junit .jupiter .api .Assertions .assertNotNull ;
66import static org .opentripplanner .transit .model ._data .FeedScopedIdForTestFactory .id ;
77import static org .opentripplanner .updater .spi .UpdateResultAssertions .assertFailure ;
8+ import static org .opentripplanner .updater .spi .UpdateResultAssertions .assertSuccess ;
89
910import org .junit .jupiter .api .Test ;
1011import org .opentripplanner .core .model .id .FeedScopedId ;
@@ -147,11 +148,9 @@ void testAddJourneyMultipleTimes() {
147148 var updates = createValidAddedJourney (siri ).buildEstimatedTimetableDeliveries ();
148149
149150 int numTrips = env .transitService ().listTrips ().size ();
150- var result1 = siri .applyEstimatedTimetable (updates );
151- assertEquals (1 , result1 .successful ());
151+ assertSuccess (siri .applyEstimatedTimetable (updates ));
152152 assertEquals (numTrips + 1 , env .transitService ().listTrips ().size ());
153- var result2 = siri .applyEstimatedTimetable (updates );
154- assertEquals (1 , result2 .successful ());
153+ assertSuccess (siri .applyEstimatedTimetable (updates ));
155154 assertEquals (numTrips + 1 , env .transitService ().listTrips ().size ());
156155
157156 assertThat (env .raptorData ().summarizePatterns ()).containsExactly (
@@ -206,9 +205,7 @@ void testReplaceJourney() {
206205 .withEstimatedCalls (builder -> builder .call (STOP_C ).arriveAimedExpected ("00:03" , "00:04" ))
207206 .buildEstimatedTimetableDeliveries ();
208207
209- var result = siri .applyEstimatedTimetable (updates );
210-
211- assertEquals (1 , result .successful ());
208+ assertSuccess (siri .applyEstimatedTimetable (updates ));
212209
213210 assertEquals (
214211 "ADDED | A [R] 0:02 0:02 | C 0:04 0:04" ,
@@ -266,11 +263,9 @@ void testAddJourneyWithNewRouteAndShortName() {
266263 .withPublishedLineName ("L1" )
267264 .buildEstimatedTimetableDeliveries ();
268265
269- var result = siri .applyEstimatedTimetable (updates );
270- assertEquals (1 , result .successful ());
266+ assertSuccess (siri .applyEstimatedTimetable (updates ));
271267
272268 Route newRoute = env .transitService ().getRoute (id (newRouteRef ));
273- assertNotNull (newRoute );
274269 assertEquals (
275270 "L1" ,
276271 newRoute .getShortName (),
@@ -288,8 +283,7 @@ void testAddJourneyWithNewRouteAndOperator() {
288283 .withLineRef (newRouteRef )
289284 .buildEstimatedTimetableDeliveries ();
290285
291- var result = siri .applyEstimatedTimetable (updates );
292- assertEquals (1 , result .successful ());
286+ assertSuccess (siri .applyEstimatedTimetable (updates ));
293287
294288 Trip trip = env .transitService ().getTrip (id (ADDED_TRIP_ID ));
295289 assertNotNull (trip );
@@ -334,8 +328,7 @@ void testAddJourneyBusReplacingRailHasRailReplacementSubmode() {
334328 .withVehicleMode (VehicleModesEnumeration .BUS )
335329 .buildEstimatedTimetableDeliveries ();
336330
337- var result = siri .applyEstimatedTimetable (updates );
338- assertEquals (1 , result .successful ());
331+ assertSuccess (siri .applyEstimatedTimetable (updates ));
339332
340333 Route newRoute = env .transitService ().getRoute (id (newRouteRef ));
341334 assertNotNull (newRoute );
@@ -359,8 +352,7 @@ void testAddJourneyRailReplacingRailHasReplacementRailSubmode() {
359352 .withVehicleMode (VehicleModesEnumeration .RAIL )
360353 .buildEstimatedTimetableDeliveries ();
361354
362- var result = siri .applyEstimatedTimetable (updates );
363- assertEquals (1 , result .successful ());
355+ assertSuccess (siri .applyEstimatedTimetable (updates ));
364356
365357 Route newRoute = env .transitService ().getRoute (id (newRouteRef ));
366358 assertNotNull (newRoute );
0 commit comments