summaryrefslogtreecommitdiff
path: root/test/api
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2015-04-23 11:46:22 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-04-28 14:32:24 -0400
commita625ba8a0976ef8417a2609700187c5633be2c58 (patch)
treeee61c1e8b6bde556b2c93f4730ea806547f6090a /test/api
parentc84e8862226e6f89538b34fafd592182caf9008b (diff)
downloadqtlocation-mapboxgl-a625ba8a0976ef8417a2609700187c5633be2c58.tar.gz
Remove Map::start/stop
Both Android and iOS now use pause/resume. The map thread is always running, and be able to receive messages. When paused, it will just refuse to render.
Diffstat (limited to 'test/api')
-rw-r--r--test/api/repeated_render.cpp6
-rw-r--r--test/api/set_style.cpp11
2 files changed, 5 insertions, 12 deletions
diff --git a/test/api/repeated_render.cpp b/test/api/repeated_render.cpp
index 6dbc001eae..58df8e83b6 100644
--- a/test/api/repeated_render.cpp
+++ b/test/api/repeated_render.cpp
@@ -22,9 +22,7 @@ TEST(API, RepeatedRender) {
Log::setObserver(util::make_unique<FixtureLogObserver>());
- Map map(view, fileSource);
-
- map.start(MapMode::Still);
+ Map map(view, fileSource, MapMode::Still);
{
view.resize(128, 512, 1);
@@ -54,8 +52,6 @@ TEST(API, RepeatedRender) {
util::write_file("test/fixtures/api/2.png", png);
}
- map.stop();
-
auto observer = Log::removeObserver();
auto flo = dynamic_cast<FixtureLogObserver*>(observer.get());
auto unchecked = flo->unchecked();
diff --git a/test/api/set_style.cpp b/test/api/set_style.cpp
index c918e665e6..01ce1f0252 100644
--- a/test/api/set_style.cpp
+++ b/test/api/set_style.cpp
@@ -16,13 +16,10 @@ TEST(API, SetStyle) {
Log::setObserver(util::make_unique<FixtureLogObserver>());
- Map map(view, fileSource);
-
- map.start(MapMode::Still);
-
- map.setStyleJSON("invalid", "test/suite");
-
- map.stop();
+ {
+ Map map(view, fileSource, MapMode::Still);
+ map.setStyleJSON("invalid", "test/suite");
+ }
auto observer = Log::removeObserver();
auto flo = dynamic_cast<FixtureLogObserver*>(observer.get());