diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-11 10:29:37 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-12 11:26:27 -0700 |
commit | 095dc7b16793ed502b3429e0e4c2db7f1207094e (patch) | |
tree | 929856d13dcec05a610b497cc2256b44725ba184 /test | |
parent | afead4e749794e6d0f6b9cb9bd7897face64104a (diff) | |
download | qtlocation-mapboxgl-095dc7b16793ed502b3429e0e4c2db7f1207094e.tar.gz |
[core] Replace createRender{Source,Layer} with Render{Source,Layer}::create
* Eliminates the need for EnableImmutableFromThis
* Eliminates the dependency of {Source,Layer}::Impl on corresponding Render class (circular dependency)
Diffstat (limited to 'test')
-rw-r--r-- | test/renderer/group_by_layout.test.cpp | 2 | ||||
-rw-r--r-- | test/style/source.test.cpp | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/test/renderer/group_by_layout.test.cpp b/test/renderer/group_by_layout.test.cpp index 9c8e09e222..958f1bdf24 100644 --- a/test/renderer/group_by_layout.test.cpp +++ b/test/renderer/group_by_layout.test.cpp @@ -13,7 +13,7 @@ static std::vector<std::unique_ptr<RenderLayer>> toRenderLayers(const std::vecto std::vector<std::unique_ptr<RenderLayer>> result; result.reserve(layers.size()); for (auto& layer : layers) { - result.push_back(layer->baseImpl->createRenderLayer()); + result.push_back(RenderLayer::create(layer->baseImpl)); } return result; } diff --git a/test/style/source.test.cpp b/test/style/source.test.cpp index ad28db7c19..0473286c8b 100644 --- a/test/style/source.test.cpp +++ b/test/style/source.test.cpp @@ -148,7 +148,7 @@ TEST(Source, RasterTileEmpty) { FAIL() << "Should never be called"; }; - auto renderSource = source.baseImpl->createRenderSource(); + auto renderSource = RenderSource::create(source.baseImpl); renderSource->setObserver(&test.renderSourceObserver); renderSource->updateTiles(test.tileParameters); @@ -179,7 +179,7 @@ TEST(Source, VectorTileEmpty) { FAIL() << "Should never be called"; }; - auto renderSource = source.baseImpl->createRenderSource(); + auto renderSource = RenderSource::create(source.baseImpl); renderSource->setObserver(&test.renderSourceObserver); renderSource->updateTiles(test.tileParameters); @@ -210,7 +210,7 @@ TEST(Source, RasterTileFail) { test.end(); }; - auto renderSource = source.baseImpl->createRenderSource(); + auto renderSource = RenderSource::create(source.baseImpl); renderSource->setObserver(&test.renderSourceObserver); renderSource->updateTiles(test.tileParameters); @@ -241,7 +241,7 @@ TEST(Source, VectorTileFail) { test.end(); }; - auto renderSource = source.baseImpl->createRenderSource(); + auto renderSource = RenderSource::create(source.baseImpl); renderSource->setObserver(&test.renderSourceObserver); renderSource->updateTiles(test.tileParameters); @@ -271,7 +271,7 @@ TEST(Source, RasterTileCorrupt) { test.end(); }; - auto renderSource = source.baseImpl->createRenderSource(); + auto renderSource = RenderSource::create(source.baseImpl); renderSource->setObserver(&test.renderSourceObserver); renderSource->updateTiles(test.tileParameters); @@ -305,7 +305,7 @@ TEST(Source, VectorTileCorrupt) { test.end(); }; - auto renderSource = source.baseImpl->createRenderSource(); + auto renderSource = RenderSource::create(source.baseImpl); renderSource->setObserver(&test.renderSourceObserver); renderSource->updateTiles(test.tileParameters); @@ -334,7 +334,7 @@ TEST(Source, RasterTileCancel) { FAIL() << "Should never be called"; }; - auto renderSource = source.baseImpl->createRenderSource(); + auto renderSource = RenderSource::create(source.baseImpl); renderSource->setObserver(&test.renderSourceObserver); renderSource->updateTiles(test.tileParameters); @@ -363,7 +363,7 @@ TEST(Source, VectorTileCancel) { FAIL() << "Should never be called"; }; - auto renderSource = source.baseImpl->createRenderSource(); + auto renderSource = RenderSource::create(source.baseImpl); renderSource->setObserver(&test.renderSourceObserver); renderSource->updateTiles(test.tileParameters); @@ -401,7 +401,7 @@ TEST(Source, RasterTileAttribution) { source.setObserver(&test.styleObserver); source.loadDescription(test.fileSource); - auto renderSource = source.baseImpl->createRenderSource(); + auto renderSource = RenderSource::create(source.baseImpl); renderSource->updateTiles(test.tileParameters); test.run(); |