Skip to content

Commit cfa755c

Browse files
flaktackflaktack
committed
AssignedStopIdsTest: use tripUpdateScheduled() for tests
1 parent b022e57 commit cfa755c

2 files changed

Lines changed: 49 additions & 39 deletions

File tree

‎application/src/test/java/org/opentripplanner/updater/trip/GtfsRtTestHelper.java‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import static org.opentripplanner.updater.trip.UpdateIncrementality.FULL_DATASET;
44

55
import com.google.transit.realtime.GtfsRealtime;
6+
import java.time.LocalDate;
67
import java.util.List;
78
import org.opentripplanner.transit.model._data.TransitTestEnvironment;
89
import org.opentripplanner.updater.spi.UpdateResult;
@@ -20,7 +21,7 @@ public class GtfsRtTestHelper {
2021
this.gtfsAdapter = new GtfsRealTimeTripUpdateAdapter(
2122
transitTestEnvironment.timetableRepository(),
2223
transitTestEnvironment.timetableSnapshotManager(),
23-
() -> transitTestEnvironment.defaultServiceDate()
24+
transitTestEnvironment::defaultServiceDate
2425
);
2526
}
2627

@@ -32,13 +33,29 @@ public TripUpdateBuilder tripUpdateScheduled(String tripId) {
3233
return tripUpdate(tripId, GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED);
3334
}
3435

36+
public TripUpdateBuilder tripUpdateScheduled(String tripId, LocalDate serviceDate) {
37+
return tripUpdate(
38+
tripId,
39+
serviceDate,
40+
GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED
41+
);
42+
}
43+
44+
public TripUpdateBuilder tripUpdate(
45+
String tripId,
46+
GtfsRealtime.TripDescriptor.ScheduleRelationship scheduleRelationship
47+
) {
48+
return tripUpdate(tripId, transitTestEnvironment.defaultServiceDate(), scheduleRelationship);
49+
}
50+
3551
public TripUpdateBuilder tripUpdate(
3652
String tripId,
53+
LocalDate serviceDate,
3754
GtfsRealtime.TripDescriptor.ScheduleRelationship scheduleRelationship
3855
) {
3956
return new TripUpdateBuilder(
4057
tripId,
41-
transitTestEnvironment.defaultServiceDate(),
58+
serviceDate,
4259
scheduleRelationship,
4360
transitTestEnvironment.timeZone()
4461
);

‎application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/delay/AssignedStopIdsTest.java‎

Lines changed: 30 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.opentripplanner.updater.trip.gtfs.moduletests.delay;
22

3-
import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED;
43
import static org.junit.jupiter.api.Assertions.assertEquals;
54
import static org.junit.jupiter.api.Assertions.assertFalse;
65
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -21,7 +20,6 @@
2120
import org.opentripplanner.transit.model.site.RegularStop;
2221
import org.opentripplanner.updater.trip.GtfsRtTestHelper;
2322
import org.opentripplanner.updater.trip.RealtimeTestConstants;
24-
import org.opentripplanner.updater.trip.TripUpdateBuilder;
2523

2624
/**
2725
* Tests updating and reverting the stops/platforms for existing trips.
@@ -61,7 +59,8 @@ void assignedThenRevertedStopIds() {
6159
assertEquals(List.of("F:Pattern1"), routingTripPatternIdsForDate(env));
6260

6361
var rt = GtfsRtTestHelper.of(env);
64-
var tripUpdate1 = new TripUpdateBuilder(TRIP_1_ID, SERVICE_DATE, SCHEDULED, TIME_ZONE)
62+
var tripUpdate1 = rt
63+
.tripUpdateScheduled(TRIP_1_ID)
6564
.addAssignedStopTime(0, "09:50:00", STOP_D_ID)
6665
.addStopTime(1, "10:01:00")
6766
.addStopTime(2, "10:02:00")
@@ -75,7 +74,8 @@ void assignedThenRevertedStopIds() {
7574
assertTrue(env.tripData(TRIP_1_ID).tripPattern().isCreatedByRealtimeUpdater());
7675
assertEquals(List.of("F:Route1::rt#1"), routingTripPatternIdsForDate(env));
7776

78-
var tripUpdate2 = new TripUpdateBuilder(TRIP_1_ID, SERVICE_DATE, SCHEDULED, TIME_ZONE)
77+
var tripUpdate2 = rt
78+
.tripUpdateScheduled(TRIP_1_ID)
7979
.addAssignedStopTime(0, "09:55:00", STOP_E_ID)
8080
.addStopTime(1, "10:01:00")
8181
.addStopTime(2, "10:02:00")
@@ -89,7 +89,8 @@ void assignedThenRevertedStopIds() {
8989
assertTrue(env.tripData(TRIP_1_ID).tripPattern().isCreatedByRealtimeUpdater());
9090
assertEquals(List.of("F:Route1::rt#2"), routingTripPatternIdsForDate(env));
9191

92-
var tripUpdate3 = new TripUpdateBuilder(TRIP_1_ID, SERVICE_DATE, SCHEDULED, TIME_ZONE)
92+
var tripUpdate3 = rt
93+
.tripUpdateScheduled(TRIP_1_ID)
9394
.addAssignedStopTime(0, "10:01:00", STOP_A_ID)
9495
.addStopTime(1, "10:02:00")
9596
.addStopTime(2, "10:03:00")
@@ -115,11 +116,13 @@ void reuseRealtimeTripPatterns() {
115116
assertEquals(List.of("F:Pattern1"), routingTripPatternIdsForDate(env));
116117

117118
var rt = GtfsRtTestHelper.of(env);
118-
var tripUpdate1 = new TripUpdateBuilder(TRIP_1_ID, SERVICE_DATE, SCHEDULED, TIME_ZONE)
119+
var tripUpdate1 = rt
120+
.tripUpdateScheduled(TRIP_1_ID)
119121
.addAssignedStopTime(0, "10:01", STOP_E_ID)
120122
.build();
121123

122-
var tripUpdate2 = new TripUpdateBuilder(TRIP_2_ID, SERVICE_DATE, SCHEDULED, TIME_ZONE)
124+
var tripUpdate2 = rt
125+
.tripUpdateScheduled(TRIP_2_ID)
123126
.addAssignedStopTime(0, "11:01", STOP_E_ID)
124127
.build();
125128

@@ -165,12 +168,8 @@ void reuseRealtimeTripPatterns() {
165168
assertSuccess(
166169
rt.applyTripUpdates(
167170
List.of(
168-
new TripUpdateBuilder(TRIP_1_ID, SERVICE_DATE, SCHEDULED, TIME_ZONE)
169-
.addDelayedStopTime(0, 0)
170-
.build(),
171-
new TripUpdateBuilder(TRIP_2_ID, SERVICE_DATE, SCHEDULED, TIME_ZONE)
172-
.addDelayedStopTime(0, 0)
173-
.build()
171+
rt.tripUpdateScheduled(TRIP_1_ID).addDelayedStopTime(0, 0).build(),
172+
rt.tripUpdateScheduled(TRIP_2_ID).addDelayedStopTime(0, 0).build()
174173
)
175174
)
176175
);
@@ -196,17 +195,21 @@ void reuseRealtimeTripPatternsOnDifferentServiceDates() {
196195
assertEquals(List.of("F:Pattern1"), routingTripPatternIdsForDate(env, SERVICE_DATE_PLUS));
197196

198197
var rt = GtfsRtTestHelper.of(env);
199-
var tripUpdate11 = new TripUpdateBuilder(TRIP_1_ID, SERVICE_DATE, SCHEDULED, TIME_ZONE)
198+
var tripUpdate11 = rt
199+
.tripUpdateScheduled(TRIP_1_ID, SERVICE_DATE)
200200
.addAssignedStopTime(0, "10:01", STOP_E_ID)
201201
.build();
202-
var tripUpdate12 = new TripUpdateBuilder(TRIP_2_ID, SERVICE_DATE, SCHEDULED, TIME_ZONE)
202+
var tripUpdate12 = rt
203+
.tripUpdateScheduled(TRIP_2_ID, SERVICE_DATE)
203204
.addAssignedStopTime(0, "11:01", STOP_E_ID)
204205
.build();
205206

206-
var tripUpdate21 = new TripUpdateBuilder(TRIP_1_ID, SERVICE_DATE_PLUS, SCHEDULED, TIME_ZONE)
207+
var tripUpdate21 = rt
208+
.tripUpdateScheduled(TRIP_1_ID, SERVICE_DATE_PLUS)
207209
.addAssignedStopTime(0, "10:01", STOP_E_ID)
208210
.build();
209-
var tripUpdate22 = new TripUpdateBuilder(TRIP_2_ID, SERVICE_DATE_PLUS, SCHEDULED, TIME_ZONE)
211+
var tripUpdate22 = rt
212+
.tripUpdateScheduled(TRIP_2_ID, SERVICE_DATE_PLUS)
210213
.addAssignedStopTime(0, "11:01", STOP_E_ID)
211214
.build();
212215

@@ -299,18 +302,10 @@ void reuseRealtimeTripPatternsOnDifferentServiceDates() {
299302
assertSuccess(
300303
rt.applyTripUpdates(
301304
List.of(
302-
new TripUpdateBuilder(TRIP_1_ID, SERVICE_DATE, SCHEDULED, TIME_ZONE)
303-
.addDelayedStopTime(0, 0)
304-
.build(),
305-
new TripUpdateBuilder(TRIP_2_ID, SERVICE_DATE, SCHEDULED, TIME_ZONE)
306-
.addDelayedStopTime(0, 0)
307-
.build(),
308-
new TripUpdateBuilder(TRIP_1_ID, SERVICE_DATE_PLUS, SCHEDULED, TIME_ZONE)
309-
.addDelayedStopTime(0, 0)
310-
.build(),
311-
new TripUpdateBuilder(TRIP_2_ID, SERVICE_DATE_PLUS, SCHEDULED, TIME_ZONE)
312-
.addDelayedStopTime(0, 0)
313-
.build()
305+
rt.tripUpdateScheduled(TRIP_1_ID, SERVICE_DATE).addDelayedStopTime(0, 0).build(),
306+
rt.tripUpdateScheduled(TRIP_2_ID, SERVICE_DATE).addDelayedStopTime(0, 0).build(),
307+
rt.tripUpdateScheduled(TRIP_1_ID, SERVICE_DATE_PLUS).addDelayedStopTime(0, 0).build(),
308+
rt.tripUpdateScheduled(TRIP_2_ID, SERVICE_DATE_PLUS).addDelayedStopTime(0, 0).build()
314309
)
315310
)
316311
);
@@ -335,13 +330,9 @@ void reuseScheduledTripPatterns() {
335330
assertEquals(List.of("F:Pattern1"), routingTripPatternIdsForDate(env));
336331

337332
var rt = GtfsRtTestHelper.of(env);
338-
var tripUpdate1 = new TripUpdateBuilder(TRIP_1_ID, SERVICE_DATE, SCHEDULED, TIME_ZONE)
339-
.addDelayedStopTime(0, 60)
340-
.build();
333+
var tripUpdate1 = rt.tripUpdateScheduled(TRIP_1_ID).addDelayedStopTime(0, 60).build();
341334

342-
var tripUpdate2 = new TripUpdateBuilder(TRIP_2_ID, SERVICE_DATE, SCHEDULED, TIME_ZONE)
343-
.addDelayedStopTime(0, 60)
344-
.build();
335+
var tripUpdate2 = rt.tripUpdateScheduled(TRIP_2_ID).addDelayedStopTime(0, 60).build();
345336

346337
assertSuccess(rt.applyTripUpdate(tripUpdate1));
347338
assertEquals(
@@ -389,11 +380,13 @@ void reuseScheduledTripPatternsOnDifferentServiceDates() {
389380
assertEquals(List.of("F:Pattern1"), routingTripPatternIdsForDate(env, SERVICE_DATE_PLUS));
390381

391382
var rt = GtfsRtTestHelper.of(env);
392-
var tripUpdate1 = new TripUpdateBuilder(TRIP_1_ID, SERVICE_DATE, SCHEDULED, TIME_ZONE)
383+
var tripUpdate1 = rt
384+
.tripUpdateScheduled(TRIP_1_ID, SERVICE_DATE)
393385
.addDelayedStopTime(0, 60)
394386
.build();
395387

396-
var tripUpdate2 = new TripUpdateBuilder(TRIP_1_ID, SERVICE_DATE_PLUS, SCHEDULED, TIME_ZONE)
388+
var tripUpdate2 = rt
389+
.tripUpdateScheduled(TRIP_1_ID, SERVICE_DATE_PLUS)
397390
.addDelayedStopTime(0, 60)
398391
.build();
399392

0 commit comments

Comments
 (0)