Move wxBell() from base to core library.

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

diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp
index 71821d92e88f3449b3b1642d8c53890390cf2ae4..76f82355b4ae4f1d1f0aa2ed9b2b267b50d69e20 100644 (file)
--- a/tests/datetime/datetimetest.cpp
+++ b/tests/datetime/datetimetest.cpp
@@ -831,6 +831,7 @@ void DateTimeTestCase::TestTimeFormat()
 
     // test some degenerate cases
     CPPUNIT_ASSERT( !dt.ParseFormat("", "%z") );
 
     // 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)
 
     // test compilation of some calls which should compile (and not result in
     // ambiguity because of char*<->wxCStrData<->wxString conversions)


@@ -838,23 +839,23 @@ void DateTimeTestCase::TestTimeFormat()
     CPPUNIT_ASSERT( !dt.ParseFormat("foo") );
     CPPUNIT_ASSERT( !dt.ParseFormat(wxT("foo")) );
     CPPUNIT_ASSERT( !dt.ParseFormat(s) );
     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("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("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) );
 
     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()
 }
 
 void DateTimeTestCase::TestTimeSpanFormat()


@@ -1042,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()
 }
 
 void DateTimeTestCase::TestDateParseISO()