From 095dc7b16793ed502b3429e0e4c2db7f1207094e Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 11 May 2017 10:29:37 -0700 Subject: [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) --- test/style/source.test.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'test/style') 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(); -- cgit v1.2.1