Refactor unit tests

Author: vpaturet

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

@@ -205,8 +205,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

@@ -59,19 +59,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
@@ -163,7 +163,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();
@@ -360,7 +360,7 @@ public void scheduled() {
         scheduledTripId,
         SERVICE_DATE,
         SCHEDULED,
-        transitModel.getTimeZone()
+        transitService.getTimeZone()
       )
         .addDelayedStopTime(1, 0)
         .addDelayedStopTime(2, 60, 80)
@@ -435,7 +435,7 @@ public void scheduledTripWithSkippedAndNoData() {
         scheduledTripId,
         SERVICE_DATE,
         SCHEDULED,
-        transitModel.getTimeZone()
+        transitService.getTimeZone()
       )
         .addNoDataStop(1)
         .addSkippedStop(2)
@@ -565,7 +565,7 @@ public void addedTrip() {
         addedTripId,
         SERVICE_DATE,
         ADDED,
-        transitModel.getTimeZone()
+        transitService.getTimeZone()
       );
 
       builder.addStopTime("A", 30).addStopTime("C", 40).addStopTime("E", 55);
@@ -592,7 +592,7 @@ private TripPattern assertAddedTrip(
       String tripId,
       TimetableSnapshotSource updater
     ) {
-      var stopA = transitModel.getStopModel().getRegularStop(new FeedScopedId(feedId, "A"));
+      var stopA = transitService.getRegularStop(new FeedScopedId(feedId, "A"));
       // Get the trip pattern of the added trip which goes through stopA
       var snapshot = updater.getTimetableSnapshot();
       var patternsAtA = snapshot.getPatternsForStop(stopA);
@@ -629,7 +629,7 @@ public void addedTripWithNewRoute() {
         addedTripId,
         SERVICE_DATE,
         ADDED,
-        transitModel.getTimeZone()
+        transitService.getTimeZone()
       );
       // add extension to set route name, url, mode
       builder.addTripExtension();
@@ -680,7 +680,7 @@ public void addedWithUnknownStop() {
         addedTripId,
         SERVICE_DATE,
         ADDED,
-        transitModel.getTimeZone()
+        transitService.getTimeZone()
       );
       // add extension to set route name, url, mode
       builder.addTripExtension();
@@ -722,7 +722,7 @@ public void repeatedlyAddedTripWithNewRoute() {
         addedTripId,
         SERVICE_DATE,
         ADDED,
-        transitModel.getTimeZone()
+        transitService.getTimeZone()
       );
       // add extension to set route name, url, mode
       builder.addTripExtension();