diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-06 13:25:51 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-11 14:25:00 +0100 |
commit | 424d30275c0d70698cbdd349f8026c38eebc59b7 (patch) | |
tree | a8104e07be2f9ec0e234ee82a24c4216fe77fb95 /src/qmltest/quicktestresult.cpp | |
parent | 5daace87139ed4b36b756bcd51ddb6f8fe22897b (diff) |
QMLTest: Fix output of file names, make output more verbose.
- Check command line arguments thoroughly.
- Change all QuickTestResult functions taking file names to
accept QUrls and format them using QUrl::toLocalFile() in case
of local file names in order to display Windows drive
letters correctly.
- Introduce a template function (for QDeclarativeView, QQuickView)
that dumps out all available information when compilation goes
wrong.
- Skip 'Debug', 'Release' folders for Windows builds.
Change-Id: Ibdd92867870a2b05494de8a0adbe0910d4897ba2
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Diffstat (limited to 'src/qmltest/quicktestresult.cpp')
-rw-r--r-- | src/qmltest/quicktestresult.cpp | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp index 2feef36898..27bb4d6053 100644 --- a/src/qmltest/quicktestresult.cpp +++ b/src/qmltest/quicktestresult.cpp @@ -53,6 +53,8 @@ #include <QtCore/qbytearray.h> #include <QtCore/qcoreapplication.h> #include <QtCore/qdebug.h> +#include <QtCore/QUrl> +#include <QtCore/QDir> QT_BEGIN_NAMESPACE @@ -355,83 +357,82 @@ void QuickTestResult::finishTestFunction() QTestResult::finishedCurrentTestFunction(); } -static QString qtest_fixFile(const QString &file) +static QString qtestFixUrl(const QUrl &location) { - if (file.startsWith(QLatin1String("file://"))) - return file.mid(7); - else - return file; + if (location.isLocalFile()) // Use QUrl's logic for Windows drive letters. + return QDir::toNativeSeparators(location.toLocalFile()); + return location.toString(); } void QuickTestResult::fail - (const QString &message, const QString &file, int line) + (const QString &message, const QUrl &location, int line) { QTestResult::addFailure(message.toLatin1().constData(), - qtest_fixFile(file).toLatin1().constData(), line); + qtestFixUrl(location).toLatin1().constData(), line); } bool QuickTestResult::verify - (bool success, const QString &message, const QString &file, int line) + (bool success, const QString &message, const QUrl &location, int line) { if (!success && message.isEmpty()) { return QTestResult::verify (success, "verify()", "", - qtest_fixFile(file).toLatin1().constData(), line); + qtestFixUrl(location).toLatin1().constData(), line); } else { return QTestResult::verify (success, message.toLatin1().constData(), "", - qtest_fixFile(file).toLatin1().constData(), line); + qtestFixUrl(location).toLatin1().constData(), line); } } bool QuickTestResult::compare (bool success, const QString &message, const QString &val1, const QString &val2, - const QString &file, int line) + const QUrl &location, int line) { if (success) { return QTestResult::compare (success, message.toLocal8Bit().constData(), - qtest_fixFile(file).toLatin1().constData(), line); + qtestFixUrl(location).toLatin1().constData(), line); } else { return QTestResult::compare (success, message.toLocal8Bit().constData(), QTest::toString(val1.toLatin1().constData()), QTest::toString(val2.toLatin1().constData()), "", "", - qtest_fixFile(file).toLatin1().constData(), line); + qtestFixUrl(location).toLatin1().constData(), line); } } void QuickTestResult::skip - (const QString &message, const QString &file, int line) + (const QString &message, const QUrl &location, int line) { QTestResult::addSkip(message.toLatin1().constData(), - qtest_fixFile(file).toLatin1().constData(), line); + qtestFixUrl(location).toLatin1().constData(), line); QTestResult::setSkipCurrentTest(true); } bool QuickTestResult::expectFail - (const QString &tag, const QString &comment, const QString &file, int line) + (const QString &tag, const QString &comment, const QUrl &location, int line) { return QTestResult::expectFail (tag.toLatin1().constData(), QTest::toString(comment.toLatin1().constData()), - QTest::Abort, qtest_fixFile(file).toLatin1().constData(), line); + QTest::Abort, qtestFixUrl(location).toLatin1().constData(), line); } bool QuickTestResult::expectFailContinue - (const QString &tag, const QString &comment, const QString &file, int line) + (const QString &tag, const QString &comment, const QUrl &location, int line) { return QTestResult::expectFail (tag.toLatin1().constData(), QTest::toString(comment.toLatin1().constData()), - QTest::Continue, qtest_fixFile(file).toLatin1().constData(), line); + QTest::Continue, qtestFixUrl(location).toLatin1().constData(), line); } -void QuickTestResult::warn(const QString &message, const QString &file, int line) +void QuickTestResult::warn(const QString &message, const QUrl &location, int line) { - QTestLog::warn(message.toLatin1().constData(), qtest_fixFile(file).toLatin1().constData(), line); + QTestLog::warn(message.toLatin1().constData(), qtestFixUrl(location).toLatin1().constData(), line); } void QuickTestResult::ignoreWarning(const QString &message) |