Remove the item before notifying about it in wxDataViewIndexListModel.

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

diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp
index 9322fe4ef2be4bfc586c19c51bf346c416a69584..f5af743b0c92019f52558a7ca5b923940fe839b1 100644 (file)
--- a/tests/datetime/datetimetest.cpp
+++ b/tests/datetime/datetimetest.cpp
@@ -22,18 +22,9 @@
 
 #if wxUSE_DATETIME
 
-#include "wx/datetime.h"
 #include "wx/wxcrt.h"       // for wxStrstr()
 
-// 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(' ');
-
-    return ostr;
-}
-
-WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxDateTime::wxDateTime_t)
+#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
@@ -264,7 +255,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" );
 
 // ============================================================================
@@ -721,7 +712,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
                 );
             }
@@ -735,7 +726,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
                 );
@@ -973,6 +964,7 @@ void DateTimeTestCase::TestDateParse()
         { "29 Feb 2006" },
         { "31/04/06" },
         { "bloordyblop" },
+        { "2 .  .    " },
     };
 
     // special cases