Applied patch #15540: wxRichTextTable: crashes due to an invalid focus object (dghart)

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

diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp
index b9a3b9caf3a4389a25b3b78032682c3bf7d59c72..112e3291a6d289d90dbb34c88708fb6f60c25492 100644 (file)
--- a/tests/datetime/datetimetest.cpp
+++ b/tests/datetime/datetimetest.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxDateTime unit test
 // Author:      Vadim Zeitlin
 // Created:     2004-06-23 (extracted from samples/console/console.cpp)
 // Purpose:     wxDateTime unit test
 // Author:      Vadim Zeitlin
 // Created:     2004-06-23 (extracted from samples/console/console.cpp)

-// RCS-ID:      $Id$

 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 ///////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -17,20 +16,15 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-#endif // WX_PRECOMP
-

 #if wxUSE_DATETIME
 
 #if wxUSE_DATETIME
 

-#include "wx/datetime.h"
+#ifndef WX_PRECOMP
+    #include "wx/time.h"    // wxGetTimeZone()
+#endif // WX_PRECOMP

 
 

-// need this to be able to use CPPUNIT_ASSERT_EQUAL with wxDateTime objects
-static std::ostream& operator<<(std::ostream& ostr, const wxDateTime& dt)
-{
-    ostr << dt.FormatISOCombined(' ');
+#include "wx/wxcrt.h"       // for wxStrstr()

 
 

-    return ostr;
-}
+#include "testdate.h"

 
 // to test Today() meaningfully we must be able to change the system date which
 // is not usually the case, but if we're under Win32 we can try it -- define
 
 // to test Today() meaningfully we must be able to change the system date which
 // is not usually the case, but if we're under Win32 we can try it -- define


@@ -80,6 +74,49 @@ private:
 
 #endif // CHANGE_SYSTEM_DATE
 
 
 #endif // CHANGE_SYSTEM_DATE
 

+// helper function translating week day/month names from English to the current
+// locale
+static wxString TranslateDate(const wxString& str)
+{
+    // small optimization: if there are no alphabetic characters in the string,
+    // there is nothing to translate
+    wxString::const_iterator i, end = str.end();
+    for ( i = str.begin(); i != end; ++i )
+    {
+        if ( isalpha(*i) )
+            break;
+    }
+
+    if ( i == end )
+        return str;
+
+    wxString trans(str);
+
+    for ( wxDateTime::WeekDay wd = wxDateTime::Sun;
+          wd < wxDateTime::Inv_WeekDay;
+          wxNextWDay(wd) )
+    {
+        trans.Replace
+              (
+                wxDateTime::GetEnglishWeekDayName(wd, wxDateTime::Name_Abbr),
+                wxDateTime::GetWeekDayName(wd, wxDateTime::Name_Abbr)
+              );
+    }
+
+    for ( wxDateTime::Month mon = wxDateTime::Jan;
+          mon < wxDateTime::Inv_Month;
+          wxNextMonth(mon) )
+    {
+        trans.Replace
+              (
+                wxDateTime::GetEnglishMonthName(mon, wxDateTime::Name_Abbr),
+                wxDateTime::GetMonthName(mon, wxDateTime::Name_Abbr)
+              );
+    }
+
+    return trans;
+}
+

 // ----------------------------------------------------------------------------
 // broken down date representation used for testing
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // broken down date representation used for testing
 // ----------------------------------------------------------------------------


@@ -117,23 +154,23 @@ struct Date
     wxString Format() const
     {
         wxString s;
     wxString Format() const
     {
         wxString s;

-        s.Printf(_T("%02d:%02d:%02d %10s %02d, %4d%s"),
+        s.Printf(wxT("%02d:%02d:%02d %10s %02d, %4d%s"),

                  hour, min, sec,
                  wxDateTime::GetMonthName(month).c_str(),
                  day,
                  abs(wxDateTime::ConvertYearToBC(year)),
                  hour, min, sec,
                  wxDateTime::GetMonthName(month).c_str(),
                  day,
                  abs(wxDateTime::ConvertYearToBC(year)),

-                 year > 0 ? _T("AD") : _T("BC"));
+                 year > 0 ? wxT("AD") : wxT("BC"));

         return s;
     }
 
     wxString FormatDate() const
     {
         wxString s;
         return s;
     }
 
     wxString FormatDate() const
     {
         wxString s;

-        s.Printf(_T("%02d-%s-%4d%s"),
+        s.Printf(wxT("%02d-%s-%4d%s"),

                  day,
                  wxDateTime::GetMonthName(month, wxDateTime::Name_Abbr).c_str(),
                  abs(wxDateTime::ConvertYearToBC(year)),
                  day,
                  wxDateTime::GetMonthName(month, wxDateTime::Name_Abbr).c_str(),
                  abs(wxDateTime::ConvertYearToBC(year)),

-                 year > 0 ? _T("AD") : _T("BC"));
+                 year > 0 ? wxT("AD") : wxT("BC"));

         return s;
     }
 };
         return s;
     }
 };


@@ -184,6 +221,7 @@ private:
         CPPUNIT_TEST( TestTimeWDays );
         CPPUNIT_TEST( TestTimeDST );
         CPPUNIT_TEST( TestTimeFormat );
         CPPUNIT_TEST( TestTimeWDays );
         CPPUNIT_TEST( TestTimeDST );
         CPPUNIT_TEST( TestTimeFormat );

+        CPPUNIT_TEST( TestTimeParse );

         CPPUNIT_TEST( TestTimeSpanFormat );
         CPPUNIT_TEST( TestTimeTicks );
         CPPUNIT_TEST( TestParceRFC822 );
         CPPUNIT_TEST( TestTimeSpanFormat );
         CPPUNIT_TEST( TestTimeTicks );
         CPPUNIT_TEST( TestParceRFC822 );


@@ -202,6 +240,7 @@ private:
     void TestTimeWDays();
     void TestTimeDST();
     void TestTimeFormat();
     void TestTimeWDays();
     void TestTimeDST();
     void TestTimeFormat();

+    void TestTimeParse();

     void TestTimeSpanFormat();
     void TestTimeTicks();
     void TestParceRFC822();
     void TestTimeSpanFormat();
     void TestTimeTicks();
     void TestParceRFC822();


@@ -218,7 +257,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( DateTimeTestCase );
 
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( DateTimeTestCase );
 

-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone

 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( DateTimeTestCase, "DateTimeTestCase" );
 
 // ============================================================================
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( DateTimeTestCase, "DateTimeTestCase" );
 
 // ============================================================================


@@ -248,7 +287,7 @@ void DateTimeTestCase::TestLeapYears()
     {
         const LeapYearTestData& y = years[n];
 
     {
         const LeapYearTestData& y = years[n];
 

-        CPPUNIT_ASSERT( wxDateTime::IsLeapYear(y.year) == y.isLeap );
+        CPPUNIT_ASSERT_EQUAL( y.isLeap, wxDateTime::IsLeapYear(y.year) );

     }
 }
 
     }
 }
 


@@ -266,7 +305,7 @@ void DateTimeTestCase::TestTimeSet()
         wxString s1 = d1.Format(),
                  s2 = d2.Format();
 
         wxString s1 = d1.Format(),
                  s2 = d2.Format();
 

-        CPPUNIT_ASSERT( s1 == s2 );
+        CPPUNIT_ASSERT_EQUAL( s1, s2 );

     }
 }
 
     }
 }
 


@@ -281,10 +320,10 @@ void DateTimeTestCase::TestTimeJDN()
         // JDNs must be computed for UTC times
         double jdn = dt.FromUTC().GetJulianDayNumber();
 
         // JDNs must be computed for UTC times
         double jdn = dt.FromUTC().GetJulianDayNumber();
 

-        CPPUNIT_ASSERT( jdn == d.jdn );
+        CPPUNIT_ASSERT_EQUAL( d.jdn, jdn );

 
         dt.Set(jdn);
 
         dt.Set(jdn);

-        CPPUNIT_ASSERT( dt.GetJulianDayNumber() == jdn );
+        CPPUNIT_ASSERT_EQUAL( jdn, dt.GetJulianDayNumber() );

     }
 }
 
     }
 }
 


@@ -299,7 +338,7 @@ void DateTimeTestCase::TestTimeWDays()
         wxDateTime dt(d.day, d.month, d.year, d.hour, d.min, d.sec);
 
         wxDateTime::WeekDay wday = dt.GetWeekDay();
         wxDateTime dt(d.day, d.month, d.year, d.hour, d.min, d.sec);
 
         wxDateTime::WeekDay wday = dt.GetWeekDay();

-        CPPUNIT_ASSERT( wday == d.wday );
+        CPPUNIT_ASSERT_EQUAL( d.wday, wday );

     }
 
     // test SetToWeekDay()
     }
 
     // test SetToWeekDay()


@@ -316,21 +355,21 @@ void DateTimeTestCase::TestTimeWDays()
             wxString s, which;
             switch ( nWeek < -1 ? -nWeek : nWeek )
             {
             wxString s, which;
             switch ( nWeek < -1 ? -nWeek : nWeek )
             {

-                case 1: which = _T("first"); break;
-                case 2: which = _T("second"); break;
-                case 3: which = _T("third"); break;
-                case 4: which = _T("fourth"); break;
-                case 5: which = _T("fifth"); break;
+                case 1: which = wxT("first"); break;
+                case 2: which = wxT("second"); break;
+                case 3: which = wxT("third"); break;
+                case 4: which = wxT("fourth"); break;
+                case 5: which = wxT("fifth"); break;

 
 

-                case -1: which = _T("last"); break;
+                case -1: which = wxT("last"); break;

             }
 
             if ( nWeek < -1 )
             {
             }
 
             if ( nWeek < -1 )
             {

-                which += _T(" from end");
+                which += wxT(" from end");

             }
 
             }
 

-            s.Printf(_T("The %s %s of %s in %d"),
+            s.Printf(wxT("The %s %s of %s in %d"),

                      which.c_str(),
                      wxDateTime::GetWeekDayName(wday).c_str(),
                      wxDateTime::GetMonthName(month).c_str(),
                      which.c_str(),
                      wxDateTime::GetWeekDayName(wday).c_str(),
                      wxDateTime::GetMonthName(month).c_str(),


@@ -497,6 +536,13 @@ 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 },
         { { 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 },
+        { { 31, wxDateTime::Dec, 2009, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 53, 5, 5, 365 },
+        { { 31, wxDateTime::Dec, 2012, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },  1, 6, 6, 366 },
+        { { 29, wxDateTime::Dec, 2013, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 }, 52, 5, 5, 363 },
+        { { 30, wxDateTime::Dec, 2013, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },  1, 6, 5, 364 },
+        { { 31, wxDateTime::Dec, 2013, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },  1, 6, 5, 365 },

     };
 
     for ( size_t n = 0; n < WXSIZEOF(weekNumberTestDates); n++ )
     };
 
     for ( size_t n = 0; n < WXSIZEOF(weekNumberTestDates); n++ )


@@ -512,10 +558,14 @@ for n in range(20):
             wmon2 = dt.GetWeekOfMonth(wxDateTime::Sunday_First),
             dnum = dt.GetDayOfYear();
 
             wmon2 = dt.GetWeekOfMonth(wxDateTime::Sunday_First),
             dnum = dt.GetDayOfYear();
 

-        CPPUNIT_ASSERT( dnum == wn.dnum );
-        CPPUNIT_ASSERT( wmon == wn.wmon );
-        CPPUNIT_ASSERT( wmon2 == wn.wmon2 );
-        CPPUNIT_ASSERT( week == wn.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 )
 
         int year = d.year;
         if ( week == 1 && d.month != wxDateTime::Jan )


@@ -526,7 +576,7 @@ for n in range(20):
 
         wxDateTime
             dt2 = wxDateTime::SetToWeekOfYear(year, week, dt.GetWeekDay());
 
         wxDateTime
             dt2 = wxDateTime::SetToWeekOfYear(year, week, dt.GetWeekDay());

-        CPPUNIT_ASSERT( dt2 == dt );
+        CPPUNIT_ASSERT_EQUAL( dt, dt2 );

     }
 }
 
     }
 }
 


@@ -534,7 +584,7 @@ for n in range(20):
 void DateTimeTestCase::TestTimeDST()
 {
     // taken from http://www.energy.ca.gov/daylightsaving.html
 void DateTimeTestCase::TestTimeDST()
 {
     // taken from http://www.energy.ca.gov/daylightsaving.html

-    static const Date datesDST[2][2004 - 1900 + 1] =
+    static const Date datesDST[2][2009 - 1990 + 1] =

     {
         {
             { 1, wxDateTime::Apr, 1990, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
     {
         {
             { 1, wxDateTime::Apr, 1990, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },


@@ -552,6 +602,11 @@ void DateTimeTestCase::TestTimeDST()
             { 7, wxDateTime::Apr, 2002, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
             { 6, wxDateTime::Apr, 2003, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
             { 4, wxDateTime::Apr, 2004, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
             { 7, wxDateTime::Apr, 2002, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
             { 6, wxDateTime::Apr, 2003, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
             { 4, wxDateTime::Apr, 2004, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },

+            { 3, wxDateTime::Apr, 2005, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
+            { 2, wxDateTime::Apr, 2006, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
+            {11, wxDateTime::Mar, 2007, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
+            { 9, wxDateTime::Mar, 2008, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
+            { 8, wxDateTime::Mar, 2009, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },

         },
         {
             { 28, wxDateTime::Oct, 1990, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
         },
         {
             { 28, wxDateTime::Oct, 1990, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },


@@ -569,20 +624,26 @@ void DateTimeTestCase::TestTimeDST()
             { 27, wxDateTime::Oct, 2002, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
             { 26, wxDateTime::Oct, 2003, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
             { 31, wxDateTime::Oct, 2004, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
             { 27, wxDateTime::Oct, 2002, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
             { 26, wxDateTime::Oct, 2003, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
             { 31, wxDateTime::Oct, 2004, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },

+            { 30, wxDateTime::Oct, 2005, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
+            { 29, wxDateTime::Oct, 2006, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
+            {  4, wxDateTime::Nov, 2007, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
+            {  2, wxDateTime::Nov, 2008, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
+            {  1, wxDateTime::Nov, 2009, 0, 0, 0, 0.0, wxDateTime::Inv_WeekDay, 0 },
+

         }
     };
 
         }
     };
 

-    for ( int year = 1990; year < 2005; year++ )
+    for ( size_t n = 0; n < WXSIZEOF(datesDST[0]); n++ )

     {
     {

+        const int year = 1990 + n;

         wxDateTime dtBegin = wxDateTime::GetBeginDST(year, wxDateTime::USA),
                    dtEnd = wxDateTime::GetEndDST(year, wxDateTime::USA);
 
         wxDateTime dtBegin = wxDateTime::GetBeginDST(year, wxDateTime::USA),
                    dtEnd = wxDateTime::GetEndDST(year, wxDateTime::USA);
 

-        size_t n = year - 1990;

         const Date& dBegin = datesDST[0][n];
         const Date& dEnd = datesDST[1][n];
 
         const Date& dBegin = datesDST[0][n];
         const Date& dEnd = datesDST[1][n];
 

-        CPPUNIT_ASSERT( dBegin.SameDay(dtBegin.GetTm()) );
-        CPPUNIT_ASSERT( dEnd.SameDay(dtEnd.GetTm()) );
+        CPPUNIT_ASSERT_EQUAL( dBegin.DT().FormatDate(), dtBegin.FormatDate() );
+        CPPUNIT_ASSERT_EQUAL( dEnd.DT().FormatDate(), dtEnd.FormatDate() );

     }
 }
 
     }
 }
 


@@ -612,6 +673,18 @@ void DateTimeTestCase::TestTimeFormat()
        { CompareTime, "Time is %H:%M:%S or %I:%M:%S %p" },
        { CompareNone, "The day of year: %j, the week of year: %W" },
        { CompareDate, "ISO date without separators: %Y%m%d" },
        { CompareTime, "Time is %H:%M:%S or %I:%M:%S %p" },
        { CompareNone, "The day of year: %j, the week of year: %W" },
        { CompareDate, "ISO date without separators: %Y%m%d" },

+       { CompareBoth, "RFC 2822 string: %Y-%m-%d %H:%M:%S.%l %z" },
+
+    };
+
+    const long timeZonesOffsets[] =
+    {
+        wxDateTime::TimeZone(wxDateTime::Local).GetOffset(),
+
+        // Fictitious TimeZone offsets to ensure time zone formating and
+        // interpretation works
+        -(3600 + 2*60),
+        3*3600 + 30*60

     };
 
     static const Date formatTestDates[] =
     };
 
     static const Date formatTestDates[] =


@@ -622,64 +695,120 @@ void DateTimeTestCase::TestTimeFormat()
         {  6, wxDateTime::Feb, 1856, 23, 30, 00, 0.0, wxDateTime::Inv_WeekDay },
         {  6, wxDateTime::Feb, 1857, 23, 30, 00, 0.0, wxDateTime::Inv_WeekDay },
         { 29, wxDateTime::May, 2076, 18, 30, 00, 0.0, wxDateTime::Inv_WeekDay },
         {  6, wxDateTime::Feb, 1856, 23, 30, 00, 0.0, wxDateTime::Inv_WeekDay },
         {  6, wxDateTime::Feb, 1857, 23, 30, 00, 0.0, wxDateTime::Inv_WeekDay },
         { 29, wxDateTime::May, 2076, 18, 30, 00, 0.0, wxDateTime::Inv_WeekDay },

-        { 29, wxDateTime::Feb, 2400, 02, 15, 25, 0.0, wxDateTime::Inv_WeekDay },
+
+        // FIXME: the test with 02:15:25 time doesn't pass because of DST
+        //        computation problems, we get back 03:15:25
+        { 29, wxDateTime::Feb, 2400, 04, 15, 25, 0.0, wxDateTime::Inv_WeekDay },

 #if 0
         // Need to add support for BCE dates.
         { 01, wxDateTime::Jan,  -52, 03, 16, 47, 0.0, wxDateTime::Inv_WeekDay },
 #endif
     };
 
 #if 0
         // Need to add support for BCE dates.
         { 01, wxDateTime::Jan,  -52, 03, 16, 47, 0.0, wxDateTime::Inv_WeekDay },
 #endif
     };
 

-    for ( size_t d = 0; d < WXSIZEOF(formatTestDates); d++ )
+    for ( unsigned idxtz = 0; idxtz < WXSIZEOF(timeZonesOffsets); ++idxtz )

     {
     {

-        wxDateTime dt = formatTestDates[d].DT();
-        for ( size_t n = 0; n < WXSIZEOF(formatTestFormats); n++ )
-        {
-            const char *fmt = formatTestFormats[n].format;
-            wxString s = dt.Format(fmt);
+        wxDateTime::TimeZone tz(timeZonesOffsets[idxtz]);
+        const bool isLocalTz = tz.GetOffset() == -wxGetTimeZone();

 
 

-            // what can we recover?
-            CompareKind kind = formatTestFormats[n].compareKind;
-
-            // convert back
-            wxDateTime dt2;
-            const char *result = dt2.ParseFormat(s, fmt);
-            if ( !result )
-            {
-                // conversion failed - should it have?
-                CPPUNIT_ASSERT( kind == CompareNone );
-            }
-            else // conversion succeeded
+        for ( size_t d = 0; d < WXSIZEOF(formatTestDates); d++ )
+        {
+            wxDateTime dt = formatTestDates[d].DT();
+            for ( unsigned n = 0; n < WXSIZEOF(formatTestFormats); n++ )

             {
             {

-                // should have parsed the entire string
-                CPPUNIT_ASSERT( !*result );
+                const char *fmt = formatTestFormats[n].format;
+
+                // skip the check with %p for those locales which have empty AM/PM strings:
+                // for those locales it's impossible to pass the test with %p...
+                wxString am, pm;
+                wxDateTime::GetAmPmStrings(&am, &pm);
+                if (am.empty() && pm.empty() && wxStrstr(fmt, "%p") != NULL)
+                    continue;
+
+                // what can we recover?
+                CompareKind kind = formatTestFormats[n].compareKind;
+
+                // When using a different time zone we must perform a time zone
+                // conversion below which doesn't always work correctly, check
+                // for the cases when it doesn't.
+                if ( !isLocalTz )
+                {
+                    // DST computation doesn't work correctly for dates above
+                    // 2038 currently on the systems with 32 bit time_t.
+                    if ( dt.GetYear() >= 2038 )
+                        continue;
+
+                    // We can't compare just dates nor just times when doing TZ
+                    // conversion as both are affected by the DST: for the
+                    // dates, the DST can switch midnight to 23:00 of the
+                    // previous day while for the times DST can be different
+                    // for the original date and today.
+                    if ( kind == CompareDate || kind == CompareTime )
+                        continue;
+                }

 
 

-                switch ( kind )
+                // do convert date to string
+                wxString s = dt.Format(fmt, tz);
+
+                // convert back
+                wxDateTime dt2;
+                const char *result = dt2.ParseFormat(s, fmt);
+                if ( !result )
+                {
+                    // conversion failed - should it have?
+                    WX_ASSERT_MESSAGE(
+                        ("Test #%u failed: failed to parse \"%s\"", n, s),
+                        kind == CompareNone
+                    );
+                }
+                else // conversion succeeded

                 {
                 {

-                    case CompareYear:
-                        if ( dt2.GetCentury() != dt.GetCentury() )
-                        {
-                            CPPUNIT_ASSERT_EQUAL(dt.GetYear() % 100,
-                                                 dt2.GetYear() % 100);
-
-                            dt2.SetYear(dt.GetYear());
-                        }
-                        // fall through and compare everything
-
-                    case CompareBoth:
-                        CPPUNIT_ASSERT_EQUAL( dt, dt2 );
-                        break;
-
-                    case CompareDate:
-                        CPPUNIT_ASSERT( dt.IsSameDate(dt2) );
-                        break;
-
-                    case CompareTime:
-                        CPPUNIT_ASSERT( dt.IsSameTime(dt2) );
-                        break;
-
-                    case CompareNone:
-                        wxFAIL_MSG( _T("unexpected") );
-                        break;
+                    // currently ParseFormat() doesn't support "%Z" and so is
+                    // incapable of parsing time zone part used at the end of date
+                    // representations in many (but not "C") locales, compensate
+                    // for it ourselves by simply consuming and ignoring it
+                    while ( *result && (*result >= 'A' && *result <= 'Z') )
+                        result++;
+
+                    WX_ASSERT_MESSAGE(
+                        ("Test #%u failed: \"%s\" was left unparsed in \"%s\"",
+                         n, result, s),
+                        !*result
+                    );
+
+                    // Without "%z" we can't recover the time zone used in the
+                    // call to Format() so we need to call MakeFromTimezone()
+                    // explicitly.
+                    if ( !strstr(fmt, "%z") && !isLocalTz )
+                        dt2.MakeFromTimezone(tz);
+
+                    switch ( kind )
+                    {
+                        case CompareYear:
+                            if ( dt2.GetCentury() != dt.GetCentury() )
+                            {
+                                CPPUNIT_ASSERT_EQUAL(dt.GetYear() % 100,
+                                                     dt2.GetYear() % 100);
+
+                                dt2.SetYear(dt.GetYear());
+                            }
+                            // fall through and compare everything
+
+                        case CompareBoth:
+                            CPPUNIT_ASSERT_EQUAL( dt, dt2 );
+                            break;
+
+                        case CompareDate:
+                            CPPUNIT_ASSERT( dt.IsSameDate(dt2) );
+                            break;
+
+                        case CompareTime:
+                            CPPUNIT_ASSERT( dt.IsSameTime(dt2) );
+                            break;
+
+                        case CompareNone:
+                            wxFAIL_MSG( wxT("unexpected") );
+                            break;
+                    }

                 }
             }
         }
                 }
             }
         }


@@ -687,34 +816,70 @@ void DateTimeTestCase::TestTimeFormat()
 
     wxDateTime dt;
 
 
     wxDateTime dt;
 

+#if 0
+    // special case which was known to fail
+    CPPUNIT_ASSERT( dt.ParseFormat("02/06/1856", "%x") );
+    CPPUNIT_ASSERT_EQUAL( 1856, dt.GetYear() );
+#endif
+
+    // also test %l separately
+    CPPUNIT_ASSERT( dt.ParseFormat("12:23:45.678", "%H:%M:%S.%l") );
+    CPPUNIT_ASSERT_EQUAL( 678, dt.GetMillisecond() );
+
+    // test special case of %l matching 0 milliseconds
+    CPPUNIT_ASSERT( dt.ParseFormat("12:23:45.000", "%H:%M:%S.%l") );
+    CPPUNIT_ASSERT_EQUAL( 0, dt.GetMillisecond() );
+

     // test partially specified dates too
     wxDateTime dtDef(26, wxDateTime::Sep, 2008);
     CPPUNIT_ASSERT( dt.ParseFormat("17", "%d") );
     CPPUNIT_ASSERT_EQUAL( 17, dt.GetDay() );
 
     // test partially specified dates too
     wxDateTime dtDef(26, wxDateTime::Sep, 2008);
     CPPUNIT_ASSERT( dt.ParseFormat("17", "%d") );
     CPPUNIT_ASSERT_EQUAL( 17, dt.GetDay() );
 

+    // test some degenerate cases
+    CPPUNIT_ASSERT( !dt.ParseFormat("", "%z") );
+    CPPUNIT_ASSERT( !dt.ParseFormat("", "%%") );
+

     // test compilation of some calls which should compile (and not result in
     // ambiguity because of char*<->wxCStrData<->wxString conversions)
     wxString s("foo");
     CPPUNIT_ASSERT( !dt.ParseFormat("foo") );
     CPPUNIT_ASSERT( !dt.ParseFormat(wxT("foo")) );
     CPPUNIT_ASSERT( !dt.ParseFormat(s) );
     // test compilation of some calls which should compile (and not result in
     // ambiguity because of char*<->wxCStrData<->wxString conversions)
     wxString s("foo");
     CPPUNIT_ASSERT( !dt.ParseFormat("foo") );
     CPPUNIT_ASSERT( !dt.ParseFormat(wxT("foo")) );
     CPPUNIT_ASSERT( !dt.ParseFormat(s) );

-    CPPUNIT_ASSERT( !dt.ParseFormat(s.c_str()) );
+    dt.ParseFormat(s.c_str()); // Simply test compilation of this one.

 
     CPPUNIT_ASSERT( !dt.ParseFormat("foo", "%c") );
     CPPUNIT_ASSERT( !dt.ParseFormat(wxT("foo"), "%c") );
     CPPUNIT_ASSERT( !dt.ParseFormat(s, "%c") );
 
     CPPUNIT_ASSERT( !dt.ParseFormat("foo", "%c") );
     CPPUNIT_ASSERT( !dt.ParseFormat(wxT("foo"), "%c") );
     CPPUNIT_ASSERT( !dt.ParseFormat(s, "%c") );

-    CPPUNIT_ASSERT( !dt.ParseFormat(s.c_str(), "%c") );
+    dt.ParseFormat(s.c_str(), "%c");

 
     CPPUNIT_ASSERT( !dt.ParseFormat("foo", wxT("%c")) );
     CPPUNIT_ASSERT( !dt.ParseFormat(wxT("foo"), wxT("%c")) );
     CPPUNIT_ASSERT( !dt.ParseFormat(s, "%c") );
 
     CPPUNIT_ASSERT( !dt.ParseFormat("foo", wxT("%c")) );
     CPPUNIT_ASSERT( !dt.ParseFormat(wxT("foo"), wxT("%c")) );
     CPPUNIT_ASSERT( !dt.ParseFormat(s, "%c") );

-    CPPUNIT_ASSERT( !dt.ParseFormat(s.c_str(), wxT("%c")) );
+    dt.ParseFormat(s.c_str(), wxT("%c"));

 
     wxString spec("%c");
     CPPUNIT_ASSERT( !dt.ParseFormat("foo", spec) );
     CPPUNIT_ASSERT( !dt.ParseFormat(wxT("foo"), spec) );
     CPPUNIT_ASSERT( !dt.ParseFormat(s, spec) );
 
     wxString spec("%c");
     CPPUNIT_ASSERT( !dt.ParseFormat("foo", spec) );
     CPPUNIT_ASSERT( !dt.ParseFormat(wxT("foo"), spec) );
     CPPUNIT_ASSERT( !dt.ParseFormat(s, spec) );

-    CPPUNIT_ASSERT( !dt.ParseFormat(s.c_str(), spec) );
+    dt.ParseFormat(s.c_str(), spec);
+}
+
+// Test parsing time in free format.
+void DateTimeTestCase::TestTimeParse()
+{
+    wxDateTime dt;
+
+    // Parsing standard formats should work.
+    CPPUNIT_ASSERT( dt.ParseTime("12:34:56") );
+    CPPUNIT_ASSERT_EQUAL( "12:34:56", dt.FormatISOTime() );
+
+    // Parsing just hours should work too.
+    dt.ResetTime();
+    CPPUNIT_ASSERT( dt.ParseTime("17") );
+    CPPUNIT_ASSERT_EQUAL( "17:00:00", dt.FormatISOTime() );
+
+    // Parsing gibberish shouldn't work.
+    CPPUNIT_ASSERT( !dt.ParseTime("bloordyblop") );

 }
 
 void DateTimeTestCase::TestTimeSpanFormat()
 }
 
 void DateTimeTestCase::TestTimeSpanFormat()


@@ -738,13 +903,15 @@ void DateTimeTestCase::TestTimeSpanFormat()
         {  219,  0,  0,   0, "%H",            "219"                   },
         {  219,  0,  0,   0, "%D, %H",        "9, 03"                 },
         {  219,  0,  0,   0, "%E, %D, %H",    "1, 2, 03"              },
         {  219,  0,  0,   0, "%H",            "219"                   },
         {  219,  0,  0,   0, "%D, %H",        "9, 03"                 },
         {  219,  0,  0,   0, "%E, %D, %H",    "1, 2, 03"              },

+        {    0, -1,  0,   0, "%H:%M:%S",      "-00:01:00"             },
+        {    0,  0, -1,   0, "%H:%M:%S",      "-00:00:01"             },

     };
 
     for ( size_t n = 0; n < WXSIZEOF(testSpans); n++ )
     {
         const TimeSpanFormatTestData& td = testSpans[n];
         wxTimeSpan ts(td.h, td.min, td.sec, td.msec);
     };
 
     for ( size_t n = 0; n < WXSIZEOF(testSpans); n++ )
     {
         const TimeSpanFormatTestData& td = testSpans[n];
         wxTimeSpan ts(td.h, td.min, td.sec, td.msec);

-        CPPUNIT_ASSERT_EQUAL( wxString(td.result), ts.Format(td.fmt) );
+        CPPUNIT_ASSERT_EQUAL( td.result, ts.Format(td.fmt) );

     }
 }
 
     }
 }
 


@@ -870,27 +1037,40 @@ void DateTimeTestCase::TestDateParse()
         { "29 Feb 2006" },
         { "31/04/06" },
         { "bloordyblop" },
         { "29 Feb 2006" },
         { "31/04/06" },
         { "bloordyblop" },

+        { "2 .  .    " },

     };
 
     // special cases
     wxDateTime dt;
     };
 
     // special cases
     wxDateTime dt;

-    CPPUNIT_ASSERT( dt.ParseDate(_T("today")) );
+    CPPUNIT_ASSERT( dt.ParseDate(wxT("today")) );

     CPPUNIT_ASSERT_EQUAL( wxDateTime::Today(), dt );
 
     for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ )
     {
     CPPUNIT_ASSERT_EQUAL( wxDateTime::Today(), dt );
 
     for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ )
     {

-        wxDateTime dt;
-        if ( dt.ParseDate(parseTestDates[n].str) )
+        const wxString datestr = TranslateDate(parseTestDates[n].str);
+
+        const char * const end = dt.ParseDate(datestr);
+        if ( end && !*end )

         {
         {

-            CPPUNIT_ASSERT( parseTestDates[n].good );
+            WX_ASSERT_MESSAGE(
+                ("Erroneously parsed \"%s\"", datestr),
+                parseTestDates[n].good
+            );

 
             CPPUNIT_ASSERT_EQUAL( parseTestDates[n].date.DT(), dt );
         }
         else // failed to parse
         {
 
             CPPUNIT_ASSERT_EQUAL( parseTestDates[n].date.DT(), dt );
         }
         else // failed to parse
         {

-            CPPUNIT_ASSERT( !parseTestDates[n].good );
+            WX_ASSERT_MESSAGE(
+                ("Failed to parse \"%s\"", datestr),
+                !parseTestDates[n].good
+            );

         }
     }
         }
     }

+
+    // Check that incomplete parse works correctly.
+    const char* p = dt.ParseFormat("2012-03-23 12:34:56", "%Y-%m-%d");
+    CPPUNIT_ASSERT_EQUAL( " 12:34:56", wxString(p) );

 }
 
 void DateTimeTestCase::TestDateParseISO()
 }
 
 void DateTimeTestCase::TestDateParseISO()


@@ -976,23 +1156,57 @@ void DateTimeTestCase::TestDateTimeParse()
         bool good;
     } parseTestDates[] =
     {
         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
+        },
+
+        {
+            "2012-01-01 10:12:05 +0100",
+            {  1, wxDateTime::Jan, 2012,  10,  12,  5, -1 },
+            false // ParseDateTime does know yet +0100
+        },

     };
 
     };
 

-    // special cases
+    // the test strings here use "PM" which is not available in all locales so
+    // we need to use "C" locale for them
+    CLocaleSetter cloc;
+

     wxDateTime dt;
     for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ )
     {
     wxDateTime dt;
     for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ )
     {

-        wxDateTime dt;
-        if ( dt.ParseDateTime(parseTestDates[n].str) )
+        const wxString datestr = TranslateDate(parseTestDates[n].str);
+
+        const char * const end = dt.ParseDateTime(datestr);
+        if ( end && !*end )

         {
         {

-            CPPUNIT_ASSERT( parseTestDates[n].good );
+            WX_ASSERT_MESSAGE(
+                ("Erroneously parsed \"%s\"", datestr),
+                parseTestDates[n].good
+            );

 
             CPPUNIT_ASSERT_EQUAL( parseTestDates[n].date.DT(), dt );
         }
         else // failed to parse
         {
 
             CPPUNIT_ASSERT_EQUAL( parseTestDates[n].date.DT(), dt );
         }
         else // failed to parse
         {

+            WX_ASSERT_MESSAGE(
+                ("Failed to parse \"%s\"", datestr),
+                !parseTestDates[n].good
+            );
+

             CPPUNIT_ASSERT( !parseTestDates[n].good );
         }
     }
             CPPUNIT_ASSERT( !parseTestDates[n].good );
         }
     }


@@ -1019,10 +1233,36 @@ void DateTimeTestCase::TestTimeArithmetics()
         dt1 = dt + span;
         dt2 = dt - span;
 
         dt1 = dt + span;
         dt2 = dt - span;
 

-        CPPUNIT_ASSERT( dt1 - span == dt );
-        CPPUNIT_ASSERT( dt2 + span == dt );
-        CPPUNIT_ASSERT( dt2 + 2*span == dt1 );
+        CPPUNIT_ASSERT_EQUAL( dt, dt1 - span );
+        CPPUNIT_ASSERT_EQUAL( dt, dt2 + span );
+        CPPUNIT_ASSERT_EQUAL( dt1, dt2 + 2*span );
+        CPPUNIT_ASSERT_EQUAL( span, dt1.DiffAsDateSpan(dt) );

     }
     }

+
+    // More date span arithmetics tests
+    wxDateTime dtd1(5, wxDateTime::Jun, 1998);
+    wxDateTime dtd2(6, wxDateTime::Aug, 1999);
+
+    // All parts in dtd2 is after dtd1
+    CPPUNIT_ASSERT_EQUAL( wxDateSpan(1, 2, 0, 1), dtd2.DiffAsDateSpan(dtd1) );
+
+    // Year and month after, day earlier, so no full month
+    // Jul has 31 days, so it's 31 - 5 + 4 = 30, or 4w 2d
+    dtd2.Set(4, wxDateTime::Aug, 1999);
+    CPPUNIT_ASSERT_EQUAL( wxDateSpan(1, 1, 4, 2), dtd2.DiffAsDateSpan(dtd1) );
+
+    // Year and day after, month earlier, so no full year, but same day diff as
+    // first example
+    dtd2.Set(6, wxDateTime::May, 1999);
+    CPPUNIT_ASSERT_EQUAL( wxDateSpan(0, 11, 0, 1), dtd2.DiffAsDateSpan(dtd1) );
+
+    // Year after, month and day earlier, so no full month and no full year
+    // April has 30 days, so it's 30 - 5 + 4 = 29, or 4w 1d
+    dtd2.Set(4, wxDateTime::May, 1999);
+    CPPUNIT_ASSERT_EQUAL( wxDateSpan(0, 10, 4, 1), dtd2.DiffAsDateSpan(dtd1) );
+
+    // And a reverse. Now we should use days in Jun (again 30 => 4w 1d)
+    CPPUNIT_ASSERT_EQUAL( wxDateSpan(0, -10, -4, -1), dtd1.DiffAsDateSpan(dtd2) );

 }
 
 void DateTimeTestCase::TestDSTBug()
 }
 
 void DateTimeTestCase::TestDSTBug()


@@ -1095,6 +1335,19 @@ void DateTimeTestCase::TestDSTBug()
     CPPUNIT_ASSERT_EQUAL(0, (int)dt2.GetSecond());
     CPPUNIT_ASSERT_EQUAL(0, (int)dt2.GetMillisecond());
 #endif // CHANGE_SYSTEM_DATE
     CPPUNIT_ASSERT_EQUAL(0, (int)dt2.GetSecond());
     CPPUNIT_ASSERT_EQUAL(0, (int)dt2.GetMillisecond());
 #endif // CHANGE_SYSTEM_DATE

+
+    // Verify that setting the date to the beginning of the DST period moves it
+    // forward (as this date on its own would be invalid). The problem here is
+    // that our GetBeginDST() is far from being trustworthy, so just try a
+    // couple of dates for the common time zones and check that all of them are
+    // either unchanged or moved forward.
+    wxDateTime dtDST(10, wxDateTime::Mar, 2013, 2, 0, 0);
+    if ( dtDST.GetHour() != 2 )
+        CPPUNIT_ASSERT_EQUAL( 3, dtDST.GetHour() );
+
+    dtDST = wxDateTime(31, wxDateTime::Mar, 2013, 2, 0, 0);
+    if ( dtDST.GetHour() != 2 )
+        CPPUNIT_ASSERT_EQUAL( 3, dtDST.GetHour() );

 }
 
 void DateTimeTestCase::TestDateOnly()
 }
 
 void DateTimeTestCase::TestDateOnly()