diff options
author | Brad Leege <bleege@gmail.com> | 2015-05-11 11:42:21 -0500 |
---|---|---|
committer | Brad Leege <bleege@gmail.com> | 2015-05-11 11:42:21 -0500 |
commit | d4fcb5bb98ed932f2bfe9d1fec09990ef6377253 (patch) | |
tree | f4ba1b65ff887c18fc7974257cb28921eb73b90c /test | |
parent | 9a233c7ed295a73da1abf3a7feffe6eec2cf9963 (diff) | |
parent | 703e0bc2ee609a59e90b7ba3ddefffaf17291bf4 (diff) | |
download | qtlocation-mapboxgl-d4fcb5bb98ed932f2bfe9d1fec09990ef6377253.tar.gz |
Merge pull request #1469 from mapbox/1435-android-gl-crash
Android GL Crash
Diffstat (limited to 'test')
-rw-r--r-- | test/miscellaneous/map.cpp | 59 | ||||
-rw-r--r-- | test/miscellaneous/map_context.cpp | 22 | ||||
-rw-r--r-- | test/test.gypi | 1 |
3 files changed, 71 insertions, 11 deletions
diff --git a/test/miscellaneous/map.cpp b/test/miscellaneous/map.cpp index 5834addb7b..b8707f3902 100644 --- a/test/miscellaneous/map.cpp +++ b/test/miscellaneous/map.cpp @@ -1,22 +1,59 @@ #include "../fixtures/util.hpp" -#include <mbgl/util/run_loop.hpp> -#include <mbgl/map/map_data.hpp> -#include <mbgl/map/map_context.hpp> +#include <mbgl/map/map.hpp> #include <mbgl/platform/default/headless_view.hpp> #include <mbgl/platform/default/headless_display.hpp> #include <mbgl/storage/default_file_source.hpp> using namespace mbgl; -TEST(MapContext, DoubleStyleLoad) { - util::RunLoop runLoop(uv_default_loop()); - std::shared_ptr<HeadlessDisplay> display = std::make_shared<HeadlessDisplay>(); - HeadlessView view(display, 512, 512, 1); +TEST(Map, PauseResume) { + using namespace mbgl; + + auto display = std::make_shared<mbgl::HeadlessDisplay>(); + HeadlessView view(display); + DefaultFileSource fileSource(nullptr); + + Map map(view, fileSource, MapMode::Continuous); + + map.pause(); + map.resume(); +} + +TEST(Map, DoublePause) { + using namespace mbgl; + + auto display = std::make_shared<mbgl::HeadlessDisplay>(); + HeadlessView view(display); + DefaultFileSource fileSource(nullptr); + + Map map(view, fileSource, MapMode::Continuous); + + map.pause(); + map.pause(); + map.resume(); +} + +TEST(Map, ResumeWithoutPause) { + using namespace mbgl; + + auto display = std::make_shared<mbgl::HeadlessDisplay>(); + HeadlessView view(display); + DefaultFileSource fileSource(nullptr); + + Map map(view, fileSource, MapMode::Continuous); + + map.resume(); +} + +TEST(Map, DestroyPaused) { + using namespace mbgl; + + auto display = std::make_shared<mbgl::HeadlessDisplay>(); + HeadlessView view(display); DefaultFileSource fileSource(nullptr); - MapData data(view, MapMode::Continuous); - MapContext context(uv_default_loop(), view, fileSource, data, false); - context.setStyleJSON("", ""); - context.setStyleJSON("", ""); + Map map(view, fileSource, MapMode::Continuous); + + map.pause(); } diff --git a/test/miscellaneous/map_context.cpp b/test/miscellaneous/map_context.cpp new file mode 100644 index 0000000000..0b465aa3ce --- /dev/null +++ b/test/miscellaneous/map_context.cpp @@ -0,0 +1,22 @@ +#include "../fixtures/util.hpp" + +#include <mbgl/util/run_loop.hpp> +#include <mbgl/map/map_data.hpp> +#include <mbgl/map/map_context.hpp> +#include <mbgl/platform/default/headless_view.hpp> +#include <mbgl/platform/default/headless_display.hpp> +#include <mbgl/storage/default_file_source.hpp> + +using namespace mbgl; + +TEST(MapContext, DoubleStyleLoad) { + util::RunLoop runLoop(uv_default_loop()); + std::shared_ptr<HeadlessDisplay> display = std::make_shared<HeadlessDisplay>(); + HeadlessView view(display, 512, 512, 1); + DefaultFileSource fileSource(nullptr); + MapData data(view, MapMode::Continuous); + MapContext context(uv_default_loop(), view, fileSource, data); + + context.setStyleJSON("", ""); + context.setStyleJSON("", ""); +} diff --git a/test/test.gypi b/test/test.gypi index a98137f449..f86878b2f7 100644 --- a/test/test.gypi +++ b/test/test.gypi @@ -46,6 +46,7 @@ 'miscellaneous/enums.cpp', 'miscellaneous/functions.cpp', 'miscellaneous/map.cpp', + 'miscellaneous/map_context.cpp', 'miscellaneous/mapbox.cpp', 'miscellaneous/merge_lines.cpp', 'miscellaneous/rotation_range.cpp', |