Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added wxTimeSpan::Format() test

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-07-20 13:20:00 +00:00
parent 0bcd4039e2
commit 1bf29a7a6c
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/datetime/datetimetest.cpp
View File

@@ -95,7 +95,7 @@ struct Date
wxDateTime::WeekDay wday; wxDateTime::WeekDay wday;
time_t gmticks, ticks; time_t gmticks, ticks;
long flags; //Test specific flags - currently only used by TestTimeFormat. long flags; //Test specific flags - currently only used by TestTimeFormat.
void Init(const wxDateTime::Tm& tm) void Init(const wxDateTime::Tm& tm)
{ {
day = tm.mday; day = tm.mday;
@@ -187,6 +187,7 @@ private:
CPPUNIT_TEST( TestTimeWDays ); CPPUNIT_TEST( TestTimeWDays );
CPPUNIT_TEST( TestTimeDST ); CPPUNIT_TEST( TestTimeDST );
CPPUNIT_TEST( TestTimeFormat ); CPPUNIT_TEST( TestTimeFormat );
CPPUNIT_TEST( TestTimeSpanFormat );
CPPUNIT_TEST( TestTimeTicks ); CPPUNIT_TEST( TestTimeTicks );
CPPUNIT_TEST( TestParceRFC822 ); CPPUNIT_TEST( TestParceRFC822 );
CPPUNIT_TEST( TestDateParse ); CPPUNIT_TEST( TestDateParse );
@@ -201,6 +202,7 @@ private:
void TestTimeWDays(); void TestTimeWDays();
void TestTimeDST(); void TestTimeDST();
void TestTimeFormat(); void TestTimeFormat();
void TestTimeSpanFormat();
void TestTimeTicks(); void TestTimeTicks();
void TestParceRFC822(); void TestParceRFC822();
void TestDateParse(); void TestDateParse();
@@ -594,7 +596,7 @@ void DateTimeTestCase::TestTimeFormat()
CompareTime // time only CompareTime // time only
}; };
const int WORKS_WITH_2DIGIT_YEAR(1); const int WORKS_WITH_2DIGIT_YEAR(1);
static const struct static const struct
{ {
CompareKind compareKind; CompareKind compareKind;
@@ -632,7 +634,7 @@ void DateTimeTestCase::TestTimeFormat()
{ {
//Skip test if date hasn't got the required flags. //Skip test if date hasn't got the required flags.
if ((d!=0) && !(formatTestDates[d - 1].IsSet(formatTestFormats[n].flagsneeded))) continue; if ((d!=0) && !(formatTestDates[d - 1].IsSet(formatTestFormats[n].flagsneeded))) continue;
wxString s = dt.Format(formatTestFormats[n].format); wxString s = dt.Format(formatTestFormats[n].format);
// what can we recover? // what can we recover?
int kind = formatTestFormats[n].compareKind; int kind = formatTestFormats[n].compareKind;
@@ -669,6 +671,28 @@ void DateTimeTestCase::TestTimeFormat()
} }
} }
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") },
};
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() void DateTimeTestCase::TestTimeTicks()
{ {
for ( size_t n = 0; n < WXSIZEOF(testDates); n++ ) for ( size_t n = 0; n < WXSIZEOF(testDates); n++ )