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

Show more information if DateTimeTestCase::TestTimeFormat() fails

Browse Source 
No real changes, just show the variable values if any checks fail and
also continue running the test for the other data points even if one of
them fails.
This commit is contained in:
Vadim Zeitlin
2017-11-29 23:19:01 +01:00
parent c7c30504c8
commit 4868ec0893
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/datetime/datetimetest.cpp
View File

@@ -665,6 +665,15 @@ void DateTimeTestCase::TestTimeFormat()
CompareTime // time only
};
const char* const compareKindStrings[] =
{
"nothing",
"both date and time",
"both date and time but without century",
"only dates",
"only times",
};
static const struct
{
CompareKind compareKind;
@@ -785,13 +794,16 @@ void DateTimeTestCase::TestTimeFormat()
if ( !strstr(fmt, "%z") && !isLocalTz )
dt2.MakeFromTimezone(tz);
INFO("Comparing " << compareKindStrings[kind] << " for "
<< dt << " with " << dt2
<< " (format result=\"" << s << "\")");
switch ( kind )
{
case CompareYear:
if ( dt2.GetCentury() != dt.GetCentury() )
{
CPPUNIT_ASSERT_EQUAL(dt.GetYear() % 100,
dt2.GetYear() % 100);
CHECK( dt.GetYear() % 100 == dt2.GetYear() % 100);
dt2.SetYear(dt.GetYear());
}
@@ -799,15 +811,15 @@ void DateTimeTestCase::TestTimeFormat()
wxFALLTHROUGH;
case CompareBoth:
CPPUNIT_ASSERT_EQUAL( dt, dt2 );
CHECK( dt == dt2 );
break;
case CompareDate:
CPPUNIT_ASSERT( dt.IsSameDate(dt2) );
CHECK( dt.IsSameDate(dt2) );
break;
case CompareTime:
CPPUNIT_ASSERT( dt.IsSameTime(dt2) );
CHECK( dt.IsSameTime(dt2) );
break;
case CompareNone: