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

give better error messages when tests fail

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-03-23 23:22:37 +00:00
parent 5b119b8b2e
commit 3aa3163f66
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tests/datetime/datetimetest.cpp
View File

@@ -649,7 +649,7 @@ void DateTimeTestCase::TestTimeFormat()
for ( size_t n = 0; n < WXSIZEOF(formatTestFormats); n++ ) for ( size_t n = 0; n < WXSIZEOF(formatTestFormats); n++ )
{ {
const char *fmt = formatTestFormats[n].format; const char *fmt = formatTestFormats[n].format;
// skip the check with %p for those locales which have empty AM/PM strings: // skip the check with %p for those locales which have empty AM/PM strings:
// for those locales it's impossible to pass the test with %p... // for those locales it's impossible to pass the test with %p...
wxString am, pm; wxString am, pm;
@@ -674,7 +674,7 @@ void DateTimeTestCase::TestTimeFormat()
{ {
// ParseFormat() should have parsed the entire string or left // ParseFormat() should have parsed the entire string or left
// some final useless strings (e.g. with Italian locale the // some final useless strings (e.g. with Italian locale the
// 's' string for the first test date looks like // 's' string for the first test date looks like
// "---> sab 29 mag 1976 18:30:00 CET" // "---> sab 29 mag 1976 18:30:00 CET"
// so we just need to ignore CET) // so we just need to ignore CET)
CPPUNIT_ASSERT( !*result || strcmp(result, "CET") == 0 ); CPPUNIT_ASSERT( !*result || strcmp(result, "CET") == 0 );
@@ -907,15 +907,24 @@ void DateTimeTestCase::TestDateParse()
for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ ) for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ )
{ {
if ( dt.ParseDate(parseTestDates[n].str) ) const char * const datestr = parseTestDates[n].str;
const char * const end = dt.ParseDate(datestr);
if ( end && !*end )
{ {
CPPUNIT_ASSERT( parseTestDates[n].good ); WX_ASSERT_MESSAGE(
("Erroneously parsed \"%s\"", datestr),
parseTestDates[n].good
);
CPPUNIT_ASSERT_EQUAL( parseTestDates[n].date.DT(), dt ); CPPUNIT_ASSERT_EQUAL( parseTestDates[n].date.DT(), dt );
} }
else // failed to parse else // failed to parse
{ {
CPPUNIT_ASSERT( !parseTestDates[n].good ); WX_ASSERT_MESSAGE(
("Failed to parse \"%s\"", datestr),
!parseTestDates[n].good
);
} }
} }
} }
@@ -1011,14 +1020,24 @@ void DateTimeTestCase::TestDateTimeParse()
wxDateTime dt; wxDateTime dt;
for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ ) for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ )
{ {
if ( dt.ParseDateTime(parseTestDates[n].str) ) const char * const datestr = parseTestDates[n].str;
if ( dt.ParseDateTime(datestr) )
{ {
CPPUNIT_ASSERT( parseTestDates[n].good ); WX_ASSERT_MESSAGE(
("Erroneously parsed \"%s\"", datestr),
parseTestDates[n].good
);
CPPUNIT_ASSERT_EQUAL( parseTestDates[n].date.DT(), dt ); CPPUNIT_ASSERT_EQUAL( parseTestDates[n].date.DT(), dt );
} }
else // failed to parse else // failed to parse
{ {
WX_ASSERT_MESSAGE(
("Failed to parse \"%s\"", datestr),
!parseTestDates[n].good
);
CPPUNIT_ASSERT( !parseTestDates[n].good ); CPPUNIT_ASSERT( !parseTestDates[n].good );
} }
} }