gtfsFiles
) {
// GTFS
- var gtfsBundles = gtfsFiles.stream().map(GtfsBundle::forTest).toList();
+ var gtfsBundles = gtfsFiles.stream().map(GtfsBundleTestFactory::forTest).toList();
GtfsModule gtfsModule = GtfsModule.forTest(
gtfsBundles,
timetableRepository,
diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java
index cacad4ee6fb..869986b7ad1 100644
--- a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java
+++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java
@@ -10,6 +10,7 @@
import org.opentripplanner.TestOtpModel;
import org.opentripplanner.framework.application.OTPFeature;
import org.opentripplanner.gtfs.graphbuilder.GtfsBundle;
+import org.opentripplanner.gtfs.graphbuilder.GtfsBundleTestFactory;
import org.opentripplanner.gtfs.graphbuilder.GtfsModule;
import org.opentripplanner.model.calendar.ServiceDateInterval;
import org.opentripplanner.routing.graph.Graph;
@@ -44,7 +45,7 @@ private static TestOtpModel buildFlexGraph(File file) {
var deduplicator = new Deduplicator();
var graph = new Graph(deduplicator);
var timetableRepository = new TimetableRepository(new SiteRepository(), deduplicator);
- GtfsBundle gtfsBundle = GtfsBundle.forTest(file);
+ GtfsBundle gtfsBundle = GtfsBundleTestFactory.forTest(file);
GtfsModule module = GtfsModule.forTest(
List.of(gtfsBundle),
timetableRepository,
diff --git a/application/src/main/java/org/opentripplanner/datastore/configure/DataStoreModule.java b/application/src/main/java/org/opentripplanner/datastore/configure/DataStoreModule.java
index c6dcb706cac..3fdabe98db3 100644
--- a/application/src/main/java/org/opentripplanner/datastore/configure/DataStoreModule.java
+++ b/application/src/main/java/org/opentripplanner/datastore/configure/DataStoreModule.java
@@ -4,21 +4,16 @@
import dagger.Provides;
import jakarta.inject.Singleton;
import java.io.File;
-import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import javax.annotation.Nullable;
import org.opentripplanner.datastore.OtpDataStore;
import org.opentripplanner.datastore.api.CompositeDataSource;
-import org.opentripplanner.datastore.api.DataSource;
import org.opentripplanner.datastore.api.FileType;
import org.opentripplanner.datastore.api.GoogleStorageDSRepository;
import org.opentripplanner.datastore.api.OtpBaseDirectory;
import org.opentripplanner.datastore.api.OtpDataStoreConfig;
-import org.opentripplanner.datastore.base.ByteArrayDataSource;
import org.opentripplanner.datastore.base.DataSourceRepository;
-import org.opentripplanner.datastore.base.ListCompositeDataSource;
import org.opentripplanner.datastore.file.FileDataSourceRepository;
import org.opentripplanner.datastore.https.HttpsDataSourceRepository;
@@ -48,36 +43,6 @@ public static CompositeDataSource compositeSource(File file, FileType type) {
return FileDataSourceRepository.compositeSource(file, type);
}
- /**
- * For test only.
- *
- * Use this to get a composite data source. Pass in all child data sources.
- */
- public static CompositeDataSource compositeSource(
- String name,
- FileType type,
- DataSource... children
- ) {
- return new ListCompositeDataSource(name, type, Arrays.asList(children));
- }
-
- /**
- * For test only.
- *
- * Use this to create a read-only data source backed by the given {@code content} string.
- */
- public static DataSource dataSource(String name, FileType type, String content) {
- var buf = content.getBytes(StandardCharsets.UTF_8);
- return new ByteArrayDataSource(
- name,
- name,
- type,
- buf.length,
- System.currentTimeMillis(),
- false
- ).withBytes(buf);
- }
-
/**
* Connect to data source and prepare to retrieve data.
*/
diff --git a/application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsBundle.java b/application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsBundle.java
index 696ccc2a546..51e37f80f70 100644
--- a/application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsBundle.java
+++ b/application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsBundle.java
@@ -1,13 +1,9 @@
package org.opentripplanner.gtfs.graphbuilder;
-import java.io.File;
import java.io.InputStream;
import javax.annotation.Nullable;
import org.onebusaway.csv_entities.CsvInputSource;
import org.opentripplanner.datastore.api.CompositeDataSource;
-import org.opentripplanner.datastore.api.FileType;
-import org.opentripplanner.datastore.configure.DataStoreModule;
-import org.opentripplanner.gtfs.config.GtfsDefaultParameters;
import org.opentripplanner.gtfs.config.GtfsFeedParameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,21 +30,6 @@ public GtfsBundle(CompositeDataSource dataSource, GtfsFeedParameters parameters)
this.feedId = parameters.feedId();
}
- /** Used by unit tests */
- public static GtfsBundle forTest(File gtfsFile, @Nullable String feedId) {
- var dataSource = DataStoreModule.compositeSource(gtfsFile, FileType.GTFS);
- var parameters = GtfsDefaultParameters.DEFAULT.withFeedInfo()
- .withSource(dataSource.uri())
- .withFeedId(feedId)
- .build();
- return new GtfsBundle(dataSource, parameters);
- }
-
- /** Used by unit tests */
- public static GtfsBundle forTest(File gtfsFile) {
- return forTest(gtfsFile, null);
- }
-
/**
* So that we can load multiple gtfs feeds into the same database.
*/
diff --git a/application/src/test-fixtures/java/org/opentripplanner/datastore/api/DataSourceTestFactory.java b/application/src/test-fixtures/java/org/opentripplanner/datastore/api/DataSourceTestFactory.java
new file mode 100644
index 00000000000..805f01e231f
--- /dev/null
+++ b/application/src/test-fixtures/java/org/opentripplanner/datastore/api/DataSourceTestFactory.java
@@ -0,0 +1,46 @@
+package org.opentripplanner.datastore.api;
+
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import org.opentripplanner.datastore.OtpDataStore;
+import org.opentripplanner.datastore.base.ByteArrayDataSource;
+import org.opentripplanner.datastore.file.FileDataSourceRepository;
+
+public class DataSourceTestFactory {
+
+ /**
+ * Use this to get a composite data source, bypassing the {@link OtpDataStore}.
+ */
+ public static CompositeDataSource compositeSource(File file, FileType type) {
+ return FileDataSourceRepository.compositeSource(file, type);
+ }
+
+ /**
+ * Use this to create a read-only data source backed by the given {@code content} string.
+ */
+ public static DataSource dataSource(String name, FileType type, String content) {
+ var buf = content.getBytes(StandardCharsets.UTF_8);
+ return new ByteArrayDataSource(
+ name,
+ name,
+ type,
+ buf.length,
+ System.currentTimeMillis(),
+ false
+ ).withBytes(buf);
+ }
+
+ /**
+ * For test only.
+ *
+ * Use this to get a composite data source. Pass in all child data sources.
+ */
+ public static CompositeDataSource compositeSource(
+ String name,
+ FileType type,
+ DataSource... children
+ ) {
+ return new ListCompositeDataSource(name, type, Arrays.asList(children));
+ }
+}
diff --git a/application/src/main/java/org/opentripplanner/datastore/base/ListCompositeDataSource.java b/application/src/test-fixtures/java/org/opentripplanner/datastore/api/ListCompositeDataSource.java
similarity index 86%
rename from application/src/main/java/org/opentripplanner/datastore/base/ListCompositeDataSource.java
rename to application/src/test-fixtures/java/org/opentripplanner/datastore/api/ListCompositeDataSource.java
index 7c965cd1766..140daddb76d 100644
--- a/application/src/main/java/org/opentripplanner/datastore/base/ListCompositeDataSource.java
+++ b/application/src/test-fixtures/java/org/opentripplanner/datastore/api/ListCompositeDataSource.java
@@ -1,11 +1,8 @@
-package org.opentripplanner.datastore.base;
+package org.opentripplanner.datastore.api;
import java.net.URI;
import java.util.Collection;
import java.util.List;
-import org.opentripplanner.datastore.api.CompositeDataSource;
-import org.opentripplanner.datastore.api.DataSource;
-import org.opentripplanner.datastore.api.FileType;
/**
* This is a simple {@link CompositeDataSource} using a list of children. It is usefull
diff --git a/application/src/test-fixtures/java/org/opentripplanner/gtfs/graphbuilder/GtfsBundleTestFactory.java b/application/src/test-fixtures/java/org/opentripplanner/gtfs/graphbuilder/GtfsBundleTestFactory.java
new file mode 100644
index 00000000000..634a1ab4474
--- /dev/null
+++ b/application/src/test-fixtures/java/org/opentripplanner/gtfs/graphbuilder/GtfsBundleTestFactory.java
@@ -0,0 +1,23 @@
+package org.opentripplanner.gtfs.graphbuilder;
+
+import java.io.File;
+import javax.annotation.Nullable;
+import org.opentripplanner.datastore.api.DataSourceTestFactory;
+import org.opentripplanner.datastore.api.FileType;
+import org.opentripplanner.gtfs.config.GtfsDefaultParameters;
+
+public class GtfsBundleTestFactory {
+
+ public static GtfsBundle forTest(File gtfsFile, @Nullable String feedId) {
+ var dataSource = DataSourceTestFactory.compositeSource(gtfsFile, FileType.GTFS);
+ var parameters = GtfsDefaultParameters.DEFAULT.withFeedInfo()
+ .withSource(dataSource.uri())
+ .withFeedId(feedId)
+ .build();
+ return new GtfsBundle(dataSource, parameters);
+ }
+
+ public static GtfsBundle forTest(File gtfsFile) {
+ return forTest(gtfsFile, null);
+ }
+}
diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/linking/TestVertexLinker.java b/application/src/test-fixtures/java/org/opentripplanner/routing/linking/VertexLinkerTestFactory.java
similarity index 59%
rename from application/src/test/java/org/opentripplanner/graph_builder/module/linking/TestVertexLinker.java
rename to application/src/test-fixtures/java/org/opentripplanner/routing/linking/VertexLinkerTestFactory.java
index e303121dde9..fd4f7492cf5 100644
--- a/application/src/test/java/org/opentripplanner/graph_builder/module/linking/TestVertexLinker.java
+++ b/application/src/test-fixtures/java/org/opentripplanner/routing/linking/VertexLinkerTestFactory.java
@@ -1,11 +1,9 @@
-package org.opentripplanner.graph_builder.module.linking;
+package org.opentripplanner.routing.linking;
import org.opentripplanner.routing.graph.Graph;
-import org.opentripplanner.routing.linking.VertexLinker;
-import org.opentripplanner.routing.linking.VisibilityMode;
import org.opentripplanner.street.model.StreetConstants;
-public class TestVertexLinker {
+public class VertexLinkerTestFactory {
public static VertexLinker of(Graph graph) {
return new VertexLinker(
diff --git a/application/src/test/java/org/opentripplanner/ConstantsForTests.java b/application/src/test/java/org/opentripplanner/ConstantsForTests.java
index a6ec43f480c..fef09ec32de 100644
--- a/application/src/test/java/org/opentripplanner/ConstantsForTests.java
+++ b/application/src/test/java/org/opentripplanner/ConstantsForTests.java
@@ -19,11 +19,10 @@
import org.opentripplanner.graph_builder.module.DirectTransferGenerator;
import org.opentripplanner.graph_builder.module.TestStreetLinkerModule;
import org.opentripplanner.graph_builder.module.TurnRestrictionModule;
-import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
import org.opentripplanner.graph_builder.module.ned.ElevationModule;
import org.opentripplanner.graph_builder.module.ned.GeotiffGridCoverageFactoryImpl;
import org.opentripplanner.graph_builder.module.osm.OsmModule;
-import org.opentripplanner.gtfs.graphbuilder.GtfsBundle;
+import org.opentripplanner.gtfs.graphbuilder.GtfsBundleTestFactory;
import org.opentripplanner.gtfs.graphbuilder.GtfsModule;
import org.opentripplanner.model.calendar.ServiceDateInterval;
import org.opentripplanner.model.impl.OtpTransitServiceBuilder;
@@ -34,6 +33,7 @@
import org.opentripplanner.routing.fares.FareServiceFactory;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.linking.VertexLinker;
+import org.opentripplanner.routing.linking.VertexLinkerTestFactory;
import org.opentripplanner.service.osminfo.internal.DefaultOsmInfoGraphBuildRepository;
import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository;
import org.opentripplanner.service.vehiclerental.model.RentalVehicleType;
@@ -326,7 +326,7 @@ public static void addGtfsToGraph(
FareServiceFactory fareServiceFactory,
@Nullable String feedId
) {
- var bundle = GtfsBundle.forTest(file, feedId);
+ var bundle = GtfsBundleTestFactory.forTest(file, feedId);
var module = new GtfsModule(
List.of(bundle),
@@ -347,7 +347,7 @@ public static void addGtfsToGraph(
private static void addPortlandVehicleRentals(Graph graph) {
try {
- VertexLinker linker = TestVertexLinker.of(graph);
+ VertexLinker linker = VertexLinkerTestFactory.of(graph);
CsvReader reader = new CsvReader(PORTLAND_BIKE_SHARE_CSV, ',', StandardCharsets.UTF_8);
reader.readHeaders();
while (reader.readRecord()) {
diff --git a/application/src/test/java/org/opentripplanner/GtfsTest.java b/application/src/test/java/org/opentripplanner/GtfsTest.java
index 1c3cea300bc..f41ca2fa0b6 100644
--- a/application/src/test/java/org/opentripplanner/GtfsTest.java
+++ b/application/src/test/java/org/opentripplanner/GtfsTest.java
@@ -24,6 +24,7 @@
import org.opentripplanner.api.common.LocationStringParser;
import org.opentripplanner.ext.fares.impl.gtfs.DefaultFareService;
import org.opentripplanner.gtfs.graphbuilder.GtfsBundle;
+import org.opentripplanner.gtfs.graphbuilder.GtfsBundleTestFactory;
import org.opentripplanner.gtfs.graphbuilder.GtfsModule;
import org.opentripplanner.model.TimetableSnapshot;
import org.opentripplanner.model.calendar.ServiceDateInterval;
@@ -194,7 +195,7 @@ protected void setUp() throws Exception {
File gtfs = new File("src/test/resources/" + getFeedName());
File gtfsRealTime = new File("src/test/resources/" + getFeedName() + ".pb");
- GtfsBundle gtfsBundle = GtfsBundle.forTest(gtfs, FEED_ID);
+ GtfsBundle gtfsBundle = GtfsBundleTestFactory.forTest(gtfs, FEED_ID);
List gtfsBundleList = List.of(gtfsBundle);
alertsUpdateHandler = new AlertsUpdateHandler(false);
diff --git a/application/src/test/java/org/opentripplanner/TestServerContext.java b/application/src/test/java/org/opentripplanner/TestServerContext.java
index 9a96122d67f..2a450f19da7 100644
--- a/application/src/test/java/org/opentripplanner/TestServerContext.java
+++ b/application/src/test/java/org/opentripplanner/TestServerContext.java
@@ -10,7 +10,6 @@
import org.opentripplanner.ext.emission.internal.DefaultEmissionRepository;
import org.opentripplanner.ext.emission.internal.DefaultEmissionService;
import org.opentripplanner.ext.emission.internal.itinerary.EmissionItineraryDecorator;
-import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
import org.opentripplanner.raptor.configure.RaptorConfig;
import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator;
import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule;
@@ -18,6 +17,7 @@
import org.opentripplanner.routing.fares.FareService;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.linking.VertexLinker;
+import org.opentripplanner.routing.linking.VertexLinkerTestFactory;
import org.opentripplanner.routing.via.ViaCoordinateTransferFactory;
import org.opentripplanner.routing.via.service.DefaultViaCoordinateTransferFactory;
import org.opentripplanner.service.realtimevehicles.RealtimeVehicleService;
@@ -127,7 +127,7 @@ public static OtpServerRequestContext createServerContext(
}
private static VertexLinker createVertexLinker(Graph graph) {
- return TestVertexLinker.of(graph);
+ return VertexLinkerTestFactory.of(graph);
}
/** Static factory method to create a service for test purposes. */
@@ -169,7 +169,7 @@ public static ViaCoordinateTransferFactory createViaTransferResolver(
) {
return new DefaultViaCoordinateTransferFactory(
graph,
- TestVertexLinker.of(graph),
+ VertexLinkerTestFactory.of(graph),
transitService,
Duration.ofMinutes(30)
);
diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java
index 2b7f0769c23..96cf55332fb 100644
--- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java
+++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java
@@ -30,7 +30,6 @@
import org.opentripplanner.apis.gtfs.TestRoutingService;
import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
import org.opentripplanner.ext.fares.impl.gtfs.DefaultFareService;
-import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
import org.opentripplanner.model.plan.PlanTestConstants;
import org.opentripplanner.routing.api.request.RouteRequest;
import org.opentripplanner.routing.api.request.preference.TimeSlopeSafetyTriangle;
@@ -38,6 +37,7 @@
import org.opentripplanner.routing.api.request.preference.VehicleParkingPreferences;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.graphfinder.GraphFinder;
+import org.opentripplanner.routing.linking.VertexLinkerTestFactory;
import org.opentripplanner.service.realtimevehicles.internal.DefaultRealtimeVehicleService;
import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository;
import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingService;
@@ -72,7 +72,7 @@ class LegacyRouteRequestMapperTest implements PlanTestConstants {
SchemaFactory.createSchemaWithDefaultInjection(routeRequest),
GraphFinder.getInstance(
graph,
- TestVertexLinker.of(graph),
+ VertexLinkerTestFactory.of(graph),
transitService::findRegularStopsByBoundingBox
),
routeRequest
diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/_RouteRequestTestContext.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/_RouteRequestTestContext.java
index 4142a957c8a..a9df9a2b097 100644
--- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/_RouteRequestTestContext.java
+++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/_RouteRequestTestContext.java
@@ -18,10 +18,10 @@
import org.opentripplanner.apis.gtfs.SchemaFactory;
import org.opentripplanner.apis.gtfs.TestRoutingService;
import org.opentripplanner.ext.fares.impl.gtfs.DefaultFareService;
-import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
import org.opentripplanner.routing.api.request.RouteRequest;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.graphfinder.GraphFinder;
+import org.opentripplanner.routing.linking.VertexLinkerTestFactory;
import org.opentripplanner.service.realtimevehicles.internal.DefaultRealtimeVehicleService;
import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository;
import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingService;
@@ -68,7 +68,7 @@ public _RouteRequestTestContext(Locale locale) {
SchemaFactory.createSchemaWithDefaultInjection(routeRequest),
GraphFinder.getInstance(
graph,
- TestVertexLinker.of(graph),
+ VertexLinkerTestFactory.of(graph),
transitService::findRegularStopsByBoundingBox
),
routeRequest
diff --git a/application/src/test/java/org/opentripplanner/datastore/base/ListCompositeDataSourceTest.java b/application/src/test/java/org/opentripplanner/datastore/api/ListCompositeDataSourceTest.java
similarity index 83%
rename from application/src/test/java/org/opentripplanner/datastore/base/ListCompositeDataSourceTest.java
rename to application/src/test/java/org/opentripplanner/datastore/api/ListCompositeDataSourceTest.java
index a51baf55f67..ec0df63cd34 100644
--- a/application/src/test/java/org/opentripplanner/datastore/base/ListCompositeDataSourceTest.java
+++ b/application/src/test/java/org/opentripplanner/datastore/api/ListCompositeDataSourceTest.java
@@ -1,19 +1,15 @@
-package org.opentripplanner.datastore.base;
+package org.opentripplanner.datastore.api;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import java.util.List;
import org.junit.jupiter.api.Test;
-import org.opentripplanner.datastore.api.CompositeDataSource;
-import org.opentripplanner.datastore.api.DataSource;
-import org.opentripplanner.datastore.api.FileType;
-import org.opentripplanner.datastore.configure.DataStoreModule;
class ListCompositeDataSourceTest {
private static final String LEAF_NAME = "leaf";
- private static final DataSource LEAF = DataStoreModule.dataSource(
+ private static final DataSource LEAF = DataSourceTestFactory.dataSource(
LEAF_NAME,
FileType.GTFS,
"Test"
diff --git a/application/src/test/java/org/opentripplanner/framework/csv/parser/OtpCsvReaderTest.java b/application/src/test/java/org/opentripplanner/framework/csv/parser/OtpCsvReaderTest.java
index de3357703bf..7fa3c339dd3 100644
--- a/application/src/test/java/org/opentripplanner/framework/csv/parser/OtpCsvReaderTest.java
+++ b/application/src/test/java/org/opentripplanner/framework/csv/parser/OtpCsvReaderTest.java
@@ -8,8 +8,8 @@
import java.util.List;
import javax.annotation.Nullable;
import org.junit.jupiter.api.Test;
+import org.opentripplanner.datastore.api.DataSourceTestFactory;
import org.opentripplanner.datastore.api.FileType;
-import org.opentripplanner.datastore.configure.DataStoreModule;
import org.opentripplanner.framework.csv.HeadersDoNotMatch;
import org.opentripplanner.framework.csv.OtpCsvReader;
import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore;
@@ -19,7 +19,7 @@ class OtpCsvReaderTest {
@Test
void read() throws HeadersDoNotMatch {
- var ds = DataStoreModule.dataSource(
+ var ds = DataSourceTestFactory.dataSource(
"OtpCsvReaderTest",
FileType.GTFS,
"""
diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java
index fb77bd7ccd3..a3d26c43893 100644
--- a/application/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java
+++ b/application/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java
@@ -18,10 +18,10 @@
import org.opentripplanner.framework.geometry.SphericalDistanceLibrary;
import org.opentripplanner.framework.i18n.I18NString;
import org.opentripplanner.framework.i18n.NonLocalizedString;
-import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
import org.opentripplanner.graph_builder.module.osm.OsmModule;
import org.opentripplanner.osm.DefaultOsmProvider;
import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.routing.linking.VertexLinkerTestFactory;
import org.opentripplanner.service.osminfo.internal.DefaultOsmInfoGraphBuildRepository;
import org.opentripplanner.service.osminfo.internal.DefaultOsmInfoGraphBuildService;
import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository;
@@ -126,7 +126,11 @@ void addAndLinkBoardingLocations(boolean areaVisibility, Set linkedVerti
assertEquals(0, platformVertex.getOutgoing().size());
var osmService = new DefaultOsmInfoGraphBuildService(osmInfoRepository);
- new OsmBoardingLocationsModule(graph, TestVertexLinker.of(graph), osmService).buildGraph();
+ new OsmBoardingLocationsModule(
+ graph,
+ VertexLinkerTestFactory.of(graph),
+ osmService
+ ).buildGraph();
var boardingLocations = graph.getVerticesOfType(OsmBoardingLocationVertex.class);
assertEquals(5, boardingLocations.size()); // 3 nodes connected to the street network, plus one "floating" and one area centroid created by the module
@@ -302,7 +306,7 @@ TransitStopVertex getPlatformVertex() {
new OsmBoardingLocationsModule(
graph,
- TestVertexLinker.of(graph),
+ VertexLinkerTestFactory.of(graph),
new DefaultOsmInfoGraphBuildService(osmInfoRepository)
).buildGraph();
diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/linking/TestGraph.java b/application/src/test/java/org/opentripplanner/graph_builder/module/linking/TestGraph.java
index 25d1cbb0bd5..e290e3720cc 100644
--- a/application/src/test/java/org/opentripplanner/graph_builder/module/linking/TestGraph.java
+++ b/application/src/test/java/org/opentripplanner/graph_builder/module/linking/TestGraph.java
@@ -3,6 +3,7 @@
import java.util.List;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.linking.VertexLinker;
+import org.opentripplanner.routing.linking.VertexLinkerTestFactory;
import org.opentripplanner.street.model.edge.LinkingDirection;
import org.opentripplanner.street.model.edge.StreetTransitStopLink;
import org.opentripplanner.street.model.vertex.TransitStopVertex;
@@ -67,7 +68,7 @@ public static void link(Graph graph, TimetableRepository timetableRepository) {
timetableRepository.index();
graph.index();
- VertexLinker linker = TestVertexLinker.of(graph);
+ VertexLinker linker = VertexLinkerTestFactory.of(graph);
for (TransitStopVertex tStop : graph.getVerticesOfType(TransitStopVertex.class)) {
linker.linkVertexPermanently(
diff --git a/application/src/test/java/org/opentripplanner/gtfs/graphbuilder/GtfsModuleTest.java b/application/src/test/java/org/opentripplanner/gtfs/graphbuilder/GtfsModuleTest.java
index 5d82039553f..48cfe8e0eb2 100644
--- a/application/src/test/java/org/opentripplanner/gtfs/graphbuilder/GtfsModuleTest.java
+++ b/application/src/test/java/org/opentripplanner/gtfs/graphbuilder/GtfsModuleTest.java
@@ -25,7 +25,7 @@ class GtfsModuleTest {
void addShapesForFrequencyTrips() {
var model = buildTestModel();
- var bundle = GtfsBundle.forTest(ConstantsForTests.SIMPLE_GTFS);
+ var bundle = GtfsBundleTestFactory.forTest(ConstantsForTests.SIMPLE_GTFS);
var module = GtfsModule.forTest(
List.of(bundle),
model.timetableRepository,
@@ -77,7 +77,7 @@ private static TestModels buildTestModel() {
record TestModels(Graph graph, TimetableRepository timetableRepository) {}
static GtfsBundle bundle(String feedId) {
- return GtfsBundle.forTest(
+ return GtfsBundleTestFactory.forTest(
ResourceLoader.of(GtfsModuleTest.class).file("/gtfs/interlining"),
feedId
);
diff --git a/application/src/test/java/org/opentripplanner/routing/TestHalfEdges.java b/application/src/test/java/org/opentripplanner/routing/TestHalfEdges.java
index aa128a7deaa..23e72afde8f 100644
--- a/application/src/test/java/org/opentripplanner/routing/TestHalfEdges.java
+++ b/application/src/test/java/org/opentripplanner/routing/TestHalfEdges.java
@@ -17,7 +17,6 @@
import org.opentripplanner.framework.geometry.GeometryUtils;
import org.opentripplanner.framework.i18n.NonLocalizedString;
import org.opentripplanner.graph_builder.module.TestStreetLinkerModule;
-import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
import org.opentripplanner.model.GenericLocation;
import org.opentripplanner.routing.api.request.RouteRequest;
import org.opentripplanner.routing.api.request.StreetMode;
@@ -25,6 +24,7 @@
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.linking.DisposableEdgeCollection;
import org.opentripplanner.routing.linking.SameEdgeAdjuster;
+import org.opentripplanner.routing.linking.VertexLinkerTestFactory;
import org.opentripplanner.routing.services.notes.StreetNotesService;
import org.opentripplanner.street.model.StreetTraversalPermission;
import org.opentripplanner.street.model._data.StreetModelForTest;
@@ -566,7 +566,7 @@ public void testTemporaryVerticesContainer() {
try (
var container = new TemporaryVerticesContainer(
graph,
- TestVertexLinker.of(graph),
+ VertexLinkerTestFactory.of(graph),
id -> Set.of(),
walking.from(),
walking.to(),
diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/StreetModeLinkingTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/StreetModeLinkingTest.java
index 0aecfab5999..bee6dba6754 100644
--- a/application/src/test/java/org/opentripplanner/routing/algorithm/StreetModeLinkingTest.java
+++ b/application/src/test/java/org/opentripplanner/routing/algorithm/StreetModeLinkingTest.java
@@ -23,10 +23,10 @@
import org.junit.jupiter.params.provider.MethodSource;
import org.opentripplanner.framework.geometry.GeometryUtils;
import org.opentripplanner.graph_builder.module.TestStreetLinkerModule;
-import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
import org.opentripplanner.model.GenericLocation;
import org.opentripplanner.routing.api.request.StreetMode;
import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.routing.linking.VertexLinkerTestFactory;
import org.opentripplanner.street.model.StreetTraversalPermission;
import org.opentripplanner.street.model.edge.StreetEdgeBuilder;
import org.opentripplanner.street.model.vertex.TransitStopVertex;
@@ -222,7 +222,7 @@ private void assertLinking(
LinkingTestCase expectedToStreetName,
StreetMode... streetModes
) {
- var linker = TestVertexLinker.of(graph);
+ var linker = VertexLinkerTestFactory.of(graph);
for (final StreetMode streetMode : streetModes) {
try (
var temporaryVertices = new TemporaryVerticesContainer(
diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouterTest.java
index 2ebc8c9e0f2..c4b886fdb26 100644
--- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouterTest.java
+++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouterTest.java
@@ -8,7 +8,6 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.opentripplanner.framework.geometry.WgsCoordinate;
-import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
import org.opentripplanner.model.GenericLocation;
import org.opentripplanner.routing.algorithm.GraphRoutingTest;
import org.opentripplanner.routing.api.request.RouteRequest;
@@ -16,6 +15,7 @@
import org.opentripplanner.routing.api.request.request.StreetRequest;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.graphfinder.NearbyStop;
+import org.opentripplanner.routing.linking.VertexLinkerTestFactory;
import org.opentripplanner.street.model.vertex.TransitStopVertex;
import org.opentripplanner.street.search.TemporaryVerticesContainer;
import org.opentripplanner.street.search.state.State;
@@ -260,7 +260,7 @@ private Collection findAccessEgressFromTo(
try (
var verticesContainer = new TemporaryVerticesContainer(
graph,
- TestVertexLinker.of(graph),
+ VertexLinkerTestFactory.of(graph),
id -> new DefaultTransitService(timetableRepository).findStopOrChildIds(id),
from,
to,
diff --git a/application/src/test/java/org/opentripplanner/routing/core/TemporaryVerticesContainerTest.java b/application/src/test/java/org/opentripplanner/routing/core/TemporaryVerticesContainerTest.java
index 1feb5144a58..c5f79f5a6ba 100644
--- a/application/src/test/java/org/opentripplanner/routing/core/TemporaryVerticesContainerTest.java
+++ b/application/src/test/java/org/opentripplanner/routing/core/TemporaryVerticesContainerTest.java
@@ -12,10 +12,10 @@
import org.junit.jupiter.api.Test;
import org.opentripplanner.framework.geometry.SphericalDistanceLibrary;
import org.opentripplanner.framework.i18n.I18NString;
-import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
import org.opentripplanner.model.GenericLocation;
import org.opentripplanner.routing.api.request.StreetMode;
import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.routing.linking.VertexLinkerTestFactory;
import org.opentripplanner.street.model.StreetTraversalPermission;
import org.opentripplanner.street.model._data.StreetModelForTest;
import org.opentripplanner.street.model.edge.Edge;
@@ -57,7 +57,7 @@ public void temporaryChangesRemovedOnClose() {
// When - the container is created
subject = new TemporaryVerticesContainer(
g,
- TestVertexLinker.of(g),
+ VertexLinkerTestFactory.of(g),
id -> List.of(),
from,
to,
diff --git a/application/src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java b/application/src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java
index 952e6203814..7226b34195c 100644
--- a/application/src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java
+++ b/application/src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java
@@ -7,8 +7,8 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.locationtech.jts.geom.Coordinate;
-import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
import org.opentripplanner.routing.algorithm.GraphRoutingTest;
+import org.opentripplanner.routing.linking.VertexLinkerTestFactory;
import org.opentripplanner.service.vehicleparking.model.VehicleParking;
import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex;
import org.opentripplanner.street.model.StreetTraversalPermission;
@@ -111,7 +111,10 @@ public void build() {
);
transitService = new DefaultTransitService(otpModel.timetableRepository());
- graphFinder = new StreetGraphFinder(otpModel.graph(), TestVertexLinker.of(otpModel.graph()));
+ graphFinder = new StreetGraphFinder(
+ otpModel.graph(),
+ VertexLinkerTestFactory.of(otpModel.graph())
+ );
}
@Test
diff --git a/application/src/test/java/org/opentripplanner/routing/linking/LinkStopToPlatformTest.java b/application/src/test/java/org/opentripplanner/routing/linking/LinkStopToPlatformTest.java
index 43c79d2010d..5ae80d609a6 100644
--- a/application/src/test/java/org/opentripplanner/routing/linking/LinkStopToPlatformTest.java
+++ b/application/src/test/java/org/opentripplanner/routing/linking/LinkStopToPlatformTest.java
@@ -16,7 +16,6 @@
import org.opentripplanner.framework.geometry.GeometryUtils;
import org.opentripplanner.framework.i18n.I18NString;
import org.opentripplanner.framework.i18n.LocalizedString;
-import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.street.model.StreetTraversalPermission;
import org.opentripplanner.street.model.edge.Area;
@@ -249,7 +248,7 @@ void testAddPermanentAreaVertex() {
var vertexFactory = new VertexFactory(graph);
var v = vertexFactory.intersection("boardingLocation", 10.00000001, 60.00000001);
- TestVertexLinker.of(graph).addPermanentAreaVertex(v, ag);
+ VertexLinkerTestFactory.of(graph).addPermanentAreaVertex(v, ag);
// vertex links to the single visibility point with 2 edges
assertEquals(10, graph.getEdges().size());
diff --git a/application/src/test/java/org/opentripplanner/routing/linking/VertexLinkerTest.java b/application/src/test/java/org/opentripplanner/routing/linking/VertexLinkerTest.java
index 03e1e2dc84b..2f297b16657 100644
--- a/application/src/test/java/org/opentripplanner/routing/linking/VertexLinkerTest.java
+++ b/application/src/test/java/org/opentripplanner/routing/linking/VertexLinkerTest.java
@@ -6,7 +6,6 @@
import java.util.Set;
import org.junit.jupiter.api.Test;
import org.opentripplanner.framework.application.OTPFeature;
-import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.street.model._data.StreetModelForTest;
import org.opentripplanner.street.model.edge.LinkingDirection;
@@ -42,7 +41,7 @@ void flex() {
graph.addVertex(v2);
graph.index();
- var linker = TestVertexLinker.of(graph);
+ var linker = VertexLinkerTestFactory.of(graph);
linker.linkVertexPermanently(
toBeLinked,
diff --git a/application/src/test/java/org/opentripplanner/street/integration/BarrierRoutingTest.java b/application/src/test/java/org/opentripplanner/street/integration/BarrierRoutingTest.java
index 77cdd38d05e..b32c516bec2 100644
--- a/application/src/test/java/org/opentripplanner/street/integration/BarrierRoutingTest.java
+++ b/application/src/test/java/org/opentripplanner/street/integration/BarrierRoutingTest.java
@@ -20,7 +20,6 @@
import org.opentripplanner.TestOtpModel;
import org.opentripplanner._support.time.ZoneIds;
import org.opentripplanner.framework.geometry.EncodedPolyline;
-import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
import org.opentripplanner.model.GenericLocation;
import org.opentripplanner.model.plan.Itinerary;
import org.opentripplanner.model.plan.leg.StreetLeg;
@@ -32,6 +31,7 @@
import org.opentripplanner.routing.api.request.request.StreetRequest;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.impl.GraphPathFinder;
+import org.opentripplanner.routing.linking.VertexLinkerTestFactory;
import org.opentripplanner.street.search.TemporaryVerticesContainer;
import org.opentripplanner.street.search.TraverseMode;
import org.opentripplanner.test.support.ResourceLoader;
@@ -185,7 +185,7 @@ private static String computePolyline(
var temporaryVertices = new TemporaryVerticesContainer(
graph,
- TestVertexLinker.of(graph),
+ VertexLinkerTestFactory.of(graph),
id -> List.of(),
from,
to,
diff --git a/application/src/test/java/org/opentripplanner/street/integration/BicycleRoutingTest.java b/application/src/test/java/org/opentripplanner/street/integration/BicycleRoutingTest.java
index 063dceeb779..3543391167e 100644
--- a/application/src/test/java/org/opentripplanner/street/integration/BicycleRoutingTest.java
+++ b/application/src/test/java/org/opentripplanner/street/integration/BicycleRoutingTest.java
@@ -12,7 +12,6 @@
import org.opentripplanner.TestOtpModel;
import org.opentripplanner._support.time.ZoneIds;
import org.opentripplanner.framework.geometry.EncodedPolyline;
-import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
import org.opentripplanner.model.GenericLocation;
import org.opentripplanner.model.plan.leg.StreetLeg;
import org.opentripplanner.routing.algorithm.mapping.GraphPathToItineraryMapper;
@@ -22,6 +21,7 @@
import org.opentripplanner.routing.core.VehicleRoutingOptimizeType;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.impl.GraphPathFinder;
+import org.opentripplanner.routing.linking.VertexLinkerTestFactory;
import org.opentripplanner.street.search.TemporaryVerticesContainer;
import org.opentripplanner.street.search.TraverseMode;
import org.opentripplanner.test.support.ResourceLoader;
@@ -88,7 +88,7 @@ private static String computePolyline(Graph graph, GenericLocation from, Generic
var temporaryVertices = new TemporaryVerticesContainer(
graph,
- TestVertexLinker.of(graph),
+ VertexLinkerTestFactory.of(graph),
id -> List.of(),
request.from(),
request.to(),
diff --git a/application/src/test/java/org/opentripplanner/street/integration/CarRoutingTest.java b/application/src/test/java/org/opentripplanner/street/integration/CarRoutingTest.java
index 2c78b6ead97..4cda6fdace1 100644
--- a/application/src/test/java/org/opentripplanner/street/integration/CarRoutingTest.java
+++ b/application/src/test/java/org/opentripplanner/street/integration/CarRoutingTest.java
@@ -14,7 +14,6 @@
import org.opentripplanner.TestOtpModel;
import org.opentripplanner._support.time.ZoneIds;
import org.opentripplanner.framework.geometry.EncodedPolyline;
-import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
import org.opentripplanner.model.GenericLocation;
import org.opentripplanner.model.plan.leg.StreetLeg;
import org.opentripplanner.routing.algorithm.mapping.GraphPathToItineraryMapper;
@@ -23,6 +22,7 @@
import org.opentripplanner.routing.api.request.request.StreetRequest;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.impl.GraphPathFinder;
+import org.opentripplanner.routing.linking.VertexLinkerTestFactory;
import org.opentripplanner.street.search.TemporaryVerticesContainer;
import org.opentripplanner.street.search.TraverseMode;
import org.opentripplanner.test.support.ResourceLoader;
@@ -136,7 +136,7 @@ private static String computePolyline(Graph graph, GenericLocation from, Generic
.buildRequest();
var temporaryVertices = new TemporaryVerticesContainer(
graph,
- TestVertexLinker.of(graph),
+ VertexLinkerTestFactory.of(graph),
id -> List.of(),
from,
to,
diff --git a/application/src/test/java/org/opentripplanner/street/integration/SplitEdgeTurnRestrictionsTest.java b/application/src/test/java/org/opentripplanner/street/integration/SplitEdgeTurnRestrictionsTest.java
index 5a59911ca3f..db6c699a5c4 100644
--- a/application/src/test/java/org/opentripplanner/street/integration/SplitEdgeTurnRestrictionsTest.java
+++ b/application/src/test/java/org/opentripplanner/street/integration/SplitEdgeTurnRestrictionsTest.java
@@ -13,7 +13,6 @@
import org.opentripplanner.TestOtpModel;
import org.opentripplanner._support.time.ZoneIds;
import org.opentripplanner.framework.geometry.EncodedPolyline;
-import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
import org.opentripplanner.model.GenericLocation;
import org.opentripplanner.model.plan.leg.StreetLeg;
import org.opentripplanner.routing.algorithm.mapping.GraphPathToItineraryMapper;
@@ -22,6 +21,7 @@
import org.opentripplanner.routing.api.request.request.StreetRequest;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.impl.GraphPathFinder;
+import org.opentripplanner.routing.linking.VertexLinkerTestFactory;
import org.opentripplanner.street.search.TemporaryVerticesContainer;
import org.opentripplanner.street.search.TraverseMode;
import org.opentripplanner.test.support.ResourceLoader;
@@ -168,7 +168,7 @@ private static String computeCarPolyline(Graph graph, GenericLocation from, Gene
var temporaryVertices = new TemporaryVerticesContainer(
graph,
- TestVertexLinker.of(graph),
+ VertexLinkerTestFactory.of(graph),
id -> List.of(),
from,
to,
diff --git a/application/src/test/java/org/opentripplanner/street/integration/WalkRoutingTest.java b/application/src/test/java/org/opentripplanner/street/integration/WalkRoutingTest.java
index 3f58fc3635f..3fc03d88c08 100644
--- a/application/src/test/java/org/opentripplanner/street/integration/WalkRoutingTest.java
+++ b/application/src/test/java/org/opentripplanner/street/integration/WalkRoutingTest.java
@@ -12,11 +12,11 @@
import org.opentripplanner.ConstantsForTests;
import org.opentripplanner.TestOtpModel;
import org.opentripplanner.astar.model.GraphPath;
-import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
import org.opentripplanner.model.GenericLocation;
import org.opentripplanner.routing.api.request.RouteRequest;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.impl.GraphPathFinder;
+import org.opentripplanner.routing.linking.VertexLinkerTestFactory;
import org.opentripplanner.street.model.edge.Edge;
import org.opentripplanner.street.model.vertex.Vertex;
import org.opentripplanner.street.search.TemporaryVerticesContainer;
@@ -97,7 +97,7 @@ private static List> route(
try (
var temporaryVertices = new TemporaryVerticesContainer(
graph,
- TestVertexLinker.of(graph),
+ VertexLinkerTestFactory.of(graph),
id -> List.of(),
request.from(),
request.to(),
diff --git a/application/src/test/java/org/opentripplanner/street/search/TemporaryVerticesContainerTest.java b/application/src/test/java/org/opentripplanner/street/search/TemporaryVerticesContainerTest.java
index 096f47bc56b..3c8a98b999b 100644
--- a/application/src/test/java/org/opentripplanner/street/search/TemporaryVerticesContainerTest.java
+++ b/application/src/test/java/org/opentripplanner/street/search/TemporaryVerticesContainerTest.java
@@ -12,9 +12,9 @@
import java.util.stream.Collectors;
import org.junit.jupiter.api.Test;
import org.opentripplanner.framework.geometry.WgsCoordinate;
-import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
import org.opentripplanner.model.GenericLocation;
import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.routing.linking.VertexLinkerTestFactory;
import org.opentripplanner.street.model._data.StreetModelForTest;
import org.opentripplanner.street.model.edge.StreetStationCentroidLink;
import org.opentripplanner.street.model.vertex.StationCentroidVertex;
@@ -64,7 +64,7 @@ class TemporaryVerticesContainerTest {
void coordinates() {
var container = new TemporaryVerticesContainer(
graph,
- TestVertexLinker.of(graph),
+ VertexLinkerTestFactory.of(graph),
Set::of,
GenericLocation.fromCoordinate(stopA.getLat(), stopA.getLon()),
GenericLocation.fromCoordinate(stopD.getLat(), stopD.getLon()),
@@ -82,7 +82,7 @@ void coordinates() {
void stopId() {
var container = new TemporaryVerticesContainer(
graph,
- TestVertexLinker.of(graph),
+ VertexLinkerTestFactory.of(graph),
Set::of,
stopToLocation(stopA),
stopToLocation(stopB),
@@ -103,7 +103,7 @@ void stationId() {
.build();
var container = new TemporaryVerticesContainer(
graph,
- TestVertexLinker.of(graph),
+ VertexLinkerTestFactory.of(graph),
mapping::get,
GenericLocation.fromStopId("station", OMEGA_ID.getFeedId(), OMEGA_ID.getId()),
stopToLocation(stopB),
@@ -118,7 +118,7 @@ void stationId() {
void centroid() {
var container = new TemporaryVerticesContainer(
graph,
- TestVertexLinker.of(graph),
+ VertexLinkerTestFactory.of(graph),
Set::of,
GenericLocation.fromStopId("station", ALPHA_ID.getFeedId(), ALPHA_ID.getId()),
stopToLocation(stopB),
diff --git a/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java b/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java
index 2840fdb53d2..612f1a1f684 100644
--- a/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java
+++ b/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java
@@ -15,13 +15,13 @@
import org.opentripplanner.TestServerContext;
import org.opentripplanner.ext.fares.impl.gtfs.DefaultFareService;
import org.opentripplanner.framework.application.OtpAppException;
-import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
import org.opentripplanner.model.plan.Itinerary;
import org.opentripplanner.raptor.configure.RaptorConfig;
import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule;
import org.opentripplanner.routing.api.response.RoutingResponse;
import org.opentripplanner.routing.framework.DebugTimingAggregator;
import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.routing.linking.VertexLinkerTestFactory;
import org.opentripplanner.service.realtimevehicles.internal.DefaultRealtimeVehicleService;
import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository;
import org.opentripplanner.service.vehiclerental.internal.DefaultVehicleRentalService;
@@ -96,7 +96,7 @@ public SpeedTest(
UpdaterConfigurator.configure(
graph,
- TestVertexLinker.of(graph),
+ VertexLinkerTestFactory.of(graph),
new DefaultRealtimeVehicleService(transitService),
new DefaultVehicleRentalService(),
new DefaultVehicleParkingRepository(),
@@ -131,7 +131,7 @@ public SpeedTest(
VectorTileConfig.DEFAULT,
TestServerContext.createVehicleParkingService(),
TestServerContext.createVehicleRentalService(),
- TestVertexLinker.of(graph),
+ VertexLinkerTestFactory.of(graph),
TestServerContext.createViaTransferResolver(graph, transitService),
TestServerContext.createWorldEnvelopeService(),
null,
diff --git a/application/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdaterTest.java b/application/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdaterTest.java
index 64f8d1c75b7..0431a36de69 100644
--- a/application/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdaterTest.java
+++ b/application/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdaterTest.java
@@ -10,8 +10,8 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.routing.linking.VertexLinkerTestFactory;
import org.opentripplanner.service.vehicleparking.VehicleParkingRepository;
import org.opentripplanner.service.vehicleparking.VehicleParkingTestGraphData;
import org.opentripplanner.service.vehicleparking.VehicleParkingTestUtil;
@@ -79,7 +79,7 @@ public String configRef() {
vehicleParkingUpdater = new VehicleParkingUpdater(
parameters,
dataSource,
- TestVertexLinker.of(graph),
+ VertexLinkerTestFactory.of(graph),
parkingRepository
);
}
diff --git a/pom.xml b/pom.xml
index c837797c39a..74e2f0adf05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -319,6 +319,7 @@
src/main/java/**/*.java
src/test/java/**/*.java
+ src/test-fixtures/java/**/*.java