Skip to content

v0.2.53..v0.2.54 changeset ServiceOsmApiDbReaderTest.sh

Garret Voltz edited this page Mar 31, 2020 · 1 revision
diff --git a/test-files/cmd/slow/serial/ServiceOsmApiDbReaderTest.sh b/test-files/cmd/slow/serial/ServiceOsmApiDbReaderTest.sh
index 21d5dca..5030865 100755
--- a/test-files/cmd/slow/serial/ServiceOsmApiDbReaderTest.sh
+++ b/test-files/cmd/slow/serial/ServiceOsmApiDbReaderTest.sh
@@ -17,7 +17,7 @@ OUTPUT_DIR=test-output/cmd/slow/serial/ServiceOsmApiDbReaderTest
 rm -rf $OUTPUT_DIR
 mkdir -p $OUTPUT_DIR
 
-export HOOT_OPTS="-D reader.add.source.datetime=false -D uuid.helper.repeatable=true -D reader.preserve.all.tags=true -D writer.include.circular.error.tags=false -D changeset.user.id=1 -D osmapidb.bulk.inserter.reserve.record.ids.before.writing.data=true -D apidb.bulk.inserter.validate.data=true -D apidb.bulk.inserter.output.files.copy.location=$OUTPUT_DIR/DcGisRoads.sql"
+export HOOT_OPTS="-C Testing.conf -D reader.add.source.datetime=false -D uuid.helper.repeatable=true -D reader.preserve.all.tags=true -D writer.include.circular.error.tags=false -D changeset.user.id=1 -D osmapidb.bulk.inserter.reserve.record.ids.before.writing.data=true -D apidb.bulk.inserter.validate.data=true -D apidb.bulk.inserter.output.files.copy.location=$OUTPUT_DIR/DcGisRoads.sql"
 export DB_URL="osmapidb://$DB_USER_OSMAPI:$DB_PASSWORD_OSMAPI@$DB_HOST_OSMAPI:$DB_PORT_OSMAPI/$DB_NAME_OSMAPI"
 
 echo "Select all from osm api db..."
@@ -25,7 +25,7 @@ echo "Select all from osm api db..."
 psql --quiet $AUTH -d $DB_NAME_OSMAPI -f test-files/ToyTestA.sql
 
 hoot convert --error $HOOT_OPTS "$DB_URL" $OUTPUT_DIR/output1.osm
-hoot diff test-files/cmd/slow/serial/ServiceOsmApiDbReaderTest/output1.osm $OUTPUT_DIR/output1.osm
+hoot diff $HOOT_OPTS test-files/cmd/slow/serial/ServiceOsmApiDbReaderTest/output1.osm $OUTPUT_DIR/output1.osm
 
 echo "Bounding box selection from osm api db..."
 
@@ -38,6 +38,6 @@ scripts/database/CleanAndInitializeOsmApiDb.sh
 hoot convert --warn $HOOT_OPTS test-files/DcGisRoads.osm $DB_URL
 
 hoot convert --warn $HOOT_OPTS -D convert.bounding.box=-77.04,38.8916,-77.03324,38.8958 $OSM_API_DB_URL $OUTPUT_DIR/output2.osm
-hoot diff test-files/cmd/slow/serial/ServiceOsmApiDbReaderTest/output2.osm $OUTPUT_DIR/output2.osm
+hoot diff $HOOT_OPTS test-files/cmd/slow/serial/ServiceOsmApiDbReaderTest/output2.osm $OUTPUT_DIR/output2.osm
 
 
Clone this wiki locally