From 85f9d72a7bfcb1c5f209f8a097fd6c054725afef Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 25 Sep 2024 12:19:32 +0200 Subject: [PATCH 1/2] Update PR template --- .github/PULL_REQUEST_TEMPLATE.md | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 9441be107..665ecfdf9 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -8,5 +8,4 @@ Explain how you expect the pull request to work in your testing (in case other p Please make sure these boxes are checked before submitting your pull request - thanks! -- [ ] Format the title like "Fix # - short description of fix and changes" - [ ] Linked all relevant issues From 5b3cc7d41c0fd1f51a4a7ef43aaa81f2e868d9c7 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 25 Sep 2024 12:20:27 +0200 Subject: [PATCH 2/2] Add e2e test for merge-cli --- cli-tests/cli-tests.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/cli-tests/cli-tests.sh b/cli-tests/cli-tests.sh index 0667a6827..b3d56200d 100755 --- a/cli-tests/cli-tests.sh +++ b/cli-tests/cli-tests.sh @@ -2,13 +2,27 @@ mvn clean package --no-transfer-progress -DskipTests -Dmaven.source.skip=true -Dmaven.javadoc.skip=true +EXAMPLE_1="example.gtfs.zip" +EXAMPLE_2="deathvalley.gtfs.zip" + # transformer-cli TRANSFORMER_JAR="transformer-cli.jar" cp onebusaway-gtfs-transformer-cli/target/onebusaway-gtfs-transformer-cli.jar ./${TRANSFORMER_JAR} -wget https://github.com/google/transit/blob/master/gtfs/spec/en/examples/sample-feed-1.zip?raw=true -O gtfs.zip +wget https://github.com/google/transit/blob/master/gtfs/spec/en/examples/sample-feed-1.zip?raw=true -O ${EXAMPLE_1} java -jar ${TRANSFORMER_JAR} --help -java -jar ${TRANSFORMER_JAR} --transform="{'op':'remove','match':{'file':'stops.txt','stop_id':'BEATTY_AIRPORT'}}" gtfs.zip gtfs.transformed.zip +java -jar ${TRANSFORMER_JAR} --transform="{'op':'remove','match':{'file':'stops.txt','stop_id':'BEATTY_AIRPORT'}}" ${EXAMPLE_1} gtfs.transformed.zip + +# merge-cli + +MERGE_JAR="merge-cli.jar" + +cp onebusaway-gtfs-merge-cli/target/onebusaway-gtfs-merge-cli-*.jar ./${MERGE_JAR} +wget "http://data.trilliumtransit.com/gtfs/deathvalley-demo-ca-us/deathvalley-demo-ca-us.zip" -O ${EXAMPLE_2} + +java -jar ${MERGE_JAR} --help + +java -jar ${MERGE_JAR} ${EXAMPLE_1} ${EXAMPLE_2} gtfs.merged.zip