Ignore deactivate when no valid EGL display. Fixes #1435

Initialise NativeMapView's EGL variables before Map

Fix hang

Add check for double pause

Add test for double pause

2 files changed, 70 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("", "");
+}