Skip to content

Commit

Permalink
testlib: Improve verbose and XPASS output
Browse files Browse the repository at this point in the history
Call only the eight-argument version of QTestResult::compare(), as the
four-argument version will soon be removed from the API.

Change-Id: I9e7b95a30b01fb5e084f2954aeb380b492760484
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
  • Loading branch information
Jason McDonald authored and Qt by Nokia committed Mar 13, 2012
1 parent a4d22cb commit c53f609
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions src/qmltest/quicktestresult.cpp
Expand Up @@ -379,18 +379,12 @@ bool QuickTestResult::compare
const QString &val1, const QString &val2,
const QUrl &location, int line)
{
if (success) {
return QTestResult::compare
(success, message.toLocal8Bit().constData(),
qtestFixUrl(location).toLatin1().constData(), line);
} else {
return QTestResult::compare
(success, message.toLocal8Bit().constData(),
QTest::toString(val1.toLatin1().constData()),
QTest::toString(val2.toLatin1().constData()),
"", "",
qtestFixUrl(location).toLatin1().constData(), line);
}
return QTestResult::compare
(success, message.toLocal8Bit().constData(),
QTest::toString(val1.toLatin1().constData()),
QTest::toString(val2.toLatin1().constData()),
"", "",
qtestFixUrl(location).toLatin1().constData(), line);
}

void QuickTestResult::skip
Expand Down

0 comments on commit c53f609

Please sign in to comment.