[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.

12 files changed, 13 insertions, 11 deletions

diff --git a/test/api/repeated_render.cpp b/test/api/repeated_render.cpp
index 3eab03de5b..788363f0d1 100644
--- a/test/api/repeated_render.cpp
+++ b/test/api/repeated_render.cpp
@@ -18,9 +18,10 @@ TEST(API, RepeatedRender) {
     auto display = std::make_shared<mbgl::HeadlessDisplay>();
     HeadlessView view(display, 1, 256, 512);
 #ifdef MBGL_ASSET_ZIP
-    DefaultFileSource fileSource(":memory", "test/fixtures/api/assets.zip");
+    // Regenerate with `cd test/fixtures/api/ && zip -r assets.zip assets/`
+    DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets.zip");
 #else
-    DefaultFileSource fileSource;
+    DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets");
 #endif
 
     Log::setObserver(std::make_unique<FixtureLogObserver>());
@@ -40,7 +41,7 @@ TEST(API, RepeatedRender) {
     }
 
     {
-        map.setStyleJSON(style, "TEST_DATA/suite");
+        map.setStyleJSON(style, "");
         std::promise<PremultipliedImage> promise;
         map.renderStill([&promise](std::exception_ptr, PremultipliedImage&& image) {
             promise.set_value(std::move(image));
diff --git a/test/fixtures/api/assets.zip b/test/fixtures/api/assets.zip
index 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
index 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
index 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
deleted 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
deleted file mode 100644
index 1ad616a56c..0000000000
--- a/test/fixtures/tiles/streets/15-17605-10750.vector.pbf
+++ /dev/null
diff --git a/test/storage/asset_file_source.cpp b/test/storage/asset_file_source.cpp
index 8c597027dc..d7910373f6 100644
--- a/test/storage/asset_file_source.cpp
+++ b/test/storage/asset_file_source.cpp
@@ -11,9 +11,10 @@ namespace {
 
 std::string getFileSourceRoot() {
 #ifdef MBGL_ASSET_ZIP
+    // Regenerate with `cd test/fixtures/storage/ && zip -r assets.zip assets/`
     return "test/fixtures/storage/assets.zip";
 #else
-    return "";
+    return "test/fixtures/storage/assets";
 #endif
 }
 
@@ -22,7 +23,7 @@ public:
     TestWorker(mbgl::AssetFileSource* fs_) : fs(fs_) {}
 
     void run(std::function<void()> endCallback) {
-        const std::string asset("asset://TEST_DATA/fixtures/storage/nonempty");
+        const std::string asset("asset://nonempty");
 
         requestCallback = [this, asset, endCallback](mbgl::Response res) {
             EXPECT_EQ(nullptr, res.error);
@@ -100,7 +101,7 @@ TEST_F(Storage, AssetEmptyFile) {
 
     AssetFileSource fs(getFileSourceRoot());
 
-    std::unique_ptr<FileRequest> req = fs.request({ Resource::Unknown, "asset://TEST_DATA/fixtures/storage/empty" }, [&](Response res) {
+    std::unique_ptr<FileRequest> req = fs.request({ Resource::Unknown, "asset://empty" }, [&](Response res) {
         req.reset();
         EXPECT_EQ(nullptr, res.error);
         EXPECT_EQ(false, res.stale);
@@ -122,7 +123,7 @@ TEST_F(Storage, AssetNonEmptyFile) {
 
     AssetFileSource fs(getFileSourceRoot());
 
-    std::unique_ptr<FileRequest> req = fs.request({ Resource::Unknown, "asset://TEST_DATA/fixtures/storage/nonempty" }, [&](Response res) {
+    std::unique_ptr<FileRequest> req = fs.request({ Resource::Unknown, "asset://nonempty" }, [&](Response res) {
         req.reset();
         EXPECT_EQ(nullptr, res.error);
         EXPECT_EQ(false, res.stale);
@@ -144,7 +145,7 @@ TEST_F(Storage, AssetNonExistentFile) {
 
     AssetFileSource fs(getFileSourceRoot());
 
-    std::unique_ptr<FileRequest> req = fs.request({ Resource::Unknown, "asset://TEST_DATA/fixtures/storage/does_not_exist" }, [&](Response res) {
+    std::unique_ptr<FileRequest> req = fs.request({ Resource::Unknown, "asset://does_not_exist" }, [&](Response res) {
         req.reset();
         ASSERT_NE(nullptr, res.error);
         EXPECT_EQ(Response::Error::Reason::NotFound, res.error->reason);
@@ -167,7 +168,7 @@ TEST_F(Storage, AssetReadDirectory) {
 
     AssetFileSource fs(getFileSourceRoot());
 
-    std::unique_ptr<FileRequest> req = fs.request({ Resource::Unknown, "asset://TEST_DATA/fixtures/storage" }, [&](Response res) {
+    std::unique_ptr<FileRequest> req = fs.request({ Resource::Unknown, "asset://directory" }, [&](Response res) {
         req.reset();
         ASSERT_NE(nullptr, res.error);
         EXPECT_EQ(Response::Error::Reason::NotFound, res.error->reason);