From 197f0ca6b418a27412bfcc7e891ab80949fd8833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Tue, 11 Apr 2017 17:18:09 +0200 Subject: [android] use AAssetManager instead of libzip --- test/api/custom_layer.test.cpp | 7 ------- test/api/render_missing.test.cpp | 6 ------ test/api/repeated_render.test.cpp | 6 ------ 3 files changed, 19 deletions(-) (limited to 'test/api') 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()); 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()); -- cgit v1.2.1