Implement hatched/stippled pens/brushes in wxGraphicsContext for Cairo.

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

diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp
index c8129a81271416696d8b59f957d76f89e2e55900..76f82355b4ae4f1d1f0aa2ed9b2b267b50d69e20 100644 (file)
--- a/tests/datetime/datetimetest.cpp
+++ b/tests/datetime/datetimetest.cpp
@@ -17,11 +17,12 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_DATETIME
+
 #ifndef WX_PRECOMP
+    #include "wx/time.h"    // wxGetTimeZone()
 #endif // WX_PRECOMP
 
-#if wxUSE_DATETIME
-
 #include "wx/wxcrt.h"       // for wxStrstr()
 
 #include "testdate.h"
@@ -828,29 +829,33 @@ void DateTimeTestCase::TestTimeFormat()
     CPPUNIT_ASSERT( dt.ParseFormat("17", "%d") );
     CPPUNIT_ASSERT_EQUAL( 17, dt.GetDay() );
 
+    // test some degenerate cases
+    CPPUNIT_ASSERT( !dt.ParseFormat("", "%z") );
+    CPPUNIT_ASSERT( !dt.ParseFormat("", "%%") );
+
     // test compilation of some calls which should compile (and not result in
     // ambiguity because of char*<->wxCStrData<->wxString conversions)
     wxString s("foo");
     CPPUNIT_ASSERT( !dt.ParseFormat("foo") );
     CPPUNIT_ASSERT( !dt.ParseFormat(wxT("foo")) );
     CPPUNIT_ASSERT( !dt.ParseFormat(s) );
-    CPPUNIT_ASSERT( !dt.ParseFormat(s.c_str()) );
+    dt.ParseFormat(s.c_str()); // Simply test compilation of this one.
 
     CPPUNIT_ASSERT( !dt.ParseFormat("foo", "%c") );
     CPPUNIT_ASSERT( !dt.ParseFormat(wxT("foo"), "%c") );
     CPPUNIT_ASSERT( !dt.ParseFormat(s, "%c") );
-    CPPUNIT_ASSERT( !dt.ParseFormat(s.c_str(), "%c") );
+    dt.ParseFormat(s.c_str(), "%c");
 
     CPPUNIT_ASSERT( !dt.ParseFormat("foo", wxT("%c")) );
     CPPUNIT_ASSERT( !dt.ParseFormat(wxT("foo"), wxT("%c")) );
     CPPUNIT_ASSERT( !dt.ParseFormat(s, "%c") );
-    CPPUNIT_ASSERT( !dt.ParseFormat(s.c_str(), wxT("%c")) );
+    dt.ParseFormat(s.c_str(), wxT("%c"));
 
     wxString spec("%c");
     CPPUNIT_ASSERT( !dt.ParseFormat("foo", spec) );
     CPPUNIT_ASSERT( !dt.ParseFormat(wxT("foo"), spec) );
     CPPUNIT_ASSERT( !dt.ParseFormat(s, spec) );
-    CPPUNIT_ASSERT( !dt.ParseFormat(s.c_str(), spec) );
+    dt.ParseFormat(s.c_str(), spec);
 }
 
 void DateTimeTestCase::TestTimeSpanFormat()
@@ -1038,6 +1043,10 @@ void DateTimeTestCase::TestDateParse()
             );
         }
     }
+
+    // Check that incomplete parse works correctly.
+    const char* p = dt.ParseFormat("2012-03-23 12:34:56", "%Y-%m-%d");
+    CPPUNIT_ASSERT_EQUAL( " 12:34:56", wxString(p) );
 }
 
 void DateTimeTestCase::TestDateParseISO()