[lmi-commits] [lmi] master d7c8356 2/2: Try to detect any unexpected modal dialogs in the GUI test

[Greg Chicares]

branch: master
commit d7c83565ef5136609ff02a0631b050b4689c499f
Author: Vadim Zeitlin <vadim@tt-solutions.com>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Try to detect any unexpected modal dialogs in the GUI test
    
    Ensure that wxTestingModalHook remains in place for long enough, and
    notably longer than the "close_top_window_on_scope_exit" object, so that
    any modal dialogs possibly shown from this object destructor would
    result in an exception and an error message in the test output, rather
    than simply preventing the test from ever exiting.
---
 main_wx_test.cpp | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/main_wx_test.cpp b/main_wx_test.cpp
index 337eb43..d6041d8 100644
--- a/main_wx_test.cpp
+++ b/main_wx_test.cpp
@@ -816,32 +816,6 @@ void SkeletonTest::RunTheTests()
         return;
         }
 
-    // Whatever happens, ensure that the main window is closed and thus the
-    // main loop terminated and the application exits at the end of the tests.
-    class ensure_top_window_closed
-    {
-      public:
-        explicit ensure_top_window_closed(wxApp* app)
-            :app_ {app}
-        {
-        }
-
-        ensure_top_window_closed(ensure_top_window_closed const&) = delete;
-        ensure_top_window_closed& operator=(ensure_top_window_closed const&) = 
delete;
-
-        ~ensure_top_window_closed()
-        {
-        wxWindow* const top = app_->GetTopWindow();
-        if(top)
-            {
-            top->Close(true); // force close
-            }
-        }
-
-      private:
-        wxApp const* const app_;
-    } close_top_window_on_scope_exit(this);
-
     // Close any initially opened dialogs (e.g. "About" dialog shown unless a
     // special command line option is specified).
     for(;;)
@@ -871,6 +845,32 @@ void SkeletonTest::RunTheTests()
     // happen, this is important for the test to really run unattended.
     wxTestingModalHook expect_no_dialogs;
 
+    // Whatever happens, ensure that the main window is closed and thus the
+    // main loop terminated and the application exits at the end of the tests.
+    class ensure_top_window_closed
+    {
+      public:
+        explicit ensure_top_window_closed(wxApp* app)
+            :app_ {app}
+        {
+        }
+
+        ensure_top_window_closed(ensure_top_window_closed const&) = delete;
+        ensure_top_window_closed& operator=(ensure_top_window_closed const&) = 
delete;
+
+        ~ensure_top_window_closed()
+        {
+        wxWindow* const top = app_->GetTopWindow();
+        if(top)
+            {
+            top->Close(true); // force close
+            }
+        }
+
+      private:
+        wxApp const* const app_;
+    } close_top_window_on_scope_exit(this);
+
     MainWin->SetFocus();
 
     std::cout << "NOTE: starting the test suite" << std::endl;