wxVariant <-> wxAny conversion functionality. Includes implicit construction of wxAny...

[wxWidgets.git] / tests / datetime / datetimetest.cpp

diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp
index 6cddf64142a57902b465f24b0a90ae5ccc0bf8e3..d60aae81b6dc5e9e0550c2499d99c0a9857ac334 100644 (file)
--- a/tests/datetime/datetimetest.cpp
+++ b/tests/datetime/datetimetest.cpp
@@ -555,6 +555,8 @@ for n in range(20):
         { { 16, wxDateTime::Oct, 1942, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 42, 3, 3, 289 },
         { { 30, wxDateTime::Dec, 2003, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },  1, 5, 5, 364 },
         { {  2, wxDateTime::Jan, 2004, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },  1, 1, 1,   2 },
+        { {  5, wxDateTime::Jan, 2010, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },  1, 2, 2,   5 },
+        { {  3, wxDateTime::Jan, 2011, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },  1, 2, 2,   3 },
     };
 
     for ( size_t n = 0; n < WXSIZEOF(weekNumberTestDates); n++ )
@@ -570,10 +572,14 @@ for n in range(20):
             wmon2 = dt.GetWeekOfMonth(wxDateTime::Sunday_First),
             dnum = dt.GetDayOfYear();
 
-        CPPUNIT_ASSERT_EQUAL( wn.dnum, dnum );
-        CPPUNIT_ASSERT_EQUAL( wn.wmon, wmon );
-        CPPUNIT_ASSERT_EQUAL( wn.wmon2, wmon2 );
-        CPPUNIT_ASSERT_EQUAL( wn.week, week );
+        WX_ASSERT_EQUAL_MESSAGE( ("day of year for %s", d.Format()),
+                                 wn.dnum, dnum );
+        WX_ASSERT_EQUAL_MESSAGE( ("week of month (Monday) for %s", d.Format()),
+                                 wn.wmon, wmon );
+        WX_ASSERT_EQUAL_MESSAGE( ("week of month (Sunday) for %s", d.Format()),
+                                 wn.wmon2, wmon2 );
+        WX_ASSERT_EQUAL_MESSAGE( ("week of year for %s", d.Format()),
+                                 wn.week, week );
 
         int year = d.year;
         if ( week == 1 && d.month != wxDateTime::Jan )
@@ -1093,8 +1099,23 @@ void DateTimeTestCase::TestDateTimeParse()
         bool good;
     } parseTestDates[] =
     {
-        { "Thu 22 Nov 2007 07:40:00 PM",
-         { 22, wxDateTime::Nov, 2007, 19, 40, 0}, true },
+        {
+            "Thu 22 Nov 2007 07:40:00 PM",
+            { 22, wxDateTime::Nov, 2007, 19, 40,  0 },
+            true
+        },
+
+        {
+            "2010-01-04 14:30",
+            {  4, wxDateTime::Jan, 2010, 14, 30,  0 },
+            true
+        },
+
+        {
+            "bloordyblop",
+            {  1, wxDateTime::Jan, 9999,  0,  0,  0},
+            false
+        },
     };
 
     // the test strings here use "PM" which is not available in all locales so