Move helper classes

leonardehrenfried · leonardehrenfried · commit 58eb2ac861b6 · 2026-06-22T12:26:35.000+02:00
diff --git a/application/src/test-fixtures/java/org/opentripplanner/updater/trip/gtfs/GtfsRtTestHelper.java b/application/src/test-fixtures/java/org/opentripplanner/updater/trip/gtfs/GtfsRtTestHelper.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.updater.trip;
+package org.opentripplanner.updater.trip.gtfs;
 
 import static org.opentripplanner.updater.trip.UpdateIncrementality.FULL_DATASET;
 
@@ -8,9 +8,7 @@
 import org.opentripplanner.core.framework.deduplicator.DeduplicatorService;
 import org.opentripplanner.transit.model.TransitTestEnvironment;
 import org.opentripplanner.updater.spi.UpdateResult;
-import org.opentripplanner.updater.trip.gtfs.BackwardsDelayPropagationType;
-import org.opentripplanner.updater.trip.gtfs.ForwardsDelayPropagationType;
-import org.opentripplanner.updater.trip.gtfs.GtfsRealTimeTripUpdateAdapter;
+import org.opentripplanner.updater.trip.UpdateIncrementality;
 
 public class GtfsRtTestHelper {
 
diff --git a/application/src/test-fixtures/java/org/opentripplanner/updater/trip/gtfs/TripUpdateBuilder.java b/application/src/test-fixtures/java/org/opentripplanner/updater/trip/gtfs/TripUpdateBuilder.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.updater.trip;
+package org.opentripplanner.updater.trip.gtfs;
 
 import com.google.transit.realtime.GtfsRealtime;
 import com.google.transit.realtime.GtfsRealtime.TripUpdate.StopTimeUpdate;
diff --git a/application/src/test-fixtures/java/org/opentripplanner/updater/trip/siri/SiriTestHelper.java b/application/src/test-fixtures/java/org/opentripplanner/updater/trip/siri/SiriTestHelper.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.updater.trip;
+package org.opentripplanner.updater.trip.siri;
 
 import static org.opentripplanner.updater.trip.UpdateIncrementality.DIFFERENTIAL;
 
@@ -8,8 +8,6 @@
 import org.opentripplanner.transit.model.TransitTestEnvironment;
 import org.opentripplanner.updater.DefaultRealTimeUpdateContext;
 import org.opentripplanner.updater.spi.UpdateResult;
-import org.opentripplanner.updater.trip.siri.SiriEtBuilder;
-import org.opentripplanner.updater.trip.siri.SiriRealTimeTripUpdateAdapter;
 import org.opentripplanner.updater.trip.siri.updater.EstimatedTimetableHandler;
 import uk.org.siri.siri21.EstimatedTimetableDeliveryStructure;
 
diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/service/ApiTransitServiceTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/service/ApiTransitServiceTest.java
@@ -24,8 +24,8 @@
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.service.ArrivalDeparture;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
-import org.opentripplanner.updater.trip.TripUpdateBuilder;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
+import org.opentripplanner.updater.trip.gtfs.TripUpdateBuilder;
 
 /**
  * This test uses the real-time test environment to establish the condition under test.
diff --git a/application/src/test/java/org/opentripplanner/transit/service/ReplacementHelperTest.java b/application/src/test/java/org/opentripplanner/transit/service/ReplacementHelperTest.java
@@ -19,7 +19,7 @@
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.model.timetable.TripOnServiceDate;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
-import org.opentripplanner.updater.trip.SiriTestHelper;
+import org.opentripplanner.updater.trip.siri.SiriTestHelper;
 
 public class ReplacementHelperTest implements RealtimeTestConstants {
 
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/TripTimesUpdaterTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/TripTimesUpdaterTest.java
@@ -39,7 +39,6 @@
 import org.opentripplanner.transit.model.timetable.TripTimes;
 import org.opentripplanner.transit.service.TimetableRepository;
 import org.opentripplanner.updater.spi.UpdateErrorType;
-import org.opentripplanner.updater.trip.TripUpdateBuilder;
 import org.opentripplanner.updater.trip.gtfs.model.TripUpdate;
 import org.opentripplanner.utils.time.TimeUtils;
 
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/AddedOnServiceDateTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/AddedOnServiceDateTest.java
@@ -15,9 +15,9 @@
 import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
-import org.opentripplanner.updater.trip.TripUpdateBuilder;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
+import org.opentripplanner.updater.trip.gtfs.TripUpdateBuilder;
 
 class AddedOnServiceDateTest implements RealtimeTestConstants {
 
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/AddedTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/AddedTest.java
@@ -26,9 +26,9 @@
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.service.TransitService;
 import org.opentripplanner.updater.spi.UpdateSuccess;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
-import org.opentripplanner.updater.trip.TripUpdateBuilder;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
+import org.opentripplanner.updater.trip.gtfs.TripUpdateBuilder;
 import org.opentripplanner.utils.time.TimeUtils;
 
 class AddedTest implements RealtimeTestConstants {
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/AddedThenRemovedTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/AddedThenRemovedTest.java
@@ -11,8 +11,8 @@
 import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
 
 class AddedThenRemovedTest implements RealtimeTestConstants {
 
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/ReplacementTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/ReplacementTest.java
@@ -13,8 +13,8 @@
 import org.opentripplanner.core.model.i18n.I18NString;
 import org.opentripplanner.transit.model.TransitTestEnvironment;
 import org.opentripplanner.transit.model.TripInput;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
 
 public class ReplacementTest implements RealtimeTestConstants {
 
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/TripAlreadyExistsTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/TripAlreadyExistsTest.java
@@ -9,8 +9,8 @@
 import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
 
 class TripAlreadyExistsTest implements RealtimeTestConstants {
 
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/cancellation/CancelAfterPatternChangeTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/cancellation/CancelAfterPatternChangeTest.java
@@ -14,8 +14,8 @@
 import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
 
 /**
  * Test canceling a trip after a pattern change (skipped stop). This exercises the revert path
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/cancellation/CanceledTripTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/cancellation/CanceledTripTest.java
@@ -11,8 +11,8 @@
 import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
 
 public class CanceledTripTest implements RealtimeTestConstants {
 
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/cancellation/CancellationDeletionTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/cancellation/CancellationDeletionTest.java
@@ -18,8 +18,8 @@
 import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
 
 /**
  * Cancellations and deletions should end up in the internal data model and make trips unavailable
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/delay/AssignedStopIdsTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/delay/AssignedStopIdsTest.java
@@ -13,8 +13,8 @@
 import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
 
 /**
  * Tests updating and reverting the stops/platforms for existing trips.
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/delay/CircularRouteStopIdTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/delay/CircularRouteStopIdTest.java
@@ -8,8 +8,8 @@
 import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
 
 class CircularRouteStopIdTest implements RealtimeTestConstants {
 
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/delay/DelayedTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/delay/DelayedTest.java
@@ -11,8 +11,8 @@
 import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
 
 /**
  * Delays should be applied to the first trip but should leave the second trip untouched.
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/delay/SkippedTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/delay/SkippedTest.java
@@ -17,8 +17,8 @@
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.TripTimesStringBuilder;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
 
 /**
  * A mixture of delayed and skipped stops should result in both delayed and cancelled stops.
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/delay/SkippedWithRepeatedTimesTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/delay/SkippedWithRepeatedTimesTest.java
@@ -8,8 +8,8 @@
 import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
 
 /**
  * Tests that stops can be SKIPPED for a trip which repeats times for consecutive stops.
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/propagation/BackwardsEarlinessPropagationCancellationTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/propagation/BackwardsEarlinessPropagationCancellationTest.java
@@ -11,8 +11,8 @@
 import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
 
 class BackwardsEarlinessPropagationCancellationTest implements RealtimeTestConstants {
 
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/propagation/BackwardsEarlinessPropagationTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/propagation/BackwardsEarlinessPropagationTest.java
@@ -8,8 +8,8 @@
 import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
 
 class BackwardsEarlinessPropagationTest implements RealtimeTestConstants {
 
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/propagation/NoArrivalTimeTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/propagation/NoArrivalTimeTest.java
@@ -8,8 +8,8 @@
 import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
 
 class NoArrivalTimeTest implements RealtimeTestConstants {
 
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/rejection/InvalidInputTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/rejection/InvalidInputTest.java
@@ -13,9 +13,9 @@
 import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
-import org.opentripplanner.updater.trip.TripUpdateBuilder;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
+import org.opentripplanner.updater.trip.gtfs.TripUpdateBuilder;
 
 /**
  * A trip with start date that is outside the service period shouldn't throw an exception and is
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/rejection/InvalidNewStopSequenceTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/rejection/InvalidNewStopSequenceTest.java
@@ -11,8 +11,8 @@
 import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
 
 /**
  * Stop sequences must start at 0 or more and be increasing.
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/rejection/InvalidScheduledStopSequenceTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/rejection/InvalidScheduledStopSequenceTest.java
@@ -8,8 +8,8 @@
 import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
 
 /**
  * Stop sequences must start at 0 or more and be increasing.
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/rejection/InvalidStopRefTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/rejection/InvalidStopRefTest.java
@@ -11,8 +11,8 @@
 import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
 
 class InvalidStopRefTest implements RealtimeTestConstants {
 
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/rejection/InvalidTripIdTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/rejection/InvalidTripIdTest.java
@@ -9,7 +9,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.opentripplanner.transit.model.TransitTestEnvironment;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
 
 class InvalidTripIdTest {
 
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/rejection/MalformedStartDateTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/rejection/MalformedStartDateTest.java
@@ -8,8 +8,8 @@
 import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
 
 /**
  * Start dates that don't adhere to the format will be rejected.
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/rejection/TooManyStopsTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/rejection/TooManyStopsTest.java
@@ -8,8 +8,8 @@
 import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
 
 class TooManyStopsTest implements RealtimeTestConstants {
 
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/cancellation/CancelAllStopsTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/cancellation/CancelAllStopsTest.java
@@ -9,7 +9,7 @@
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
-import org.opentripplanner.updater.trip.SiriTestHelper;
+import org.opentripplanner.updater.trip.siri.SiriTestHelper;
 
 /**
  * Cancelling all individual stops (as opposed to journey-level cancellation) should result in an
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/cancellation/CancellationTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/cancellation/CancellationTest.java
@@ -14,8 +14,8 @@
 import org.opentripplanner.transit.model.organization.Operator;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
-import org.opentripplanner.updater.trip.SiriTestHelper;
 import org.opentripplanner.updater.trip.siri.SiriEtBuilder;
+import org.opentripplanner.updater.trip.siri.SiriTestHelper;
 
 class CancellationTest implements RealtimeTestConstants {
 
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/cancellation/CancelledRecordedCallTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/cancellation/CancelledRecordedCallTest.java
@@ -9,7 +9,7 @@
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
-import org.opentripplanner.updater.trip.SiriTestHelper;
+import org.opentripplanner.updater.trip.siri.SiriTestHelper;
 
 class CancelledRecordedCallTest implements RealtimeTestConstants {
 
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/cancellation/CancelledStopCrossPatternTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/cancellation/CancelledStopCrossPatternTest.java
@@ -8,7 +8,7 @@
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
-import org.opentripplanner.updater.trip.SiriTestHelper;
+import org.opentripplanner.updater.trip.siri.SiriTestHelper;
 
 /**
  * Test that cancelling the same stop on two trips from different routes (but with the same stop
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/cancellation/CancelledStopOnDelayedTripTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/cancellation/CancelledStopOnDelayedTripTest.java
@@ -9,7 +9,7 @@
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
-import org.opentripplanner.updater.trip.SiriTestHelper;
+import org.opentripplanner.updater.trip.siri.SiriTestHelper;
 
 /**
  * Tests that a cancelled stop on a delayed trip gets correct real-time times applied.
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/cancellation/CancelledStopTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/cancellation/CancelledStopTest.java
@@ -9,7 +9,7 @@
 import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
-import org.opentripplanner.updater.trip.SiriTestHelper;
+import org.opentripplanner.updater.trip.siri.SiriTestHelper;
 
 class CancelledStopTest implements RealtimeTestConstants {
 
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extracall/ExtraCallTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extracall/ExtraCallTest.java
@@ -14,8 +14,8 @@
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.updater.spi.UpdateErrorType;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
-import org.opentripplanner.updater.trip.SiriTestHelper;
 import org.opentripplanner.updater.trip.siri.SiriEtBuilder;
+import org.opentripplanner.updater.trip.siri.SiriTestHelper;
 import uk.org.siri.siri21.EstimatedTimetableDeliveryStructure;
 
 class ExtraCallTest implements RealtimeTestConstants {
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extrajourney/ExtraJourneyTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extrajourney/ExtraJourneyTest.java
@@ -26,8 +26,8 @@
 import org.opentripplanner.transit.service.TransitService;
 import org.opentripplanner.updater.spi.UpdateErrorType;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
-import org.opentripplanner.updater.trip.SiriTestHelper;
 import org.opentripplanner.updater.trip.siri.SiriEtBuilder;
+import org.opentripplanner.updater.trip.siri.SiriTestHelper;
 import uk.org.siri.siri21.OccupancyEnumeration;
 import uk.org.siri.siri21.VehicleModesEnumeration;
 
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extrajourney/ExtraThenCanceledJourneyTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extrajourney/ExtraThenCanceledJourneyTest.java
@@ -13,8 +13,8 @@
 import org.opentripplanner.transit.model.organization.Operator;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
-import org.opentripplanner.updater.trip.SiriTestHelper;
 import org.opentripplanner.updater.trip.siri.SiriEtBuilder;
+import org.opentripplanner.updater.trip.siri.SiriTestHelper;
 import uk.org.siri.siri21.EstimatedTimetableDeliveryStructure;
 
 class ExtraThenCanceledJourneyTest implements RealtimeTestConstants {
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/fuzzymatching/FuzzyTripMatchingTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/fuzzymatching/FuzzyTripMatchingTest.java
@@ -12,7 +12,7 @@
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.updater.spi.UpdateErrorType;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
-import org.opentripplanner.updater.trip.SiriTestHelper;
+import org.opentripplanner.updater.trip.siri.SiriTestHelper;
 import uk.org.siri.siri21.VehicleModesEnumeration;
 
 class FuzzyTripMatchingTest implements RealtimeTestConstants {
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/rejection/InvalidCallsTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/rejection/InvalidCallsTest.java
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/rejection/InvalidStopPointRefTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/rejection/InvalidStopPointRefTest.java
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/rejection/MissingCallOrderTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/rejection/MissingCallOrderTest.java
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/rejection/NegativeTimesTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/rejection/NegativeTimesTest.java
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/rejection/NotMonitoredTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/rejection/NotMonitoredTest.java
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/update/ArrivalStatusTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/update/ArrivalStatusTest.java
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/update/BoardingActivityWithCoordinateWithDriverTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/update/BoardingActivityWithCoordinateWithDriverTest.java
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/update/DestinationDisplayTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/update/DestinationDisplayTest.java
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/update/MultiTripPatternTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/update/MultiTripPatternTest.java
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/update/QuayChangeTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/update/QuayChangeTest.java
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/update/ReEnabledStopTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/update/ReEnabledStopTest.java
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/update/UpdatedTimesTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/update/UpdatedTimesTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.opentripplanner.updater.trip;`
	`1`	`+package org.opentripplanner.updater.trip.gtfs;`
`2`	`2`
`3`	`3`	`import com.google.transit.realtime.GtfsRealtime;`
`4`	`4`	`import com.google.transit.realtime.GtfsRealtime.TripUpdate.StopTimeUpdate;`