diff options
Diffstat (limited to 'test/style/style.test.cpp')
| -rw-r--r-- | test/style/style.test.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/test/style/style.test.cpp b/test/style/style.test.cpp index 72f74d3b01..a82868e242 100644 --- a/test/style/style.test.cpp +++ b/test/style/style.test.cpp @@ -2,6 +2,7 @@ #include <mbgl/test/stub_file_source.hpp> #include <mbgl/test/fixture_log_observer.hpp> +#include <mbgl/platform/factory.hpp> #include <mbgl/style/style_impl.hpp> #include <mbgl/style/source_impl.hpp> #include <mbgl/style/sources/vector_source.hpp> @@ -18,8 +19,10 @@ using namespace mbgl::style; TEST(Style, Properties) { util::RunLoop loop; - StubFileSource fileSource; - Style::Impl style { fileSource, 1.0 }; + FileSourceOptions stubFileSourceOptions; + auto fileSource = platform::Factory::sharedFileSource( + stubFileSourceOptions, std::make_shared<StubFileSource>()); + Style::Impl style { 1.0, stubFileSourceOptions }; style.loadJSON(R"STYLE({"name": "Test"})STYLE"); ASSERT_EQ("Test", style.getName()); @@ -60,8 +63,10 @@ TEST(Style, Properties) { TEST(Style, DuplicateSource) { util::RunLoop loop; - StubFileSource fileSource; - Style::Impl style { fileSource, 1.0 }; + FileSourceOptions stubFileSourceOptions; + auto fileSource = platform::Factory::sharedFileSource( + stubFileSourceOptions, std::make_shared<StubFileSource>()); + Style::Impl style { 1.0, stubFileSourceOptions }; style.loadJSON(util::read_file("test/fixtures/resources/style-unused-sources.json")); @@ -81,8 +86,10 @@ TEST(Style, RemoveSourceInUse) { auto log = new FixtureLogObserver(); Log::setObserver(std::unique_ptr<Log::Observer>(log)); - StubFileSource fileSource; - Style::Impl style { fileSource, 1.0 }; + FileSourceOptions stubFileSourceOptions; + auto fileSource = platform::Factory::sharedFileSource( + stubFileSourceOptions, std::make_shared<StubFileSource>()); + Style::Impl style { 1.0, stubFileSourceOptions }; style.loadJSON(util::read_file("test/fixtures/resources/style-unused-sources.json")); |