lmi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[lmi-commits] [6108] Improve GUI-test diagnostics


From: Greg Chicares
Subject: [lmi-commits] [6108] Improve GUI-test diagnostics
Date: Sat, 31 Jan 2015 00:15:23 +0000

Revision: 6108
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6108
Author:   chicares
Date:     2015-01-31 00:15:22 +0000 (Sat, 31 Jan 2015)
Log Message:
-----------
Improve GUI-test diagnostics

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/wx_test_about_version.cpp
    lmi/trunk/wx_test_calculation_summary.cpp
    lmi/trunk/wx_test_create_open.cpp
    lmi/trunk/wx_test_default_update.cpp
    lmi/trunk/wx_test_new.hpp
    lmi/trunk/wx_test_paste_census.cpp
    lmi/trunk/wx_test_validate_output.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2015-01-31 00:13:22 UTC (rev 6107)
+++ lmi/trunk/ChangeLog 2015-01-31 00:15:22 UTC (rev 6108)
@@ -35644,3 +35644,25 @@
 Remove duplicative object file from makefiles. See:
   http://lists.nongnu.org/archive/html/lmi/2015-01/msg00033.html
 
+20150131T0012Z <address@hidden> [516]
+
+  custom_io_1.cpp
+Mark automatically generated input files as such.
+
+20150131T0013Z <address@hidden> [516]
+
+  test_coding_rules.cpp
+Exempt automatically generated input files from private taboos.
+
+20150131T0015Z <address@hidden> [516]
+
+  wx_test_about_version.cpp
+  wx_test_calculation_summary.cpp
+  wx_test_create_open.cpp
+  wx_test_default_update.cpp
+  wx_test_new.hpp
+  wx_test_paste_census.cpp
+  wx_test_validate_output.cpp
+Improve GUI-test diagnostics. See:
+  http://lists.nongnu.org/archive/html/lmi/2015-01/msg00027.html
+

Modified: lmi/trunk/wx_test_about_version.cpp
===================================================================
--- lmi/trunk/wx_test_about_version.cpp 2015-01-31 00:13:22 UTC (rev 6107)
+++ lmi/trunk/wx_test_about_version.cpp 2015-01-31 00:15:22 UTC (rev 6108)
@@ -232,6 +232,11 @@
 
                     return wxID_OK;
                     }
+
+                virtual wxString GetDefaultDescription() const
+                    {
+                    return "license dialog";
+                    }
             };
 
             wxUIActionSimulator z;
@@ -243,6 +248,11 @@
 
             return wxID_OK;
             }
+
+        virtual wxString GetDefaultDescription() const
+            {
+            return "about dialog";
+            }
     };
 
     wxUIActionSimulator z;

Modified: lmi/trunk/wx_test_calculation_summary.cpp
===================================================================
--- lmi/trunk/wx_test_calculation_summary.cpp   2015-01-31 00:13:22 UTC (rev 
6107)
+++ lmi/trunk/wx_test_calculation_summary.cpp   2015-01-31 00:15:22 UTC (rev 
6108)
@@ -150,6 +150,11 @@
             return wxID_OK;
             }
 
+        virtual wxString GetDefaultDescription() const
+            {
+            return "preferences dialog";
+            }
+
       private:
         bool const use_builtin_summary_;
     };

Modified: lmi/trunk/wx_test_create_open.cpp
===================================================================
--- lmi/trunk/wx_test_create_open.cpp   2015-01-31 00:13:22 UTC (rev 6107)
+++ lmi/trunk/wx_test_create_open.cpp   2015-01-31 00:15:22 UTC (rev 6108)
@@ -64,7 +64,8 @@
         {
         wxTEST_DIALOG
             (wxYield()
-            ,wxExpectDismissableModal<MvcController>(wxID_OK)
+            ,wxExpectDismissableModal<MvcController>(wxID_OK).
+                Describe("new file properties")
             );
         }
     wxYield();
@@ -72,7 +73,7 @@
     z.Char(uses_dialog ? 'a' : 's', wxMOD_CONTROL); // save or save as
     wxTEST_DIALOG
         (wxYield()
-        ,wxExpectModal<wxFileDialog>(file)
+        ,wxExpectModal<wxFileDialog>(file).Describe("save file dialog")
         );
     wxYield();
 
@@ -88,15 +89,16 @@
         {
         wxTEST_DIALOG
             (wxYield()
-            ,wxExpectModal<wxFileDialog>(file)
-            ,wxExpectDismissableModal<MvcController>(wxID_OK)
+            ,wxExpectModal<wxFileDialog>(file).Describe("open file dialog")
+            ,wxExpectDismissableModal<MvcController>(wxID_OK).
+                Describe("existing file properties")
             );
         }
     else
         {
         wxTEST_DIALOG
             (wxYield()
-            ,wxExpectModal<wxFileDialog>(file)
+            ,wxExpectModal<wxFileDialog>(file).Describe("open file dialog")
             );
         }
     wxYield();

Modified: lmi/trunk/wx_test_default_update.cpp
===================================================================
--- lmi/trunk/wx_test_default_update.cpp        2015-01-31 00:13:22 UTC (rev 
6107)
+++ lmi/trunk/wx_test_default_update.cpp        2015-01-31 00:15:22 UTC (rev 
6108)
@@ -83,6 +83,11 @@
 
             return wxID_OK;
             }
+
+        virtual wxString GetDefaultDescription() const
+            {
+            return "defaults dialog";
+            }
     };
 
     wxTEST_DIALOG

Modified: lmi/trunk/wx_test_new.hpp
===================================================================
--- lmi/trunk/wx_test_new.hpp   2015-01-31 00:13:22 UTC (rev 6107)
+++ lmi/trunk/wx_test_new.hpp   2015-01-31 00:15:22 UTC (rev 6108)
@@ -100,7 +100,10 @@
     {
         do_close();
 
-        wxTEST_DIALOG(wxYield(), wxExpectModal<wxMessageDialog>(wxNO));
+        wxTEST_DIALOG(wxYield()
+                     ,wxExpectModal<wxMessageDialog>(wxNO).
+                        Describe("message box confirming closing modified 
file")
+                     );
     }
 
   protected:
@@ -137,7 +140,9 @@
     // Default constructor creates an illustration with the default parameters.
     wx_test_new_illustration()
     {
-        do_new_illustration(wxExpectDismissableModal<MvcController>(wxID_OK));
+        do_new_illustration(wxExpectDismissableModal<MvcController>(wxID_OK).
+                                Describe("new illustration properties")
+                           );
     }
 
     // This constructor takes a class responsible for handling the illustration

Modified: lmi/trunk/wx_test_paste_census.cpp
===================================================================
--- lmi/trunk/wx_test_paste_census.cpp  2015-01-31 00:13:22 UTC (rev 6107)
+++ lmi/trunk/wx_test_paste_census.cpp  2015-01-31 00:15:22 UTC (rev 6108)
@@ -325,6 +325,11 @@
 
             return wxID_OK;
             }
+
+        virtual wxString GetDefaultDescription() const
+            {
+            return "class defaults dialog";
+            }
     };
 
     // The menu command above should have opened the "Class defaults" dialog 
and
@@ -334,7 +339,8 @@
     wxTEST_DIALOG
         (wxYield()
         ,change_gender_in_class_defaults_dialog()
-        ,wxExpectModal<wxMessageDialog>(wxYES)
+        ,wxExpectModal<wxMessageDialog>(wxYES).
+            Describe("message box asking whether to apply gender changes to 
all")
         );
 
     // Check that all columns, including the "Gender" one, are still shown.
@@ -403,6 +409,11 @@
 
             return wxID_OK;
             }
+
+        virtual wxString GetDefaultDescription() const
+            {
+            return "case defaults dialog";
+            }
     };
 
     // The menu command above should have opened the "Case defaults" dialog and
@@ -412,7 +423,8 @@
     wxTEST_DIALOG
         (wxYield()
         ,change_class_in_case_defaults_dialog()
-        ,wxExpectModal<wxMessageDialog>(wxYES)
+        ,wxExpectModal<wxMessageDialog>(wxYES).
+            Describe("message box asking whether to apply class changes to 
all")
         );
 
     // Check that we still have the same cells but that now the underwriting
@@ -434,7 +446,8 @@
     ui.Char('a', wxMOD_CONTROL);    // "File|Save as"
     wxTEST_DIALOG
         (wxYield()
-        ,wxExpectModal<wxFileDialog>(census_file_name)
+        ,wxExpectModal<wxFileDialog>(census_file_name).
+            Describe("census save file dialog")
         );
 
     LMI_ASSERT(output_cns.exists());

Modified: lmi/trunk/wx_test_validate_output.cpp
===================================================================
--- lmi/trunk/wx_test_validate_output.cpp       2015-01-31 00:13:22 UTC (rev 
6107)
+++ lmi/trunk/wx_test_validate_output.cpp       2015-01-31 00:15:22 UTC (rev 
6108)
@@ -201,6 +201,11 @@
 
             return wxID_OK;
             }
+
+        virtual wxString GetDefaultDescription() const
+            {
+            return "illustration properties dialog";
+            }
     };
 
     // Create a new illustration with the special comment.
@@ -221,13 +226,20 @@
     ui.Char('o', wxMOD_CONTROL);    // "File|Open"
     wxTEST_DIALOG
         (wxYield()
-        
,wxExpectModal<wxFileDialog>(get_test_file_path_for("MonthlyTrace.ill"))
-        ,wxExpectModal<wxMessageDialog>(wxID_OK)          // Ignore warning.
-        ,wxExpectDismissableModal<MvcController>(wxID_OK) // Accept defaults.
+        
,wxExpectModal<wxFileDialog>(get_test_file_path_for("MonthlyTrace.ill")).
+            Describe("illustration open file dialog")
+        ,wxExpectModal<wxMessageDialog>(wxID_OK).
+            Describe("warning message box after opening the illustration")
+        ,wxExpectDismissableModal<MvcController>(wxID_OK).
+            Describe("illustration parameters dialog")
         );
 
     ui.Char('l', wxMOD_CONTROL);    // "File|Close"
-    wxTEST_DIALOG(wxYield(), wxExpectModal<wxMessageDialog>(wxNO));
+    wxTEST_DIALOG
+        (wxYield()
+        ,wxExpectModal<wxMessageDialog>(wxNO).
+            Describe("message box confirming closing modified illustration")
+        );
 
     LMI_ASSERT(existing_trace.exists());
 }
@@ -256,7 +268,8 @@
 
     wxTEST_DIALOG
         (wxYield()
-        ,wxExpectDismissableModal<MvcController>(wxID_OK)
+        ,wxExpectDismissableModal<MvcController>(wxID_OK).
+            Describe("new MEC parameters dialog")
         );
 
     ui.Char('l', wxMOD_CONTROL);    // "File|Close"
@@ -270,8 +283,10 @@
     ui.Char('o', wxMOD_CONTROL);    // "File|Open"
     wxTEST_DIALOG
         (wxYield()
-         ,wxExpectModal<wxFileDialog>(get_test_file_path_for("MecTesting.mec"))
-         ,wxExpectDismissableModal<MvcController>(wxID_OK) // Accept defaults.
+         
,wxExpectModal<wxFileDialog>(get_test_file_path_for("MecTesting.mec")).
+            Describe("MEC open file dialog")
+         ,wxExpectDismissableModal<MvcController>(wxID_OK).
+            Describe("MEC parameters dialog")
         );
 
     ui.Char('l', wxMOD_CONTROL);    // "File|Close"




reply via email to

[Prev in Thread] Current Thread [Next in Thread]