diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2017-04-11 17:18:09 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2017-04-24 10:42:10 +0200 |
| commit | 197f0ca6b418a27412bfcc7e891ab80949fd8833 (patch) | |
| tree | bb7dd2400bfc002dc5794466d3a74d39a80f8b00 /test/storage | |
| parent | eed7dedf030ed71aac6d004becef42dbec5606bf (diff) | |
| download | qtlocation-mapboxgl-197f0ca6b418a27412bfcc7e891ab80949fd8833.tar.gz | |
[android] use AAssetManager instead of libzip
Diffstat (limited to 'test/storage')
| -rw-r--r-- | test/storage/asset_file_source.test.cpp | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/test/storage/asset_file_source.test.cpp b/test/storage/asset_file_source.test.cpp index 7e634fc68e..010a2c9dc7 100644 --- a/test/storage/asset_file_source.test.cpp +++ b/test/storage/asset_file_source.test.cpp @@ -6,28 +6,16 @@ #include <gtest/gtest.h> -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 "test/fixtures/storage/assets"; -#endif -} - -} // namespace - using namespace mbgl; +#if !ANDROID TEST(AssetFileSource, Load) { util::RunLoop loop; - AssetFileSource fs(getFileSourceRoot()); + AssetFileSource fs("test/fixtures/storage/assets"); // iOS seems to run out of file descriptors... -#if TARGET_OS_IPHONE || __ANDROID__ +#if TARGET_OS_IPHONE unsigned numThreads = 30; #else unsigned numThreads = 50; @@ -91,7 +79,7 @@ TEST(AssetFileSource, Load) { TEST(AssetFileSource, EmptyFile) { util::RunLoop loop; - AssetFileSource fs(getFileSourceRoot()); + AssetFileSource fs("test/fixtures/storage/assets"); std::unique_ptr<AsyncRequest> req = fs.request({ Resource::Unknown, "asset://empty" }, [&](Response res) { req.reset(); @@ -107,7 +95,7 @@ TEST(AssetFileSource, EmptyFile) { TEST(AssetFileSource, NonEmptyFile) { util::RunLoop loop; - AssetFileSource fs(getFileSourceRoot()); + AssetFileSource fs("test/fixtures/storage/assets"); std::unique_ptr<AsyncRequest> req = fs.request({ Resource::Unknown, "asset://nonempty" }, [&](Response res) { req.reset(); @@ -123,7 +111,7 @@ TEST(AssetFileSource, NonEmptyFile) { TEST(AssetFileSource, NonExistentFile) { util::RunLoop loop; - AssetFileSource fs(getFileSourceRoot()); + AssetFileSource fs("test/fixtures/storage/assets"); std::unique_ptr<AsyncRequest> req = fs.request({ Resource::Unknown, "asset://does_not_exist" }, [&](Response res) { req.reset(); @@ -140,7 +128,7 @@ TEST(AssetFileSource, NonExistentFile) { TEST(AssetFileSource, ReadDirectory) { util::RunLoop loop; - AssetFileSource fs(getFileSourceRoot()); + AssetFileSource fs("test/fixtures/storage/assets"); std::unique_ptr<AsyncRequest> req = fs.request({ Resource::Unknown, "asset://directory" }, [&](Response res) { req.reset(); @@ -157,7 +145,7 @@ TEST(AssetFileSource, ReadDirectory) { TEST(AssetFileSource, URLEncoding) { util::RunLoop loop; - AssetFileSource fs(getFileSourceRoot()); + AssetFileSource fs("test/fixtures/storage/assets"); std::unique_ptr<AsyncRequest> req = fs.request({ Resource::Unknown, "asset://%6eonempty" }, [&](Response res) { req.reset(); @@ -169,3 +157,4 @@ TEST(AssetFileSource, URLEncoding) { loop.run(); } +#endif |