test: commit generated test files to remove osmosis dependency for tests

Author: olt

.travis.yml

@@ -50,7 +50,6 @@ addons:
       #   https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-trusty
       packages:
         - postgresql-9.5-postgis-2.3
-        - osmosis
         - chrpath
 
 before_script:

test/Makefile

@@ -9,17 +9,15 @@ endif
 all: test
 
 clean:
-	rm -rf build
+	rm generated/*.{pbf,gz}
 
-PBF_FILES=$(addprefix build/,$(patsubst %.osm,%.pbf,$(wildcard *.osm)))
-OSCGZ_FILES=$(addprefix build/,$(patsubst %.osc,%.osc.gz,$(wildcard *.osc)))
+PBF_FILES=$(addprefix generated/,$(patsubst %.osm,%.pbf,$(wildcard *.osm)))
+OSCGZ_FILES=$(addprefix generated/,$(patsubst %.osc,%.osc.gz,$(wildcard *.osc)))
 
-build/%.pbf: %.osm
-	@mkdir -p build
+generated/%.pbf: %.osm
 	osmosis --read-xml $< --sort type="TypeThenId" --write-pbf $@ omitmetadata=true
 
-build/%.osc.gz: %.osc
-	@mkdir -p build
+generated/%.osc.gz: %.osc
 	gzip --stdout $< > $@
 
 files: $(PBF_FILES) $(OSCGZ_FILES)

test/any_any_test.go

@@ -20,7 +20,7 @@ func TestAnyAny_Prepare(t *testing.T) {
 	ts.config = importConfig{
 		connection:      "postgis://",
 		cacheDir:        ts.dir,
-		osmFileName:     "build/any_any.pbf",
+		osmFileName:     "generated/any_any.pbf",
 		mappingFileName: "any_any_mapping.json",
 	}
 	ts.g = geos.NewGeos()

test/completedb_test.go

@@ -29,7 +29,7 @@ func TestComplete_Prepare(t *testing.T) {
 	ts.config = importConfig{
 		connection:      "postgis://",
 		cacheDir:        ts.dir,
-		osmFileName:     "build/complete_db.pbf",
+		osmFileName:     "generated/complete_db.pbf",
 		mappingFileName: "complete_db_mapping.json",
 	}
 	ts.g = geos.NewGeos()
@@ -400,7 +400,7 @@ func TestComplete_HstoreTags(t *testing.T) {
 // #######################################################################
 
 func TestComplete_Update(t *testing.T) {
-	ts.updateOsm(t, "./build/complete_db.osc.gz")
+	ts.updateOsm(t, "./generated/complete_db.osc.gz")
 }
 
 // #######################################################################

test/expire_tiles_test.go

@@ -24,7 +24,7 @@ func TestExpireTiles_Prepare(t *testing.T) {
 	ts.config = importConfig{
 		connection:      "postgis://",
 		cacheDir:        ts.dir,
-		osmFileName:     "build/expire_tiles.pbf",
+		osmFileName:     "generated/expire_tiles.pbf",
 		mappingFileName: "expire_tiles_mapping.yml",
 		expireTileDir:   filepath.Join(ts.dir, "expiretiles"),
 	}
@@ -62,7 +62,7 @@ func TestExpireTiles_Elements(t *testing.T) {
 }
 
 func TestExpireTiles_Update(t *testing.T) {
-	ts.updateOsm(t, "build/expire_tiles.osc.gz")
+	ts.updateOsm(t, "generated/expire_tiles.osc.gz")
 }
 
 func TestExpireTiles_CheckExpireFile(t *testing.T) {

test/generated/README

@@ -0,0 +1,2 @@
+Files in this directory are generated by `make files` in ./test by calling osmosis and gzip.
+The sources for these files are in ./test.

test/generated/any_any.pbf

@@ -20,7 +20,7 @@ func TestRouteRelation_Prepare(t *testing.T) {
 	ts.config = importConfig{
 		connection:      "postgis://",
 		cacheDir:        ts.dir,
-		osmFileName:     "build/route_relation.pbf",
+		osmFileName:     "generated/route_relation.pbf",
 		mappingFileName: "route_relation_mapping.yml",
 	}
 	ts.g = geos.NewGeos()
@@ -107,7 +107,7 @@ func TestRouteRelation_NoRouteWithMissingMember(t *testing.T) {
 // #######################################################################
 
 func TestRouteRelation_Update(t *testing.T) {
-	ts.updateOsm(t, "./build/route_relation.osc.gz")
+	ts.updateOsm(t, "./generated/route_relation.osc.gz")
 }
 
 // #######################################################################

test/generated/complete_db.osc.gz

@@ -23,7 +23,7 @@ func TestSingleTable_Prepare(t *testing.T) {
 	ts.config = importConfig{
 		connection:      "postgis://",
 		cacheDir:        ts.dir,
-		osmFileName:     "build/single_table.pbf",
+		osmFileName:     "generated/single_table.pbf",
 		mappingFileName: "single_table_mapping.json",
 	}
 	ts.g = geos.NewGeos()
@@ -167,7 +167,7 @@ func TestSingleTable_DuplicateIds1(t *testing.T) {
 // #######################################################################
 
 func TestSingleTable_Update(t *testing.T) {
-	ts.updateOsm(t, "./build/single_table.osc.gz")
+	ts.updateOsm(t, "./generated/single_table.osc.gz")
 }
 
 // #######################################################################