X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/404013f849619f420c671dab801e1aa4b2749836..0995b9dc18a7ce898c1c1be0e2790b258cab0fee:/tests/datetime/datetimetest.cpp

diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp
index 4731265645..8d1d4aa38b 100644
--- a/tests/datetime/datetimetest.cpp
+++ b/tests/datetime/datetimetest.cpp
@@ -83,18 +83,6 @@ private:
 
 #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)
@@ -276,7 +264,7 @@ private:
 // 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" );
 
 // ============================================================================
@@ -733,7 +721,7 @@ void DateTimeTestCase::TestTimeFormat()
             {
                 // 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
                 );
             }
@@ -747,7 +735,7 @@ void DateTimeTestCase::TestTimeFormat()
                     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
                 );
@@ -985,6 +973,7 @@ void DateTimeTestCase::TestDateParse()
         { "29 Feb 2006" },
         { "31/04/06" },
         { "bloordyblop" },
+        { "2 .  .    " },
     };
 
     // special cases
@@ -1099,8 +1088,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