move testFromTripTimesWithScheduleFallback to TripTimeOnDateTest and use a simpler transitservice setup

Author: tkalvas

application/src/test/java/org/opentripplanner/model/TripTimeOnDateTest.java

@@ -2,15 +2,23 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.time.Instant;
+import java.time.LocalDate;
 import java.time.LocalTime;
 import org.junit.jupiter.api.Test;
+import org.opentripplanner._support.time.ZoneIds;
 import org.opentripplanner.model.plan.PlanTestConstants;
 import org.opentripplanner.transit.model._data.TimetableRepositoryForTest;
 import org.opentripplanner.transit.model.basic.TransitMode;
 import org.opentripplanner.transit.model.framework.Deduplicator;
+import org.opentripplanner.transit.model.timetable.ScheduledTripTimes;
 import org.opentripplanner.transit.model.timetable.TripTimesFactory;
+import org.opentripplanner.transit.service.DefaultTransitService;
+import org.opentripplanner.transit.service.TimetableRepository;
+import org.opentripplanner.utils.time.ServiceDateUtils;
 
 class TripTimeOnDateTest implements PlanTestConstants {
 
@@ -50,4 +58,45 @@ void isRecordedStop() {
 
     assertTrue(subject.isRecordedStop());
   }
+
+  @Test
+  void testFromTripTimesWithScheduleFallback() {
+    var testModel = TimetableRepositoryForTest.of();
+    var trip = TimetableRepositoryForTest.trip("123").build();
+    var siteRepository = testModel.siteRepositoryBuilder().build();
+    var timetableRepository = new TimetableRepository(siteRepository, new Deduplicator());
+    var tripTimes = ScheduledTripTimes.of()
+      .withTrip(trip)
+      .withDepartureTimes(new int [] { 0, 1 })
+      .build();
+    var tripPattern = testModel.pattern(TransitMode.BUS)
+      .withScheduledTimeTableBuilder(builder -> builder.addTripTimes(tripTimes))
+      .build();
+    timetableRepository.addTripPattern(tripPattern.getId(), tripPattern);
+    timetableRepository.index();
+    var timetableSnapshot = new TimetableSnapshot();
+    timetableSnapshot.commit();
+    var transitService = new DefaultTransitService(timetableRepository, timetableSnapshot);
+    var serviceDate = LocalDate.of(2025, 1, 1);
+    // Construct a timetable which definitely does not contain this trip, because it is empty.
+    Timetable timetable = Timetable.of()
+      .withTripPattern(tripPattern)
+      .withServiceDate(serviceDate)
+      .build();
+    Instant midnight = ServiceDateUtils.asStartOfService(
+      serviceDate,
+      ZoneIds.HELSINKI
+    ).toInstant();
+    var tripTimeOnDates = TripTimeOnDate.fromTripTimesWithScheduleFallback(
+      timetable,
+      trip,
+      serviceDate,
+      midnight,
+      transitService
+    );
+    for (var tripTimeOnDate : tripTimeOnDates) {
+      assertNull(tripTimeOnDate.getServiceDay());
+      assertEquals(tripTimeOnDate.getServiceDayMidnight(), TripTimeOnDate.UNDEFINED);
+    }
+  }
 }

application/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java

@@ -1,6 +1,5 @@
 package org.opentripplanner.transit.service;
 
-import static com.google.common.truth.Truth.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.opentripplanner.transit.model.basic.TransitMode.BUS;
@@ -19,7 +18,6 @@
 import org.opentripplanner.framework.i18n.I18NString;
 import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore;
 import org.opentripplanner.model.RealTimeTripUpdate;
-import org.opentripplanner.model.Timetable;
 import org.opentripplanner.model.TimetableSnapshot;
 import org.opentripplanner.model.TripTimeOnDate;
 import org.opentripplanner.model.calendar.CalendarServiceData;
@@ -276,28 +274,4 @@ void getRealtimeTripTimesForAddedTripOnNoServiceDay() {
     assertEquals(Optional.empty(), service.getTripTimeOnDates(ADDED_TRIP, NO_SERVICE_DATE));
   }
 
-  @Test
-  void testFromTripTimesWithScheduleFallback() {
-    TripPattern tripPattern = service.findPattern(TRIP);
-    // Construct a timetable which definitely does not contain this trip, because it is empty.
-    Timetable timetable = Timetable.of()
-      .withTripPattern(tripPattern)
-      .withServiceDate(SERVICE_DATE)
-      .build();
-    Instant midnight = ServiceDateUtils.asStartOfService(
-      SERVICE_DATE,
-      service.getTimeZone()
-    ).toInstant();
-    var tripTimeOnDates = TripTimeOnDate.fromTripTimesWithScheduleFallback(
-      timetable,
-      TRIP,
-      SERVICE_DATE,
-      midnight,
-      service
-    );
-    for (var tripTimeOnDate : tripTimeOnDates) {
-      assertThat(tripTimeOnDate.getServiceDay()).isNull();
-      assertThat(tripTimeOnDate.getServiceDayMidnight()).isEqualTo(TripTimeOnDate.UNDEFINED);
-    }
-  }
 }