diff options
Diffstat (limited to 'test/map')
-rw-r--r-- | test/map/map.test.cpp | 15 | ||||
-rw-r--r-- | test/map/prefetch.test.cpp | 6 |
2 files changed, 8 insertions, 13 deletions
diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp index 3af2acdb8b..ee86ce7f77 100644 --- a/test/map/map.test.cpp +++ b/test/map/map.test.cpp @@ -9,7 +9,6 @@ #include <mbgl/gfx/backend_scope.hpp> #include <mbgl/gl/context.hpp> #include <mbgl/gl/headless_frontend.hpp> -#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/storage/resource_options.hpp> #include <mbgl/storage/network_status.hpp> #include <mbgl/storage/default_file_source.hpp> @@ -34,15 +33,14 @@ class MapTest { public: util::RunLoop runLoop; std::shared_ptr<FileSource> fileSource; - ThreadPool threadPool { 4 }; StubMapObserver observer; HeadlessFrontend frontend; MapAdapter map; MapTest(float pixelRatio = 1, MapMode mode = MapMode::Static) : fileSource(std::make_shared<FileSource>()) - , frontend(pixelRatio, threadPool) - , map(frontend, observer, fileSource, threadPool, + , frontend(pixelRatio) + , map(frontend, observer, fileSource, MapOptions().withMapMode(mode).withSize(frontend.getSize()).withPixelRatio(pixelRatio)) {} template <typename T = FileSource> @@ -50,8 +48,8 @@ public: float pixelRatio = 1, MapMode mode = MapMode::Static, typename std::enable_if<std::is_same<T, DefaultFileSource>::value>::type* = nullptr) : fileSource(std::make_shared<T>(cachePath, assetPath)) - , frontend(pixelRatio, threadPool) - , map(frontend, observer, fileSource, threadPool, + , frontend(pixelRatio) + , map(frontend, observer, fileSource, MapOptions().withMapMode(mode).withSize(frontend.getSize()).withPixelRatio(pixelRatio)) {} }; @@ -744,7 +742,6 @@ TEST(Map, DontLoadUnneededTiles) { TEST(Map, TEST_DISABLED_ON_CI(ContinuousRendering)) { util::RunLoop runLoop; - ThreadPool threadPool { 4 }; using namespace std::chrono_literals; @@ -756,7 +753,7 @@ TEST(Map, TEST_DISABLED_ON_CI(ContinuousRendering)) { util::Timer timer; - HeadlessFrontend frontend(1, threadPool); + HeadlessFrontend frontend(1); StubMapObserver observer; observer.didFinishRenderingFrameCallback = [&] (MapObserver::RenderMode) { @@ -768,7 +765,7 @@ TEST(Map, TEST_DISABLED_ON_CI(ContinuousRendering)) { }); }; - Map map(frontend, observer, threadPool, + Map map(frontend, observer, MapOptions().withMapMode(MapMode::Continuous).withSize(frontend.getSize()), ResourceOptions().withCachePath(":memory:").withAssetPath("test/fixtures/api/assets")); map.getStyle().loadJSON(util::read_file("test/fixtures/api/water.json")); diff --git a/test/map/prefetch.test.cpp b/test/map/prefetch.test.cpp index 3232c99a22..071c918427 100644 --- a/test/map/prefetch.test.cpp +++ b/test/map/prefetch.test.cpp @@ -6,7 +6,6 @@ #include <mbgl/map/map_options.hpp> #include <mbgl/gl/headless_frontend.hpp> #include <mbgl/style/style.hpp> -#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/util/image.hpp> #include <mbgl/util/io.hpp> #include <mbgl/util/run_loop.hpp> @@ -22,7 +21,6 @@ using namespace std::chrono_literals; TEST(Map, PrefetchTiles) { util::RunLoop runLoop; - ThreadPool threadPool(4); std::shared_ptr<StubFileSource> fileSource = std::make_shared<StubFileSource>(); util::Timer emergencyShutoff; @@ -36,8 +34,8 @@ TEST(Map, PrefetchTiles) { runLoop.stop(); }; - HeadlessFrontend frontend { { 512, 512 }, 1, threadPool }; - MapAdapter map(frontend, observer, fileSource, threadPool, + HeadlessFrontend frontend { { 512, 512 }, 1 }; + MapAdapter map(frontend, observer, fileSource, MapOptions().withMapMode(MapMode::Continuous).withSize(frontend.getSize())); std::vector<int> tiles; |