X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/595c23b34eb8fb4b37e23fe744623176783581f1..0995b9dc18a7ce898c1c1be0e2790b258cab0fee:/tests/datetime/datetimetest.cpp diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp index d60aae81b6..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