diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-11 15:00:56 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-13 13:40:31 -0800 |
| commit | 5a7d2fd60ec4bd1639a1223ec5d2c54c534d0392 (patch) | |
| tree | d37991995bd21955379e690b677fc288109aa2c1 /test/fixtures | |
| parent | 86c8446d3a4390ff6577d070ac8b5fa3ad3c5cd1 (diff) | |
| download | qtlocation-mapboxgl-5a7d2fd60ec4bd1639a1223ec5d2c54c534d0392.tar.gz | |
[core] Eliminate platform::assetRoot()
I regenerated assets.zip so that all file paths have an `assets/` prefix, as the Android AssetFileSource implementation asserts, and removed `TEST_DATA` from the paths.
Diffstat (limited to 'test/fixtures')
| -rw-r--r-- | test/fixtures/api/assets.zip | bin | 328264 -> 167696 bytes | |||
| -rw-r--r-- | test/fixtures/api/assets/streets.json (renamed from test/fixtures/tiles/streets.json) | 2 | ||||
| -rw-r--r-- | test/fixtures/api/assets/streets/0-0-0.vector.pbf (renamed from test/fixtures/tiles/streets/0-0-0.vector.pbf) | bin | 482553 -> 482553 bytes | |||
| -rw-r--r-- | test/fixtures/api/water.json | 2 | ||||
| -rw-r--r-- | test/fixtures/storage/assets.zip | bin | 1136 -> 1243 bytes | |||
| -rw-r--r-- | test/fixtures/storage/assets/directory/file (renamed from test/fixtures/storage/empty) | 0 | ||||
| -rw-r--r-- | test/fixtures/storage/assets/empty | 0 | ||||
| -rw-r--r-- | test/fixtures/storage/assets/nonempty (renamed from test/fixtures/storage/nonempty) | 0 | ||||
| -rw-r--r-- | test/fixtures/tiles/streets/15-17605-10749.vector.pbf | bin | 143637 -> 0 bytes | |||
| -rw-r--r-- | test/fixtures/tiles/streets/15-17605-10750.vector.pbf | bin | 123586 -> 0 bytes |
10 files changed, 2 insertions, 2 deletions
diff --git a/test/fixtures/api/assets.zip b/test/fixtures/api/assets.zip Binary files differindex 42a30f1c2a..fe00443f61 100644 --- a/test/fixtures/api/assets.zip +++ b/test/fixtures/api/assets.zip diff --git a/test/fixtures/tiles/streets.json b/test/fixtures/api/assets/streets.json index a848a1bf72..f7b259f0a6 100644 --- a/test/fixtures/tiles/streets.json +++ b/test/fixtures/api/assets/streets.json @@ -10,5 +10,5 @@ "name": "Streets", "scheme": "xyz", "tilejson": "2.0.0", - "tiles": [ "asset://TEST_DATA/fixtures/tiles/streets/{z}-{x}-{y}.vector.pbf" ] + "tiles": [ "asset://streets/{z}-{x}-{y}.vector.pbf" ] } diff --git a/test/fixtures/tiles/streets/0-0-0.vector.pbf b/test/fixtures/api/assets/streets/0-0-0.vector.pbf Binary files differindex a0f049ad43..a0f049ad43 100644 --- a/test/fixtures/tiles/streets/0-0-0.vector.pbf +++ b/test/fixtures/api/assets/streets/0-0-0.vector.pbf diff --git a/test/fixtures/api/water.json b/test/fixtures/api/water.json index c969b345ae..387471b842 100644 --- a/test/fixtures/api/water.json +++ b/test/fixtures/api/water.json @@ -4,7 +4,7 @@ "sources": { "mapbox": { "type": "vector", - "url": "asset://TEST_DATA/fixtures/tiles/streets.json" + "url": "asset://streets.json" } }, "layers": [{ diff --git a/test/fixtures/storage/assets.zip b/test/fixtures/storage/assets.zip Binary files differindex 3127798145..4006ee10f2 100644 --- a/test/fixtures/storage/assets.zip +++ b/test/fixtures/storage/assets.zip diff --git a/test/fixtures/storage/empty b/test/fixtures/storage/assets/directory/file index e69de29bb2..e69de29bb2 100644 --- a/test/fixtures/storage/empty +++ b/test/fixtures/storage/assets/directory/file diff --git a/test/fixtures/storage/assets/empty b/test/fixtures/storage/assets/empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/test/fixtures/storage/assets/empty diff --git a/test/fixtures/storage/nonempty b/test/fixtures/storage/assets/nonempty index 929bb23131..929bb23131 100644 --- a/test/fixtures/storage/nonempty +++ b/test/fixtures/storage/assets/nonempty diff --git a/test/fixtures/tiles/streets/15-17605-10749.vector.pbf b/test/fixtures/tiles/streets/15-17605-10749.vector.pbf Binary files differdeleted file mode 100644 index 1f43a6c487..0000000000 --- a/test/fixtures/tiles/streets/15-17605-10749.vector.pbf +++ /dev/null diff --git a/test/fixtures/tiles/streets/15-17605-10750.vector.pbf b/test/fixtures/tiles/streets/15-17605-10750.vector.pbf Binary files differdeleted file mode 100644 index 1ad616a56c..0000000000 --- a/test/fixtures/tiles/streets/15-17605-10750.vector.pbf +++ /dev/null |