diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-20 17:10:33 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-02 08:45:09 -0700 |
commit | 197751bace6181f2c2dbe4c890f277a0dc7e58b1 (patch) | |
tree | 55e57a6a1d86d1db26f24d3d58694f69518cbd97 /test/style | |
parent | c2b00378b78b55d50968a9b11ed75bb4edf62ec9 (diff) | |
download | qtlocation-mapboxgl-197751bace6181f2c2dbe4c890f277a0dc7e58b1.tar.gz |
[core] Load source TileJSON immediately
This reverses #3095. Rationale:
* We're now exposing source attributes as a public API. Making those attributes unavailable at certain times complicates that API.
* We're preparing to split RenderSource out of Source. Removing this removes a point of coupling between the two.
Diffstat (limited to 'test/style')
-rw-r--r-- | test/style/style.test.cpp | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/test/style/style.test.cpp b/test/style/style.test.cpp index f87e31cce2..b529abad4a 100644 --- a/test/style/style.test.cpp +++ b/test/style/style.test.cpp @@ -14,78 +14,6 @@ using namespace mbgl; using namespace mbgl::style; -TEST(Style, UnusedSource) { - util::RunLoop loop; - - ThreadPool threadPool{ 1 }; - StubFileSource fileSource; - Style style { threadPool, fileSource, 1.0 }; - - auto now = Clock::now(); - - style.setJSON(util::read_file("test/fixtures/resources/style-unused-sources.json")); - - // If we haven't calculated whether the source is used, we have to assume it is used. - EXPECT_FALSE(style.isLoaded()); - - style.cascade(now, MapMode::Still); - style.recalculate(0, now, MapMode::Still); - - Source* usedSource = style.getSource("usedsource"); - EXPECT_TRUE(usedSource); - EXPECT_TRUE(usedSource->baseImpl->isLoaded()); - - Source* unusedSource = style.getSource("unusedsource"); - EXPECT_TRUE(unusedSource); - EXPECT_FALSE(unusedSource->baseImpl->isLoaded()); - - Layer* unusedLayer = style.getLayer("unusedlayervisibility"); - EXPECT_TRUE(unusedLayer); - - unusedLayer->setVisibility(mbgl::style::VisibilityType::Visible); - - style.relayout(); - EXPECT_FALSE(unusedSource->baseImpl->isLoaded()); - - // Style loads sources upon request when recalculating style. - style.recalculate(0, now, MapMode::Still); - EXPECT_TRUE(unusedSource->baseImpl->isLoaded()); -} - -TEST(Style, UnusedSourceActiveViaClassUpdate) { - util::RunLoop loop; - - ThreadPool threadPool{ 1 }; - StubFileSource fileSource; - Style style { threadPool, fileSource, 1.0 }; - - style.setJSON(util::read_file("test/fixtures/resources/style-unused-sources.json")); - EXPECT_TRUE(style.addClass("visible")); - EXPECT_TRUE(style.hasClass("visible")); - - auto now = Clock::now(); - - style.cascade(now, MapMode::Still); - style.recalculate(0, now, MapMode::Still); - - Source *unusedSource = style.getSource("unusedsource"); - EXPECT_TRUE(unusedSource); - EXPECT_TRUE(unusedSource->baseImpl->isLoaded()); - - // Style classes should be cleared upon new style load. - style.setJSON(util::read_file("test/fixtures/resources/style-unused-sources.json")); - EXPECT_FALSE(style.hasClass("visible")); - - now = Clock::now(); - - style.cascade(now, MapMode::Still); - style.recalculate(0, now, MapMode::Still); - - unusedSource = style.getSource("unusedsource"); - EXPECT_TRUE(unusedSource); - EXPECT_FALSE(unusedSource->baseImpl->isLoaded()); -} - TEST(Style, Properties) { util::RunLoop loop; |