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

Improve error reporting in wxDateTime unit tests

Browse Source 
Simply use INFO() to give all the information we want to see in case of
failure once instead of doing it in multiple WX_ASSERT_MESSAGE() in a
more ugly way with extra parentheses.

Also use FAIL_CHECK() to keep running the test after the first failure.
This commit is contained in:
Vadim Zeitlin
2022-03-25 16:16:11 +01:00
parent 762c80b809
commit f280bcdb58
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/datetime/datetimetest.cpp
View File

@@ -780,16 +780,19 @@ void DateTimeTestCase::TestTimeFormat()
if ( s != dt.ToTimezone(tz).Format(fmt) )
continue;
INFO("Test #" << n << " using format \"" << fmt << "\""
<< ", format result=\"" << s << "\"");
// convert back
wxDateTime dt2;
const char *result = dt2.ParseFormat(s, fmt);
if ( !result )
{
// conversion failed - should it have?
WX_ASSERT_MESSAGE(
("Test #%u failed: failed to parse \"%s\"", n, s),
kind == CompareNone
);
if ( kind != CompareNone )
{
FAIL_CHECK("Parsing formatted string failed");
}
}
else // conversion succeeded
{
@@ -800,11 +803,12 @@ void DateTimeTestCase::TestTimeFormat()
while ( *result && (*result >= 'A' && *result <= 'Z') )
result++;
WX_ASSERT_MESSAGE(
("Test #%u failed: \"%s\" was left unparsed in \"%s\"",
n, result, s),
!*result
);
if ( *result )
{
INFO("Left unparsed: \"" << result << "\"");
FAIL_CHECK("Parsing didn't consume the entire string");
continue;
}
// Without "%z" we can't recover the time zone used in the
// call to Format() so we need to call MakeFromTimezone()