discard the time zone part of strings being parsed (generalizes the "CEST"-ignoring...

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

diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp
index 90df81d4ea6c8136b881e5a3ca87df72464fd182..685b9b35ebfca27e3c366f866eab51ef8eae67cc 100644 (file)
--- a/tests/datetime/datetimetest.cpp
+++ b/tests/datetime/datetimetest.cpp
@@ -739,12 +739,14 @@ void DateTimeTestCase::TestTimeFormat()
             }
             else // conversion succeeded
             {
             }
             else // conversion succeeded
             {

-                // ParseFormat() should have parsed the entire string or left
-                // some final useless strings (e.g. with Italian locale the
-                // 's' string for the first test date looks like
-                //      "---> sab 29 mag 1976 18:30:00 CET"
-                // so we just need to ignore CET)
-                CPPUNIT_ASSERT( !*result || strcmp(result, "CET") == 0 );
+                // 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++;
+
+                CPPUNIT_ASSERT( !*result );

 
                 switch ( kind )
                 {
 
                 switch ( kind )
                 {