Add Test Fixtures to separate test code from production code #6904
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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. | ||
| * <p> | ||
| * 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)); | ||
|
There was a problem hiding this comment. The |
||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would love to deprecate this to simplify tests, the next method is much easier to use.