diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-02-29 15:36:21 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-13 02:02:49 +0100 |
| commit | c53f6093a7f0f463aad88d5c8527474f164fab20 (patch) | |
| tree | 6bb191399d556f6968ec3a91c2554581c3aebea9 /src/qmltest/quicktestresult.cpp | |
| parent | a4d22cbb388f0d304f68997b4e071b88f93fdbdf (diff) | |
testlib: Improve verbose and XPASS output
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>
Diffstat (limited to 'src/qmltest/quicktestresult.cpp')
| -rw-r--r-- | src/qmltest/quicktestresult.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp index 33c5fef96a..d33eab4943 100644 --- a/src/qmltest/quicktestresult.cpp +++ b/src/qmltest/quicktestresult.cpp @@ -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 |