diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-12-21 09:06:26 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-21 15:35:22 +0100 |
commit | 8249c72213bc7d212c05aa086b3145a5742706a3 (patch) | |
tree | 4a34b97b0d57a05707c65b7328d5ab1bf4254920 /tests/auto/qtquick2/qquickview/tst_qquickview.cpp | |
parent | 3c211558f6b571555558bd1fc59774e36a6da710 (diff) |
QDeclarative tests: Introduce base class for data tests.
In tests/auto/shared/util.* replace macros/find functions by
a base class QDeclarativeDataTest with accessors for the
data directory helper functions to create URLs from it.
The class relies on QFINDTESTDATA, which is the standard
way of locating test data. Using the class should reduce
the number of calls to QFileInfo.exists(), etc significantly.
In addition, provide utility functions for messages.
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Change-Id: Id2beacb157922ee9412f9e45cf9695cec1f8379a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/auto/qtquick2/qquickview/tst_qquickview.cpp')
-rw-r--r-- | tests/auto/qtquick2/qquickview/tst_qquickview.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qtquick2/qquickview/tst_qquickview.cpp b/tests/auto/qtquick2/qquickview/tst_qquickview.cpp index 953374dcab..fff1cc9bed 100644 --- a/tests/auto/qtquick2/qquickview/tst_qquickview.cpp +++ b/tests/auto/qtquick2/qquickview/tst_qquickview.cpp @@ -48,7 +48,7 @@ #include <QtGui/QWindow> #include <QtCore/QDebug> -class tst_QQuickView : public QObject +class tst_QQuickView : public QDeclarativeDataTest { Q_OBJECT public: @@ -73,7 +73,7 @@ void tst_QQuickView::resizemodeitem() QVERIFY(canvas); canvas->setResizeMode(QQuickView::SizeRootObjectToView); QCOMPARE(QSize(0,0), canvas->initialSize()); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("resizemodeitem.qml"))); + canvas->setSource(testFileUrl("resizemodeitem.qml")); QQuickItem* item = qobject_cast<QQuickItem*>(canvas->rootObject()); QVERIFY(item); window.show(); @@ -119,7 +119,7 @@ void tst_QQuickView::resizemodeitem() canvas = new QQuickView(&window); QVERIFY(canvas); canvas->setResizeMode(QQuickView::SizeViewToRootObject); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("resizemodeitem.qml"))); + canvas->setSource(testFileUrl("resizemodeitem.qml")); item = qobject_cast<QQuickItem*>(canvas->rootObject()); QVERIFY(item); window.show(); @@ -166,7 +166,7 @@ void tst_QQuickView::resizemodeitem() canvas->resize(300, 300); canvas->setResizeMode(QQuickView::SizeRootObjectToView); QCOMPARE(QSize(0,0), canvas->initialSize()); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("resizemodeitem.qml"))); + canvas->setSource(testFileUrl("resizemodeitem.qml")); canvas->resize(300, 300); item = qobject_cast<QQuickItem*>(canvas->rootObject()); QVERIFY(item); @@ -194,7 +194,7 @@ void tst_QQuickView::errors() QQuickView *canvas = new QQuickView; QVERIFY(canvas); QtMsgHandler old = qInstallMsgHandler(silentErrorsMsgHandler); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("error1.qml"))); + canvas->setSource(testFileUrl("error1.qml")); qInstallMsgHandler(old); QVERIFY(canvas->status() == QQuickView::Error); QVERIFY(canvas->errors().count() == 1); |