// need this to be able to use CPPUNIT_ASSERT_EQUAL with wxDateTime objects
static wxSTD ostream& operator<<(wxSTD ostream& ostr, const wxDateTime& dt)
{
- ostr << dt.Format();
+ ostr << dt.FormatISODate() << _T(" ") << dt.FormatISOTime();
return ostr;
}
double jdn;
wxDateTime::WeekDay wday;
time_t gmticks, ticks;
- long flags; //Test specific flags - currently only used by TestTimeFormat.
-
+
void Init(const wxDateTime::Tm& tm)
{
day = tm.mday;
year > 0 ? _T("AD") : _T("BC"));
return s;
}
- bool IsSet(long f) const { return (f && flags) ==f; }
};
// ----------------------------------------------------------------------------
CPPUNIT_TEST( TestTimeWDays );
CPPUNIT_TEST( TestTimeDST );
CPPUNIT_TEST( TestTimeFormat );
+ CPPUNIT_TEST( TestTimeSpanFormat );
CPPUNIT_TEST( TestTimeTicks );
CPPUNIT_TEST( TestParceRFC822 );
CPPUNIT_TEST( TestDateParse );
CPPUNIT_TEST( TestTimeArithmetics );
CPPUNIT_TEST( TestDSTBug );
+ CPPUNIT_TEST( TestDateOnly );
CPPUNIT_TEST_SUITE_END();
void TestLeapYears();
void TestTimeWDays();
void TestTimeDST();
void TestTimeFormat();
+ void TestTimeSpanFormat();
void TestTimeTicks();
void TestParceRFC822();
void TestDateParse();
void TestTimeArithmetics();
void TestDSTBug();
+ void TestDateOnly();
DECLARE_NO_COPY_CLASS(DateTimeTestCase)
};
{
CompareNone, // don't try comparing
CompareBoth, // dates and times should be identical
+ CompareYear, // don't compare centuries (fails for 2 digit years)
CompareDate, // dates only
CompareTime // time only
};
- const int WORKS_WITH_2DIGIT_YEAR(1);
static const struct
{
CompareKind compareKind;
- long flagsneeded;
const wxChar *format;
} formatTestFormats[] =
{
- { CompareBoth,0 , _T("---> %c") }, //Assumes %c show a 4digit year.
- { CompareDate,0, _T("Date is %A, %d of %B, in year %Y") },
- { CompareBoth,WORKS_WITH_2DIGIT_YEAR, _T("Date is %x, time is %X") },
- { CompareTime,0, _T("Time is %H:%M:%S or %I:%M:%S %p") },
- { CompareNone,0, _T("The day of year: %j, the week of year: %W") },
- { CompareDate,0, _T("ISO date without separators: %Y%m%d") },
+ { CompareYear, _T("---> %c") }, // %c could use 2 digit years
+ { CompareDate, _T("Date is %A, %d of %B, in year %Y") },
+ { CompareYear, _T("Date is %x, time is %X") }, // %x could use 2 digits
+ { CompareTime, _T("Time is %H:%M:%S or %I:%M:%S %p") },
+ { CompareNone, _T("The day of year: %j, the week of year: %W") },
+ { CompareDate, _T("ISO date without separators: %Y%m%d") },
};
static const Date formatTestDates[] =
{
- { 29, wxDateTime::May, 1976, 18, 30, 00, 0.0, wxDateTime::Inv_WeekDay, 0, 0 , WORKS_WITH_2DIGIT_YEAR},
- { 31, wxDateTime::Dec, 1999, 23, 30, 00, 0.0, wxDateTime::Inv_WeekDay, 0, 0 , WORKS_WITH_2DIGIT_YEAR },
- { 6, wxDateTime::Feb, 1937, 23, 30, 00, 0.0, wxDateTime::Inv_WeekDay, 0, 0 ,0 },
- { 6, wxDateTime::Feb, 1856, 23, 30, 00, 0.0, wxDateTime::Inv_WeekDay, 0, 0 ,0 },
- { 6, wxDateTime::Feb, 1857, 23, 30, 00, 0.0, wxDateTime::Inv_WeekDay, 0, 0 ,0 },
- { 29, wxDateTime::May, 2076, 18, 30, 00, 0.0, wxDateTime::Inv_WeekDay, 0, 0 ,0 },
- { 29, wxDateTime::Feb, 2400, 02, 15, 25, 0.0, wxDateTime::Inv_WeekDay, 0, 0 ,0 },
+ { 29, wxDateTime::May, 1976, 18, 30, 00, 0.0, wxDateTime::Inv_WeekDay },
+ { 31, wxDateTime::Dec, 1999, 23, 30, 00, 0.0, wxDateTime::Inv_WeekDay },
+ { 6, wxDateTime::Feb, 1937, 23, 30, 00, 0.0, wxDateTime::Inv_WeekDay },
+ { 6, wxDateTime::Feb, 1856, 23, 30, 00, 0.0, wxDateTime::Inv_WeekDay },
+ { 6, wxDateTime::Feb, 1857, 23, 30, 00, 0.0, wxDateTime::Inv_WeekDay },
+ { 29, wxDateTime::May, 2076, 18, 30, 00, 0.0, wxDateTime::Inv_WeekDay },
+ { 29, wxDateTime::Feb, 2400, 02, 15, 25, 0.0, wxDateTime::Inv_WeekDay },
#if 0
// Need to add support for BCE dates.
- { 01, wxDateTime::Jan, -52, 03, 16, 47, 0.0, wxDateTime::Inv_WeekDay, 0, 0 ,0 },
+ { 01, wxDateTime::Jan, -52, 03, 16, 47, 0.0, wxDateTime::Inv_WeekDay },
#endif
};
- for ( size_t d = 0; d < WXSIZEOF(formatTestDates) + 1; d++ )
+ for ( size_t d = 0; d < WXSIZEOF(formatTestDates); d++ )
{
- wxDateTime dt = d == 0 ? wxDateTime::Now() : formatTestDates[d - 1].DT();
+ wxDateTime dt = formatTestDates[d].DT();
for ( size_t n = 0; n < WXSIZEOF(formatTestFormats); n++ )
{
- //Skip test if date hasn't got the required flags.
- if ((d!=0) && !(formatTestDates[d - 1].IsSet(formatTestFormats[n].flagsneeded))) continue;
-
- wxString s = dt.Format(formatTestFormats[n].format);
+ const wxChar *fmt = formatTestFormats[n].format;
+ wxString s = dt.Format(fmt);
+
// what can we recover?
- int kind = formatTestFormats[n].compareKind;
+ CompareKind kind = formatTestFormats[n].compareKind;
// convert back
wxDateTime dt2;
- const wxChar *result = dt2.ParseFormat(s, formatTestFormats[n].format);
+ const wxChar *result = dt2.ParseFormat(s.c_str(), fmt);
if ( !result )
{
// converion failed - should it have?
switch ( kind )
{
+ case CompareYear:
+ if ( dt2.GetCentury() != dt.GetCentury() )
+ {
+ CPPUNIT_ASSERT_EQUAL(dt.GetYear() % 100,
+ dt2.GetYear() % 100);
+
+ dt2.SetYear(dt.GetYear());
+ }
+ // fall through and compare everything
+
case CompareBoth:
- CPPUNIT_ASSERT( dt2 == dt );
+ CPPUNIT_ASSERT_EQUAL( dt, dt2 );
break;
case CompareDate:
case CompareTime:
CPPUNIT_ASSERT( dt.IsSameTime(dt2) );
break;
+
+ case CompareNone:
+ wxFAIL_MSG( _T("unexpected") );
+ break;
}
}
}
}
}
+void DateTimeTestCase::TestTimeSpanFormat()
+{
+ static const struct TimeSpanFormatTestData
+ {
+ long h, min, sec, msec;
+ const wxChar *fmt;
+ const wxChar *result;
+ } testSpans[] =
+ {
+ { 12, 34, 56, 789, _T("%H:%M:%S.%l"), _T("12:34:56.789") },
+ { 1, 2, 3, 0, _T("%H:%M:%S"), _T("01:02:03") },
+ { 1, 2, 3, 0, _T("%S"), _T("3723") },
+ { -1, -2, -3, 0, _T("%S"), _T("-3723") },
+ { -1, -2, -3, 0, _T("%H:%M:%S"), _T("-01:02:03") },
+ { 26, 0, 0, 0, _T("%H"), _T("26") },
+ { 26, 0, 0, 0, _T("%D, %H"), _T("1, 02") },
+ { -26, 0, 0, 0, _T("%H"), _T("-26") },
+ { -26, 0, 0, 0, _T("%D, %H"), _T("-1, 02") },
+ { 219, 0, 0, 0, _T("%H"), _T("219") },
+ { 219, 0, 0, 0, _T("%D, %H"), _T("9, 03") },
+ { 219, 0, 0, 0, _T("%E, %D, %H"), _T("1, 2, 03") },
+ };
+
+ for ( size_t n = 0; n < WXSIZEOF(testSpans); n++ )
+ {
+ const TimeSpanFormatTestData& td = testSpans[n];
+ wxTimeSpan ts(td.h, td.min, td.sec, td.msec);
+ CPPUNIT_ASSERT_EQUAL( wxString(td.result), ts.Format(td.fmt) );
+ }
+}
+
void DateTimeTestCase::TestTimeTicks()
{
for ( size_t n = 0; n < WXSIZEOF(testDates); n++ )
{
/////////////////////////
// Test GetEndDST()
- wxDateTime dt = wxDateTime::GetEndDST(2004);
+ wxDateTime dt = wxDateTime::GetEndDST(2004, wxDateTime::France);
CPPUNIT_ASSERT_EQUAL(31, (int)dt.GetDay());
CPPUNIT_ASSERT_EQUAL(wxDateTime::Oct, dt.GetMonth());
CPPUNIT_ASSERT_EQUAL(2004, (int)dt.GetYear());
- CPPUNIT_ASSERT_EQUAL(2, (int)dt.GetHour());
+ CPPUNIT_ASSERT_EQUAL(1, (int)dt.GetHour());
CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetMinute());
CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetSecond());
CPPUNIT_ASSERT_EQUAL(0, (int)dt.GetMillisecond());
#endif // CHANGE_SYSTEM_DATE
}
+void DateTimeTestCase::TestDateOnly()
+{
+ wxDateTime dt(19, wxDateTime::Jan, 2007, 15, 01, 00);
+
+ static const wxDateTime::wxDateTime_t DATE_ZERO = 0;
+ CPPUNIT_ASSERT_EQUAL( DATE_ZERO, dt.GetDateOnly().GetHour() );
+ CPPUNIT_ASSERT_EQUAL( DATE_ZERO, dt.GetDateOnly().GetMinute() );
+ CPPUNIT_ASSERT_EQUAL( DATE_ZERO, dt.GetDateOnly().GetSecond() );
+ CPPUNIT_ASSERT_EQUAL( DATE_ZERO, dt.GetDateOnly().GetMillisecond() );
+
+ dt.ResetTime();
+ CPPUNIT_ASSERT_EQUAL( wxDateTime(19, wxDateTime::Jan, 2007), dt );
+
+ CPPUNIT_ASSERT_EQUAL( wxDateTime::Today(), wxDateTime::Now().GetDateOnly() );
+}
+
#endif // wxUSE_DATETIME
projects / wxWidgets.git / blobdiff