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/storage | |
| 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/storage')
| -rw-r--r-- | test/storage/asset_file_source.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
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); |