wxUSE_STL compilation fix

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

diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp
index 3e26e83549836bb51d33e7ae178558d43c2714ca..b9a3b9caf3a4389a25b3b78032682c3bf7d59c72 100644 (file)
--- a/tests/datetime/datetimetest.cpp
+++ b/tests/datetime/datetimetest.cpp
@@ -645,7 +645,7 @@ void DateTimeTestCase::TestTimeFormat()
             const char *result = dt2.ParseFormat(s, fmt);
             if ( !result )
             {
-                // converion failed - should it have?
+                // conversion failed - should it have?
                 CPPUNIT_ASSERT( kind == CompareNone );
             }
             else // conversion succeeded
@@ -685,9 +685,15 @@ void DateTimeTestCase::TestTimeFormat()
         }
     }
 
+    wxDateTime dt;
+
+    // test partially specified dates too
+    wxDateTime dtDef(26, wxDateTime::Sep, 2008);
+    CPPUNIT_ASSERT( dt.ParseFormat("17", "%d") );
+    CPPUNIT_ASSERT_EQUAL( 17, dt.GetDay() );
+
     // test compilation of some calls which should compile (and not result in
     // ambiguity because of char*<->wxCStrData<->wxString conversions)
-    wxDateTime dt;
     wxString s("foo");
     CPPUNIT_ASSERT( !dt.ParseFormat("foo") );
     CPPUNIT_ASSERT( !dt.ParseFormat(wxT("foo")) );
@@ -761,14 +767,14 @@ void DateTimeTestCase::TestTimeTicks()
 
         // GetValue() returns internal UTC-based representation, we need to
         // convert it to local TZ before comparing
-        long ticks = (dt.GetValue() / 1000).ToLong() + TZ_LOCAL.GetOffset();
+        time_t ticks = (dt.GetValue() / 1000).ToLong() + TZ_LOCAL.GetOffset();
         if ( dt.IsDST() )
             ticks += 3600;
-        WX_ASSERT_TIME_T_EQUAL( d.gmticks, ticks + tzOffset );
+        CPPUNIT_ASSERT_EQUAL( d.gmticks, ticks + tzOffset );
 
         dt = d.DT().FromTimezone(wxDateTime::UTC);
         ticks = (dt.GetValue() / 1000).ToLong();
-        WX_ASSERT_TIME_T_EQUAL( d.gmticks, ticks );
+        CPPUNIT_ASSERT_EQUAL( d.gmticks, ticks );
     }
 }