[lmi-commits] [6098] Fail if an unexpected modal dialog is about to be shown

[Greg Chicares]

Revision: 6098
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6098
Author:   chicares
Date:     2015-01-23 15:26:12 +0000 (Fri, 23 Jan 2015)
Log Message:
-----------
Fail if an unexpected modal dialog is about to be shown

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/main_wx_test.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2015-01-23 15:13:42 UTC (rev 6097)
+++ lmi/trunk/ChangeLog 2015-01-23 15:26:12 UTC (rev 6098)
@@ -35593,3 +35593,9 @@
 Refactor: use output_file_existence_checker. See:
   http://lists.nongnu.org/archive/html/lmi/2014-12/msg00096.html
 
+20150123T1526Z <address@hidden> [516]
+
+  main_wx_test.cpp
+Fail if an unexpected modal dialog is about to be shown. See:
+  http://lists.nongnu.org/archive/html/lmi/2014-12/msg00097.html
+

Modified: lmi/trunk/main_wx_test.cpp
===================================================================
--- lmi/trunk/main_wx_test.cpp  2015-01-23 15:13:42 UTC (rev 6097)
+++ lmi/trunk/main_wx_test.cpp  2015-01-23 15:26:12 UTC (rev 6098)
@@ -45,6 +45,7 @@
 #include <wx/msgdlg.h>
 #include <wx/scopeguard.h>
 #include <wx/stopwatch.h>
+#include <wx/testing.h>
 #include <wx/uiaction.h>
 #include <wx/wfstream.h>
 
@@ -761,6 +762,13 @@
             }
         }
 
+    // Any dialog shown during the tests should be accounted for and dismissed
+    // before it gets to this outer hook by the testing hook expecting it, so
+    // this hook should never be invoked and we install it to ensure that it
+    // prevents any unexpected modal dialogs from being shown if they do
+    // happen, this is important for the test to really run unattended.
+    wxTestingModalHook expect_no_dialogs;
+
     mainWin->SetFocus();
 
     wxLogMessage("NOTE: starting the test suite");