Fix warnings in the MSW IE backend.

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

diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp
index ad33117471ec6cd4a3dca0ad6db093d2ac5a0a91..8d1d4aa38b9bf0f3b5b32adace3b6b0a08d2a90f 100644 (file)
--- a/tests/datetime/datetimetest.cpp
+++ b/tests/datetime/datetimetest.cpp
@@ -83,18 +83,6 @@ private:
 
 #endif // CHANGE_SYSTEM_DATE
 
 
 #endif // CHANGE_SYSTEM_DATE
 

-// helper class setting the locale to "C" for its lifetime
-class CLocaleSetter
-{
-public:
-    CLocaleSetter() : m_locOld(setlocale(LC_ALL, "C")) { }
-    ~CLocaleSetter() { setlocale(LC_ALL, m_locOld); }
-
-private:
-    const char * const m_locOld;
-    wxDECLARE_NO_COPY_CLASS(CLocaleSetter);
-};
-

 // helper function translating week day/month names from English to the current
 // locale
 static wxString TranslateDate(const wxString& str)
 // helper function translating week day/month names from English to the current
 // locale
 static wxString TranslateDate(const wxString& str)


@@ -175,23 +163,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;
     }
 };


@@ -276,7 +264,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" );
 
 // ============================================================================


@@ -374,21 +362,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(),


@@ -555,6 +543,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 },
         { { 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++ )
     };
 
     for ( size_t n = 0; n < WXSIZEOF(weekNumberTestDates); n++ )


@@ -570,10 +560,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_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 )
 
         int year = d.year;
         if ( week == 1 && d.month != wxDateTime::Jan )


@@ -727,7 +721,7 @@ void DateTimeTestCase::TestTimeFormat()
             {
                 // conversion failed - should it have?
                 WX_ASSERT_MESSAGE(
             {
                 // conversion failed - should it have?
                 WX_ASSERT_MESSAGE(

-                    ("Test #%lu failed: failed to parse \"%s\"", n, s),
+                    ("Test #%u failed: failed to parse \"%s\"", n, s),

                     kind == CompareNone
                 );
             }
                     kind == CompareNone
                 );
             }


@@ -741,7 +735,7 @@ void DateTimeTestCase::TestTimeFormat()
                     result++;
 
                 WX_ASSERT_MESSAGE(
                     result++;
 
                 WX_ASSERT_MESSAGE(

-                    ("Test #%lu failed: \"%s\" was left unparsed in \"%s\"",
+                    ("Test #%u failed: \"%s\" was left unparsed in \"%s\"",

                      n, result, s),
                     !*result
                 );
                      n, result, s),
                     !*result
                 );


@@ -771,7 +765,7 @@ void DateTimeTestCase::TestTimeFormat()
                         break;
 
                     case CompareNone:
                         break;
 
                     case CompareNone:

-                        wxFAIL_MSG( _T("unexpected") );
+                        wxFAIL_MSG( wxT("unexpected") );

                         break;
                 }
             }
                         break;
                 }
             }


@@ -979,11 +973,12 @@ 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++ )


@@ -1093,8 +1088,23 @@ 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
+        },

     };
 
     // the test strings here use "PM" which is not available in all locales so
     };
 
     // the test strings here use "PM" which is not available in all locales so