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/api | |
| parent | eed7dedf030ed71aac6d004becef42dbec5606bf (diff) | |
| download | qtlocation-mapboxgl-197f0ca6b418a27412bfcc7e891ab80949fd8833.tar.gz | |
[android] use AAssetManager instead of libzip
Diffstat (limited to 'test/api')
| -rw-r--r-- | test/api/custom_layer.test.cpp | 7 | ||||
| -rw-r--r-- | test/api/render_missing.test.cpp | 6 | ||||
| -rw-r--r-- | test/api/repeated_render.test.cpp | 6 |
3 files changed, 0 insertions, 19 deletions
diff --git a/test/api/custom_layer.test.cpp b/test/api/custom_layer.test.cpp index 658c5333c3..5a30220cd7 100644 --- a/test/api/custom_layer.test.cpp +++ b/test/api/custom_layer.test.cpp @@ -89,14 +89,7 @@ TEST(CustomLayer, Basic) { HeadlessBackend backend { test::sharedDisplay() }; BackendScope scope { backend }; OffscreenView view { backend.getContext() }; - -#ifdef MBGL_ASSET_ZIP - // Regenerate with `cd test/fixtures/api/ && zip -r assets.zip assets/` - DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets.zip"); -#else DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets"); -#endif - ThreadPool threadPool(4); Map map(backend, view.getSize(), 1, fileSource, threadPool, MapMode::Still); diff --git a/test/api/render_missing.test.cpp b/test/api/render_missing.test.cpp index 8637462cbe..6e99501708 100644 --- a/test/api/render_missing.test.cpp +++ b/test/api/render_missing.test.cpp @@ -29,13 +29,7 @@ TEST(API, TEST_REQUIRES_SERVER(RenderMissingTile)) { HeadlessBackend backend { test::sharedDisplay() }; BackendScope scope { backend }; OffscreenView view { backend.getContext(), { 256, 512 } }; -#ifdef MBGL_ASSET_ZIP - // Regenerate with `cd test/fixtures/api/ && zip -r assets.zip assets/` - DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets.zip"); -#else DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets"); -#endif - ThreadPool threadPool(4); Log::setObserver(std::make_unique<FixtureLogObserver>()); diff --git a/test/api/repeated_render.test.cpp b/test/api/repeated_render.test.cpp index 6648a7752e..0b9726d3fa 100644 --- a/test/api/repeated_render.test.cpp +++ b/test/api/repeated_render.test.cpp @@ -25,13 +25,7 @@ TEST(API, RepeatedRender) { HeadlessBackend backend { test::sharedDisplay() }; BackendScope scope { backend }; OffscreenView view { backend.getContext(), { 256, 512 } }; -#ifdef MBGL_ASSET_ZIP - // Regenerate with `cd test/fixtures/api/ && zip -r assets.zip assets/` - DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets.zip"); -#else DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets"); -#endif - ThreadPool threadPool(4); Log::setObserver(std::make_unique<FixtureLogObserver>()); |