[lmi-commits] [6146] Use wxPrintf() instead of wxLogMessage() for GUI test

[Greg Chicares]

Revision: 6146
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6146
Author:   chicares
Date:     2015-03-26 22:50:31 +0000 (Thu, 26 Mar 2015)
Log Message:
-----------
Use wxPrintf() instead of wxLogMessage() for GUI test

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/wx_test_about_version.cpp
    lmi/trunk/wx_test_benchmark_census.cpp
    lmi/trunk/wx_test_default_input.cpp
    lmi/trunk/wx_test_expiry_dates.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2015-03-19 20:06:15 UTC (rev 6145)
+++ lmi/trunk/ChangeLog 2015-03-26 22:50:31 UTC (rev 6146)
@@ -35907,3 +35907,12 @@
   single_cell_document.cpp
 Use versioned schemata.
 
+20150326T2250Z <address@hidden> [516]
+
+  wx_test_about_version.cpp
+  wx_test_benchmark_census.cpp
+  wx_test_default_input.cpp
+  wx_test_expiry_dates.cpp
+Use wxPrintf() instead of wxLogMessage() for GUI test.
+  http://lists.nongnu.org/archive/html/lmi/2015-03/msg00026.html
+

Modified: lmi/trunk/wx_test_about_version.cpp
===================================================================
--- lmi/trunk/wx_test_about_version.cpp 2015-03-19 20:06:15 UTC (rev 6145)
+++ lmi/trunk/wx_test_about_version.cpp 2015-03-26 22:50:31 UTC (rev 6146)
@@ -31,9 +31,9 @@
 #include "wx_test_case.hpp"
 #include "version.hpp"
 
+#include <wx/crt.h>
 #include <wx/dialog.h>
 #include <wx/html/htmlwin.h>
-#include <wx/log.h>
 #include <wx/testing.h>
 #include <wx/uiaction.h>
 
@@ -179,7 +179,7 @@
 
             // Extract the last word of the dialog title.
             wxString const last_word = d->GetTitle().AfterLast(' ');
-            wxLogMessage("About dialog version string is \"%s\".", last_word);
+            wxPrintf("About dialog version string is \"%s\".\n", last_word);
             LMI_ASSERT_EQUAL(last_word, LMI_VERSION);
 
             // Find the wxHtmlWindow showing the license notices.

Modified: lmi/trunk/wx_test_benchmark_census.cpp
===================================================================
--- lmi/trunk/wx_test_benchmark_census.cpp      2015-03-19 20:06:15 UTC (rev 
6145)
+++ lmi/trunk/wx_test_benchmark_census.cpp      2015-03-26 22:50:31 UTC (rev 
6146)
@@ -31,9 +31,9 @@
 #include "wx_test_statusbar.hpp"
 #include "uncopyable_lmi.hpp"
 
+#include <wx/crt.h>
 #include <wx/dialog.h>
 #include <wx/frame.h>
-#include <wx/log.h>
 #include <wx/scopeguard.h>
 #include <wx/testing.h>
 #include <wx/uiaction.h>
@@ -82,8 +82,8 @@
         long time_real;
         LMI_ASSERT(ms_text.ToLong(&time_real));
 
-        wxLogMessage
-            ("%s for %s: %ldms elapsed"
+        wxPrintf
+            ("%s for %s: %ldms elapsed\n"
             ,operation
             ,name_
             ,time_real

Modified: lmi/trunk/wx_test_default_input.cpp
===================================================================
--- lmi/trunk/wx_test_default_input.cpp 2015-03-19 20:06:15 UTC (rev 6145)
+++ lmi/trunk/wx_test_default_input.cpp 2015-03-26 22:50:31 UTC (rev 6146)
@@ -33,7 +33,7 @@
 #include "wx_test_case.hpp"
 #include "wx_test_date.hpp"
 
-#include <wx/log.h>
+#include <wx/crt.h>
 
 #include <sstream>
 
@@ -73,14 +73,14 @@
 
     calendar_date const first_of_next_month = get_first_next_month(today());
 
-    wxLogMessage
-        ("EffectiveDate: %s; expected: %s"
+    wxPrintf
+        ("EffectiveDate: %s; expected: %s\n"
         ,dump_date(effective_date)
         ,dump_date(first_of_next_month)
         );
     if(effective_date != first_of_next_month)
         {
-        wxLogWarning("Effective date is different from the expected date.");
+        wxPuts("WARNING: Effective date is different from the expected date.");
         }
 
     std::string const general_account_rate = cell["GeneralAccountRate"].str();
@@ -88,8 +88,8 @@
 
     std::string const product_name = cell["ProductName"].str();
 
-    wxLogMessage
-        ("ProductName=\"%s\"; GeneralAccountRate=\"%s\""
+    wxPrintf
+        ("ProductName=\"%s\"; GeneralAccountRate=\"%s\"\n"
         ,product_name
         ,general_account_rate
         );

Modified: lmi/trunk/wx_test_expiry_dates.cpp
===================================================================
--- lmi/trunk/wx_test_expiry_dates.cpp  2015-03-19 20:06:15 UTC (rev 6145)
+++ lmi/trunk/wx_test_expiry_dates.cpp  2015-03-26 22:50:31 UTC (rev 6146)
@@ -33,7 +33,7 @@
 #include "wx_test_date.hpp"
 #include "version.hpp"
 
-#include <wx/log.h>
+#include <wx/crt.h>
 
 #include <boost/filesystem/fstream.hpp>
 #include <boost/filesystem/operations.hpp>
@@ -81,8 +81,8 @@
     is >> begin >> end;
     LMI_ASSERT_WITH_MSG(is, "Failed to read dates from \"expiry\" file");
 
-    wxLogMessage
-        ("Expiry dates: begin=%s, end=%s"
+    wxPrintf
+        ("Expiry dates: begin=%s, end=%s\n"
         ,dump_date(begin)
         ,dump_date(end)
         );