add a special macro for comparing time_t values to fix unit test compilation on platf...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index a7affd50ae9c9a03d42ac45fdb3996bf47a7873f..3b4281cfa14808138453b14e5f44dab610896a8e 100644 (file)
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -104,6 +104,10 @@
         }                                                                     \
     }
 
         }                                                                     \
     }
 

+// Use this macro to compare the expected time_t value with the result of not
+// necessarily time_t type
+#define WX_ASSERT_TIME_T_EQUAL(t, n) CPPUNIT_ASSERT_EQUAL((t), (time_t)(n))
+

 // Use this macro to assert with the given formatted message (it should contain
 // the format string and arguments in a separate pair of parentheses)
 #define WX_ASSERT_MESSAGE(msg, cond) \
 // Use this macro to assert with the given formatted message (it should contain
 // the format string and arguments in a separate pair of parentheses)
 #define WX_ASSERT_MESSAGE(msg, cond) \

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 297258a17b9a854f132939ee30d578fb27d71aa2..7fdd2affd108420d9b06694565c81c4bed8eb03d 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -376,11 +376,13 @@ wxDateTime::Country wxDateTime::ms_country = wxDateTime::Country_Unknown;
 
 // debugger helper: shows what the date really is
 #ifdef __WXDEBUG__
 
 // debugger helper: shows what the date really is
 #ifdef __WXDEBUG__

-extern const wxChar *wxDumpDate(const wxDateTime* dt)
+extern const char *wxDumpDate(const wxDateTime* dt)

 {
 {

-    static wxChar buf[128];
+    static char buf[128];

 
 

-    wxStrcpy(buf, dt->Format(_T("%Y-%m-%d (%a) %H:%M:%S")));
+    wxString fmt(dt->Format("%Y-%m-%d (%a) %H:%M:%S"));
+    wxStrncpy(buf, fmt + " (" + dt->GetValue().ToString() + " ticks)",
+              WXSIZEOF(buf));

 
     return buf;
 }
 
     return buf;
 }

diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp
index 20e93fafae0104bc1fde4d62bae5dbe3a5adc469..9fcbd29a25f5367ec5a77a4bb0f33b5f6153f697 100644 (file)
--- a/tests/datetime/datetimetest.cpp
+++ b/tests/datetime/datetimetest.cpp
@@ -737,11 +737,11 @@ void DateTimeTestCase::TestTimeTicks()
         // ignore DST, the test data already takes it into account
         dt.MakeTimezone(TZ_TEST, true);
         long ticks = (dt.GetValue() / 1000).ToLong();
         // ignore DST, the test data already takes it into account
         dt.MakeTimezone(TZ_TEST, true);
         long ticks = (dt.GetValue() / 1000).ToLong();

-        CPPUNIT_ASSERT_EQUAL( d.ticks, ticks + tzOffset );
+        WX_ASSERT_TIME_T_EQUAL( d.ticks, ticks + tzOffset );

 
         dt = d.DT().FromTimezone(wxDateTime::UTC);
         ticks = (dt.GetValue() / 1000).ToLong();
 
         dt = d.DT().FromTimezone(wxDateTime::UTC);
         ticks = (dt.GetValue() / 1000).ToLong();

-        CPPUNIT_ASSERT_EQUAL( d.gmticks, ticks );
+        WX_ASSERT_TIME_T_EQUAL( d.gmticks, ticks );

     }
 }
 
     }
 }