Refactor unit tests

Author: vpaturet

src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java

@@ -169,8 +169,7 @@ void testAddedTrip() {
     assertEquals(route, pattern.getRoute());
     assertTrue(
       transitService
-        .getServiceCodesRunningForDate()
-        .get(SERVICE_DATE)
+        .getServiceCodesRunningForDate(SERVICE_DATE)
         .contains(TRANSIT_MODEL.getServiceCodes().get(trip.getServiceId())),
       "serviceId should be running on service date"
     );

src/test/java/org/opentripplanner/routing/graph/DefaultRoutingServiceTest.java

@@ -5,6 +5,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Collection;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Envelope;
@@ -29,6 +30,15 @@
  */
 public class DefaultRoutingServiceTest extends GtfsTest {
 
+  private TransitService transitService;
+
+  @BeforeEach
+  @Override
+  public void setUp() throws Exception {
+    super.setUp();
+    transitService = new DefaultTransitService(transitModel);
+  }
+
   @Override
   public String getFeedName() {
     return "gtfs/simple";
@@ -46,17 +56,16 @@ public void testIdLookup() {
     }
 
     /* Agencies */
-    String feedId = transitModel.getFeedIds().iterator().next();
+    String feedId = transitService.getFeedIds().iterator().next();
     Agency agency;
-    TransitService transitService = new DefaultTransitService(transitModel);
     agency = transitService.getAgencyForId(new FeedScopedId(feedId, "azerty"));
     assertNull(agency);
     agency = transitService.getAgencyForId(new FeedScopedId(feedId, "agency"));
     assertEquals(feedId + ":" + "agency", agency.getId().toString());
     assertEquals("Fake Agency", agency.getName());
 
     /* Stops */
-    transitModel.getStopModel().getRegularStop(new FeedScopedId("X", "Y"));
+    transitService.getRegularStop(new FeedScopedId("X", "Y"));
     /* Trips */
     //        graph.index.tripForId;
     //        graph.index.routeForId;
@@ -70,7 +79,6 @@ public void testIdLookup() {
    */
   @Test
   public void testPatternsCoherent() {
-    TransitService transitService = new DefaultTransitService(transitModel);
     for (Trip trip : transitService.getAllTrips()) {
       TripPattern pattern = transitService.getPatternForTrip(trip);
       assertTrue(pattern.scheduledTripsAsStream().anyMatch(t -> t.equals(trip)));
@@ -81,7 +89,7 @@ public void testPatternsCoherent() {
         assertEquals(pattern.getRoute(), route);
       }
     }
-    for (var stop : transitModel.getStopModel().listStopLocations()) {
+    for (var stop : transitService.listStopLocations()) {
       for (TripPattern pattern : transitService.getPatternsForStop(stop)) {
         int stopPos = pattern.findStopPosition(stop);
         assertTrue(stopPos >= 0, "Stop position exist");
@@ -91,13 +99,13 @@ public void testPatternsCoherent() {
 
   @Test
   public void testSpatialIndex() {
-    String feedId = transitModel.getFeedIds().iterator().next();
+    String feedId = transitService.getFeedIds().iterator().next();
     FeedScopedId idJ = new FeedScopedId(feedId, "J");
-    var stopJ = transitModel.getStopModel().getRegularStop(idJ);
+    var stopJ = transitService.getRegularStop(idJ);
     FeedScopedId idL = new FeedScopedId(feedId, "L");
-    var stopL = transitModel.getStopModel().getRegularStop(idL);
+    var stopL = transitService.getRegularStop(idL);
     FeedScopedId idM = new FeedScopedId(feedId, "M");
-    var stopM = transitModel.getStopModel().getRegularStop(idM);
+    var stopM = transitService.getRegularStop(idM);
     TransitStopVertex stopvJ = graph.getStopVertexForStopId(idJ);
     TransitStopVertex stopvL = graph.getStopVertexForStopId(idL);
     TransitStopVertex stopvM = graph.getStopVertexForStopId(idM);
@@ -107,7 +115,7 @@ public void testSpatialIndex() {
       SphericalDistanceLibrary.metersToLonDegrees(100, stopJ.getLat()),
       SphericalDistanceLibrary.metersToDegrees(100)
     );
-    Collection<RegularStop> stops = transitModel.getStopModel().findRegularStops(env);
+    Collection<RegularStop> stops = transitService.findRegularStops(env);
     assertTrue(stops.contains(stopJ));
     assertTrue(stops.contains(stopL));
     assertTrue(stops.contains(stopM));

src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java

@@ -217,8 +217,7 @@ public DateTimeHelper getDateTimeHelper() {
   }
 
   public TripPattern getPatternForTrip(Trip trip) {
-    var transitService = getTransitService();
-    return transitService.getPatternForTrip(trip);
+    return getTransitService().getPatternForTrip(trip);
   }
 
   public TimetableSnapshot getTimetableSnapshot() {

src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java

@@ -50,19 +50,19 @@ public class TimetableSnapshotSourceTest {
   )
     .build();
   private TransitModel transitModel;
+  private TransitService transitService;
 
   private final GtfsRealtimeFuzzyTripMatcher TRIP_MATCHER_NOOP = null;
 
   private String feedId;
-  private TransitService transitService;
 
   @BeforeEach
   public void setUp() {
     TestOtpModel model = ConstantsForTests.buildGtfsGraph(ConstantsForTests.SIMPLE_GTFS);
     transitModel = model.transitModel();
     transitService = new DefaultTransitService(transitModel);
 
-    feedId = transitModel.getFeedIds().stream().findFirst().get();
+    feedId = transitService.getFeedIds().stream().findFirst().get();
   }
 
   @Test
@@ -119,7 +119,7 @@ public void testHandleModifiedTrip() {
       tripDescriptorBuilder.setStartDate(ServiceDateUtils.asCompactString(SERVICE_DATE));
 
       final long midnightSecondsSinceEpoch = ServiceDateUtils
-        .asStartOfService(SERVICE_DATE, transitModel.getTimeZone())
+        .asStartOfService(SERVICE_DATE, transitService.getTimeZone())
         .toEpochSecond();
 
       final TripUpdate.Builder tripUpdateBuilder = TripUpdate.newBuilder();

src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java

@@ -62,7 +62,7 @@ void addedTripWithNewRoute() {
     assertEquals(TripUpdateBuilder.ROUTE_NAME, route.getName());
     assertEquals(TransitMode.RAIL, route.getMode());
 
-    var fromTransitModel = env.transitModel.getTransitModelIndex().getRouteForId(route.getId());
+    var fromTransitModel = env.getTransitService().getRouteForId(route.getId());
     assertEquals(fromTransitModel, route);
 
     assertEquals(PickDrop.CALL_AGENCY, pattern.getBoardType(0));
@@ -117,7 +117,7 @@ void repeatedlyAddedTripWithNewRoute() {
     var secondRoute = secondPattern.getRoute();
 
     assertSame(firstRoute, secondRoute);
-    assertNotNull(env.transitModel.getTransitModelIndex().getRouteForId(firstRoute.getId()));
+    assertNotNull(env.getTransitService().getRouteForId(firstRoute.getId()));
   }
 
   private TripPattern assertAddedTrip(String tripId, RealtimeTestEnvironment env) {

src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java

@@ -86,10 +86,7 @@ void complexDelay() {
 
     var snapshot = env.getTimetableSnapshot();
 
-    final TripPattern originalTripPattern = env.transitModel
-      .getTransitModelIndex()
-      .getPatternForTrip()
-      .get(env.trip2);
+    final TripPattern originalTripPattern = env.getTransitService().getPatternForTrip(env.trip2);
 
     var originalTimetableForToday = snapshot.resolve(originalTripPattern, SERVICE_DATE);
     var originalTimetableScheduled = snapshot.resolve(originalTripPattern, null);

src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java

@@ -13,9 +13,6 @@
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.timetable.RealTimeState;
-import org.opentripplanner.transit.model.timetable.Trip;
-import org.opentripplanner.transit.model.timetable.TripTimes;
-import org.opentripplanner.transit.service.TransitService;
 import org.opentripplanner.transit.model.timetable.TripTimesStringBuilder;
 import org.opentripplanner.updater.trip.RealtimeTestEnvironment;
 import org.opentripplanner.updater.trip.TripUpdateBuilder;
@@ -181,8 +178,7 @@ private static void assertNewTripTimesIsUpdated(
     RealtimeTestEnvironment env,
     FeedScopedId tripId
   ) {
-    var originalTripPattern = env.getTransitService()
-      .getPatternForTrip(env.trip2);
+    var originalTripPattern = env.getTransitService().getPatternForTrip(env.trip2);
     var snapshot = env.getTimetableSnapshot();
     var originalTimetableForToday = snapshot.resolve(originalTripPattern, SERVICE_DATE);