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_p.h | |
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_p.h')
-rw-r--r-- | src/qmltest/quicktestresult_p.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/qmltest/quicktestresult_p.h b/src/qmltest/quicktestresult_p.h index fdadf9c3a3..898b4f834a 100644 --- a/src/qmltest/quicktestresult_p.h +++ b/src/qmltest/quicktestresult_p.h @@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE +class QUrl; class QuickTestResultPrivate; class Q_QUICK_TEST_EXPORT QuickTestResult : public QObject @@ -123,18 +124,18 @@ public Q_SLOTS: void finishTestFunction(); - void fail(const QString &message, const QString &file, int line); + void fail(const QString &message, const QUrl &location, int line); bool verify(bool success, const QString &message, - const QString &file, int line); + const QUrl &location, int line); bool compare(bool success, const QString &message, const QString &val1, const QString &val2, - const QString &file, int line); - void skip(const QString &message, const QString &file, int line); + const QUrl &location, int line); + void skip(const QString &message, const QUrl &location, int line); bool expectFail(const QString &tag, const QString &comment, - const QString &file, int line); + const QUrl &location, int line); bool expectFailContinue(const QString &tag, const QString &comment, - const QString &file, int line); - void warn(const QString &message, const QString &file, int line); + const QUrl &location, int line); + void warn(const QString &message, const QUrl &location, int line); void ignoreWarning(const QString &message); |