From 7b39ce95210ceb6640b3a3399dacd1d0e826ac1f Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 18 Feb 2016 10:48:51 -0800 Subject: [core] Remove ThreadContext::getFileSource; instead thread FileSource through --- test/sprite/sprite_store.cpp | 6 +----- test/style/glyph_store.cpp | 3 +-- test/style/source.cpp | 24 ++++++++++++------------ test/style/style.cpp | 9 +++++++-- 4 files changed, 21 insertions(+), 21 deletions(-) (limited to 'test') diff --git a/test/sprite/sprite_store.cpp b/test/sprite/sprite_store.cpp index ee6ea2e9e0..ec7b91b875 100644 --- a/test/sprite/sprite_store.cpp +++ b/test/sprite/sprite_store.cpp @@ -156,7 +156,6 @@ public: SpriteStoreTest() : spriteStore(1.0) {} - util::ThreadContext context { "Map", util::ThreadType::Map, util::ThreadPriority::Regular }; util::RunLoop loop; StubFileSource fileSource; StubStyleObserver observer; @@ -166,11 +165,8 @@ public: // Squelch logging. Log::setObserver(std::make_unique()); - util::ThreadContext::Set(&context); - util::ThreadContext::setFileSource(&fileSource); - spriteStore.setObserver(&observer); - spriteStore.setURL("test/fixtures/resources/sprite"); + spriteStore.load("test/fixtures/resources/sprite", fileSource); loop.run(); } diff --git a/test/style/glyph_store.cpp b/test/style/glyph_store.cpp index 55f19672af..ff88841450 100644 --- a/test/style/glyph_store.cpp +++ b/test/style/glyph_store.cpp @@ -17,14 +17,13 @@ public: util::RunLoop loop; StubFileSource fileSource; StubStyleObserver observer; - GlyphStore glyphStore; + GlyphStore glyphStore { fileSource }; void run(const std::string& url, const std::string& fontStack, const std::set& glyphRanges) { // Squelch logging. Log::setObserver(std::make_unique()); util::ThreadContext::Set(&context); - util::ThreadContext::setFileSource(&fileSource); glyphStore.setObserver(&observer); glyphStore.setURL(url); diff --git a/test/style/source.cpp b/test/style/source.cpp index 993d827ce1..bbe37fcf05 100644 --- a/test/style/source.cpp +++ b/test/style/source.cpp @@ -31,7 +31,7 @@ public: Worker worker { 1 }; gl::TexturePool texturePool; MapData mapData { MapMode::Still, GLContextMode::Unique, 1.0 }; - Style style { mapData }; + Style style { mapData, fileSource }; StyleUpdateParameters updateParameters { 1.0, @@ -39,6 +39,7 @@ public: TimePoint(), transformState, worker, + fileSource, texturePool, true, MapMode::Continuous, @@ -51,7 +52,6 @@ public: Log::setObserver(std::make_unique()); util::ThreadContext::Set(&context); - util::ThreadContext::setFileSource(&fileSource); transform.resize({{ 512, 512 }}); transform.setLatLngZoom({0, 0}, 0); @@ -88,7 +88,7 @@ TEST(Source, LoadingFail) { Source source(SourceType::Vector, "source", "url", 512, nullptr, nullptr); source.setObserver(&test.observer); - source.load(); + source.load(test.fileSource); test.run(); } @@ -111,7 +111,7 @@ TEST(Source, LoadingCorrupt) { Source source(SourceType::Vector, "source", "url", 512, nullptr, nullptr); source.setObserver(&test.observer); - source.load(); + source.load(test.fileSource); test.run(); } @@ -139,7 +139,7 @@ TEST(Source, RasterTileEmpty) { Source source(SourceType::Raster, "source", "", 512, std::move(info), nullptr); source.setObserver(&test.observer); - source.load(); + source.load(test.fileSource); source.update(test.updateParameters); test.run(); @@ -168,7 +168,7 @@ TEST(Source, VectorTileEmpty) { Source source(SourceType::Vector, "source", "", 512, std::move(info), nullptr); source.setObserver(&test.observer); - source.load(); + source.load(test.fileSource); source.update(test.updateParameters); test.run(); @@ -197,7 +197,7 @@ TEST(Source, RasterTileFail) { Source source(SourceType::Raster, "source", "", 512, std::move(info), nullptr); source.setObserver(&test.observer); - source.load(); + source.load(test.fileSource); source.update(test.updateParameters); test.run(); @@ -226,7 +226,7 @@ TEST(Source, VectorTileFail) { Source source(SourceType::Vector, "source", "", 512, std::move(info), nullptr); source.setObserver(&test.observer); - source.load(); + source.load(test.fileSource); source.update(test.updateParameters); test.run(); @@ -254,7 +254,7 @@ TEST(Source, RasterTileCorrupt) { Source source(SourceType::Raster, "source", "", 512, std::move(info), nullptr); source.setObserver(&test.observer); - source.load(); + source.load(test.fileSource); source.update(test.updateParameters); test.run(); @@ -287,7 +287,7 @@ TEST(Source, VectorTileCorrupt) { Source source(SourceType::Vector, "source", "", 512, std::move(info), nullptr); source.setObserver(&test.observer); - source.load(); + source.load(test.fileSource); source.update(test.updateParameters); test.run(); @@ -314,7 +314,7 @@ TEST(Source, RasterTileCancel) { Source source(SourceType::Raster, "source", "", 512, std::move(info), nullptr); source.setObserver(&test.observer); - source.load(); + source.load(test.fileSource); source.update(test.updateParameters); test.run(); @@ -341,7 +341,7 @@ TEST(Source, VectorTileCancel) { Source source(SourceType::Vector, "source", "", 512, std::move(info), nullptr); source.setObserver(&test.observer); - source.load(); + source.load(test.fileSource); source.update(test.updateParameters); test.run(); diff --git a/test/style/style.cpp b/test/style/style.cpp index 59366ea7dd..b4211cb071 100644 --- a/test/style/style.cpp +++ b/test/style/style.cpp @@ -1,4 +1,5 @@ #include "../fixtures/util.hpp" +#include "../fixtures/stub_file_source.hpp" #include #include @@ -7,11 +8,13 @@ using namespace mbgl; TEST(Style, UnusedSource) { + util::RunLoop loop; util::ThreadContext context { "Map", util::ThreadType::Map, util::ThreadPriority::Regular }; util::ThreadContext::Set(&context); MapData data { MapMode::Still, GLContextMode::Unique, 1.0 }; - Style style { data }; + StubFileSource fileSource; + Style style { data, fileSource }; style.setJSON(util::read_file("test/fixtures/resources/style-unused-sources.json"), ""); style.cascade(); @@ -27,11 +30,13 @@ TEST(Style, UnusedSource) { } TEST(Style, UnusedSourceActiveViaClassUpdate) { + util::RunLoop loop; util::ThreadContext context { "Map", util::ThreadType::Map, util::ThreadPriority::Regular }; util::ThreadContext::Set(&context); MapData data { MapMode::Still, GLContextMode::Unique, 1.0 }; - Style style { data }; + StubFileSource fileSource; + Style style { data, fileSource }; data.addClass("visible"); -- cgit v1.2.1