diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-09-01 15:07:17 +0300 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-14 13:44:08 -0700 |
commit | 204c7fee032bf8509747046b43a788366a189ae7 (patch) | |
tree | 8719b7ab8838bea52babd8bf42f2234ddc43dc9a /test/map | |
parent | 18d8e80f52345a13236ae1da99b5866e7643f85b (diff) | |
download | qtlocation-mapboxgl-204c7fee032bf8509747046b43a788366a189ae7.tar.gz |
[core] Render from the main thread
Do not create a thread for the MapContext anymore.
Diffstat (limited to 'test/map')
-rw-r--r-- | test/map/map.cpp | 48 |
1 files changed, 3 insertions, 45 deletions
diff --git a/test/map/map.cpp b/test/map/map.cpp index b1048e97e2..2bc00b4334 100644 --- a/test/map/map.cpp +++ b/test/map/map.cpp @@ -3,59 +3,17 @@ #include <mbgl/map/map.hpp> #include <mbgl/platform/default/headless_view.hpp> #include <mbgl/platform/default/headless_display.hpp> -#include <mbgl/storage/online_file_source.hpp> #include <mbgl/storage/network_status.hpp> -#include <mbgl/storage/offline_database.hpp> #include <mbgl/storage/default_file_source.hpp> #include <mbgl/util/io.hpp> +#include <mbgl/util/run_loop.hpp> using namespace mbgl; using namespace std::literals::string_literals; -TEST(Map, PauseResume) { - auto display = std::make_shared<mbgl::HeadlessDisplay>(); - HeadlessView view(display, 1); - OnlineFileSource fileSource; - - Map map(view, fileSource, MapMode::Continuous); - - map.pause(); - map.resume(); -} - -TEST(Map, DoublePause) { - auto display = std::make_shared<mbgl::HeadlessDisplay>(); - HeadlessView view(display, 1); - OnlineFileSource fileSource; - - Map map(view, fileSource, MapMode::Continuous); - - map.pause(); - map.pause(); - map.resume(); -} - -TEST(Map, ResumeWithoutPause) { - auto display = std::make_shared<mbgl::HeadlessDisplay>(); - HeadlessView view(display, 1); - OnlineFileSource fileSource; - - Map map(view, fileSource, MapMode::Continuous); - - map.resume(); -} - -TEST(Map, DestroyPaused) { - auto display = std::make_shared<mbgl::HeadlessDisplay>(); - HeadlessView view(display, 1); - OnlineFileSource fileSource; - - Map map(view, fileSource, MapMode::Continuous); - - map.pause(); -} - TEST(Map, Offline) { + util::RunLoop runLoop; + auto display = std::make_shared<mbgl::HeadlessDisplay>(); HeadlessView view(display, 1); DefaultFileSource fileSource(":memory:", "."); |