[tests] Rationalize test fixtures (#4834)

Place them in a directory corresponding to the test .cpp file name.

19 files changed, 71 insertions, 6 deletions

diff --git a/test/fixtures/offline/0-0-0.vector.pbf b/test/fixtures/map/offline/0-0-0.vector.pbf
index a0f049ad43..a0f049ad43 100644
--- a/test/fixtures/offline/0-0-0.vector.pbf
+++ b/test/fixtures/map/offline/0-0-0.vector.pbf
diff --git a/test/fixtures/offline/expected.png b/test/fixtures/map/offline/expected.png
index 1b1c2be4c6..1b1c2be4c6 100644
--- a/test/fixtures/offline/expected.png
+++ b/test/fixtures/map/offline/expected.png
diff --git a/test/fixtures/offline/glyph.pbf b/test/fixtures/map/offline/glyph.pbf
index 0d160f7898..0d160f7898 100644
--- a/test/fixtures/offline/glyph.pbf
+++ b/test/fixtures/map/offline/glyph.pbf
diff --git a/test/fixtures/offline/sprite.json b/test/fixtures/map/offline/sprite.json
index e640365519..e640365519 100644
--- a/test/fixtures/offline/sprite.json
+++ b/test/fixtures/map/offline/sprite.json
diff --git a/test/fixtures/offline/sprite.png b/test/fixtures/map/offline/sprite.png
index a02d8eb542..a02d8eb542 100644
--- a/test/fixtures/offline/sprite.png
+++ b/test/fixtures/map/offline/sprite.png
diff --git a/test/fixtures/offline/streets.json b/test/fixtures/map/offline/streets.json
index 805bd68f45..62bf704c1a 100644
--- a/test/fixtures/offline/streets.json
+++ b/test/fixtures/map/offline/streets.json
@@ -10,5 +10,5 @@
   "name": "Streets",
   "scheme": "xyz",
   "tilejson": "2.0.0",
-  "tiles": [ "http://127.0.0.1:3000/offline/{z}-{x}-{y}.vector.pbf" ]
+  "tiles": [ "http://127.0.0.1:3000/{z}-{x}-{y}.vector.pbf" ]
 }
diff --git a/test/fixtures/offline/style.json b/test/fixtures/map/offline/style.json
index c34ee59893..978df3aae3 100644
--- a/test/fixtures/offline/style.json
+++ b/test/fixtures/map/offline/style.json
@@ -4,11 +4,11 @@
   "sources": {
     "mapbox": {
       "type": "vector",
-      "url": "http://127.0.0.1:3000/offline/streets.json"
+      "url": "http://127.0.0.1:3000/streets.json"
     }
   },
-  "glyphs": "http://127.0.0.1:3000/offline/{fontstack}/{range}.pbf",
-  "sprite": "http://127.0.0.1:3000/offline/sprite",
+  "glyphs": "http://127.0.0.1:3000/{fontstack}/{range}.pbf",
+  "sprite": "http://127.0.0.1:3000/sprite",
   "layers": [{
     "id": "background",
     "type": "background",
diff --git a/test/fixtures/offline/v2.db b/test/fixtures/offline_database/v2.db
index 8fadec4abe..8fadec4abe 100644
--- a/test/fixtures/offline/v2.db
+++ b/test/fixtures/offline_database/v2.db
diff --git a/test/fixtures/offline_download/0-0-0.vector.pbf b/test/fixtures/offline_download/0-0-0.vector.pbf
new file mode 100644
index 0000000000..a0f049ad43
--- /dev/null
+++ b/test/fixtures/offline_download/0-0-0.vector.pbf
diff --git a/test/fixtures/offline/empty.style.json b/test/fixtures/offline_download/empty.style.json
index 61a8fadcdb..61a8fadcdb 100644
--- a/test/fixtures/offline/empty.style.json
+++ b/test/fixtures/offline_download/empty.style.json
diff --git a/test/fixtures/offline/geojson.json b/test/fixtures/offline_download/geojson.json
index 8b3698faf7..8b3698faf7 100644
--- a/test/fixtures/offline/geojson.json
+++ b/test/fixtures/offline_download/geojson.json
diff --git a/test/fixtures/offline/geojson_source.style.json b/test/fixtures/offline_download/geojson_source.style.json
index 511fca9fd0..ae313e319e 100644
--- a/test/fixtures/offline/geojson_source.style.json
+++ b/test/fixtures/offline_download/geojson_source.style.json
@@ -3,7 +3,7 @@
   "sources": {
     "geojson": {
       "type": "geojson",
-      "data": "http://127.0.0.1:3000/offline/geojson.json"
+      "data": "http://127.0.0.1:3000/geojson.json"
     }
   },
   "layers": []
diff --git a/test/fixtures/offline_download/glyph.pbf b/test/fixtures/offline_download/glyph.pbf
new file mode 100644
index 0000000000..0d160f7898
--- /dev/null
+++ b/test/fixtures/offline_download/glyph.pbf
diff --git a/test/fixtures/offline/inline_source.style.json b/test/fixtures/offline_download/inline_source.style.json
index 87155d07d8..ec928c6234 100644
--- a/test/fixtures/offline/inline_source.style.json
+++ b/test/fixtures/offline_download/inline_source.style.json
@@ -5,7 +5,7 @@
       "type": "vector",
       "maxzoom": 15,
       "minzoom": 0,
-      "tiles": [ "http://127.0.0.1:3000/offline/{z}-{x}-{y}.vector.pbf" ]
+      "tiles": [ "http://127.0.0.1:3000/{z}-{x}-{y}.vector.pbf" ]
     }
   },
   "layers": [{
diff --git a/test/fixtures/offline/mapbox_source.style.json b/test/fixtures/offline_download/mapbox_source.style.json
index 75bfd6667d..75bfd6667d 100644
--- a/test/fixtures/offline/mapbox_source.style.json
+++ b/test/fixtures/offline_download/mapbox_source.style.json
diff --git a/test/fixtures/offline_download/sprite.json b/test/fixtures/offline_download/sprite.json
new file mode 100644
index 0000000000..e640365519
--- /dev/null
+++ b/test/fixtures/offline_download/sprite.json
@@ -0,0 +1,10 @@
+{
+  "noise": {
+    "x": 0,
+    "y": 0,
+    "width": 32,
+    "height": 32,
+    "pixelRatio": 1,
+    "sdf": false
+  }
+}
diff --git a/test/fixtures/offline_download/sprite.png b/test/fixtures/offline_download/sprite.png
new file mode 100644
index 0000000000..a02d8eb542
--- /dev/null
+++ b/test/fixtures/offline_download/sprite.png
diff --git a/test/fixtures/offline_download/streets.json b/test/fixtures/offline_download/streets.json
new file mode 100644
index 0000000000..62bf704c1a
--- /dev/null
+++ b/test/fixtures/offline_download/streets.json
@@ -0,0 +1,14 @@
+{
+  "bounds": [ -180, -85.0511, 180, 85.0511 ],
+  "center": [ 0, 0, 0 ],
+  "description": "",
+  "format": "pbf",
+  "id": "streets",
+  "maskLevel": 8,
+  "maxzoom": 15,
+  "minzoom": 0,
+  "name": "Streets",
+  "scheme": "xyz",
+  "tilejson": "2.0.0",
+  "tiles": [ "http://127.0.0.1:3000/{z}-{x}-{y}.vector.pbf" ]
+}
diff --git a/test/fixtures/offline_download/style.json b/test/fixtures/offline_download/style.json
new file mode 100644
index 0000000000..978df3aae3
--- /dev/null
+++ b/test/fixtures/offline_download/style.json
@@ -0,0 +1,41 @@
+{
+  "version": 8,
+  "name": "Water",
+  "sources": {
+    "mapbox": {
+      "type": "vector",
+      "url": "http://127.0.0.1:3000/streets.json"
+    }
+  },
+  "glyphs": "http://127.0.0.1:3000/{fontstack}/{range}.pbf",
+  "sprite": "http://127.0.0.1:3000/sprite",
+  "layers": [{
+    "id": "background",
+    "type": "background",
+    "paint": {
+      "background-color": "red"
+    }
+  }, {
+    "id": "water",
+    "type": "fill",
+    "source": "mapbox",
+    "source-layer": "water",
+    "paint": {
+      "fill-pattern": "noise"
+    }
+  }, {
+    "id": "admin",
+    "type": "symbol",
+    "source": "mapbox",
+    "source-layer": "admin",
+    "layout": {
+      "text-font": ["Helvetica"],
+      "text-field": "Text"
+    },
+    "paint": {
+      "text-color": "black",
+      "text-halo-color": "white",
+      "text-halo-width": 2
+    }
+  }]
+}