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/qquickrepeater | |
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/qquickrepeater')
-rw-r--r-- | tests/auto/qtquick2/qquickrepeater/qquickrepeater.pro | 4 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickrepeater/tst_qquickrepeater.cpp | 31 |
2 files changed, 16 insertions, 19 deletions
diff --git a/tests/auto/qtquick2/qquickrepeater/qquickrepeater.pro b/tests/auto/qtquick2/qquickrepeater/qquickrepeater.pro index 7e740f98aa..efd7538099 100644 --- a/tests/auto/qtquick2/qquickrepeater/qquickrepeater.pro +++ b/tests/auto/qtquick2/qquickrepeater/qquickrepeater.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qquickrepeater macx:CONFIG -= app_bundle -SOURCES += tst_qquickrepeater.cpp +SOURCES += tst_qquickrepeater.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testFiles.files = data testFiles.path = . diff --git a/tests/auto/qtquick2/qquickrepeater/tst_qquickrepeater.cpp b/tests/auto/qtquick2/qquickrepeater/tst_qquickrepeater.cpp index 1d6af452e4..857b4a41f2 100644 --- a/tests/auto/qtquick2/qquickrepeater/tst_qquickrepeater.cpp +++ b/tests/auto/qtquick2/qquickrepeater/tst_qquickrepeater.cpp @@ -52,12 +52,7 @@ #include "../../shared/util.h" -inline QUrl TEST_FILE(const QString &filename) -{ - return QUrl::fromLocalFile(TESTDATA(filename)); -} - -class tst_QQuickRepeater : public QObject +class tst_QQuickRepeater : public QDeclarativeDataTest { Q_OBJECT public: @@ -183,7 +178,7 @@ void tst_QQuickRepeater::numberModel() TestObject *testObject = new TestObject; ctxt->setContextProperty("testObject", testObject); - canvas->setSource(TEST_FILE("intmodel.qml")); + canvas->setSource(testFileUrl("intmodel.qml")); qApp->processEvents(); QQuickRepeater *repeater = findItem<QQuickRepeater>(canvas->rootObject(), "repeater"); @@ -224,7 +219,7 @@ void tst_QQuickRepeater::objectList() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testData", QVariant::fromValue(data)); - canvas->setSource(TEST_FILE("objlist.qml")); + canvas->setSource(testFileUrl("objlist.qml")); qApp->processEvents(); QQuickRepeater *repeater = findItem<QQuickRepeater>(canvas->rootObject(), "repeater"); @@ -265,7 +260,7 @@ void tst_QQuickRepeater::stringList() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testData", data); - canvas->setSource(TEST_FILE("repeater1.qml")); + canvas->setSource(testFileUrl("repeater1.qml")); qApp->processEvents(); QQuickRepeater *repeater = findItem<QQuickRepeater>(canvas->rootObject(), "repeater"); @@ -313,7 +308,7 @@ void tst_QQuickRepeater::dataModel_adding() TestModel testModel; ctxt->setContextProperty("testData", &testModel); - canvas->setSource(TEST_FILE("repeater2.qml")); + canvas->setSource(testFileUrl("repeater2.qml")); qApp->processEvents(); QQuickRepeater *repeater = findItem<QQuickRepeater>(canvas->rootObject(), "repeater"); @@ -383,7 +378,7 @@ void tst_QQuickRepeater::dataModel_removing() testModel.addItem("five", "5"); ctxt->setContextProperty("testData", &testModel); - canvas->setSource(TEST_FILE("repeater2.qml")); + canvas->setSource(testFileUrl("repeater2.qml")); qApp->processEvents(); QQuickRepeater *repeater = findItem<QQuickRepeater>(canvas->rootObject(), "repeater"); @@ -449,7 +444,7 @@ void tst_QQuickRepeater::dataModel_changes() testModel.addItem("three", "3"); ctxt->setContextProperty("testData", &testModel); - canvas->setSource(TEST_FILE("repeater2.qml")); + canvas->setSource(testFileUrl("repeater2.qml")); qApp->processEvents(); QQuickRepeater *repeater = findItem<QQuickRepeater>(canvas->rootObject(), "repeater"); @@ -483,7 +478,7 @@ void tst_QQuickRepeater::itemModel() TestObject *testObject = new TestObject; ctxt->setContextProperty("testObject", testObject); - canvas->setSource(TEST_FILE("itemlist.qml")); + canvas->setSource(testFileUrl("itemlist.qml")); qApp->processEvents(); QQuickRepeater *repeater = findItem<QQuickRepeater>(canvas->rootObject(), "repeater"); @@ -527,7 +522,7 @@ void tst_QQuickRepeater::resetModel() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testData", dataA); - canvas->setSource(TEST_FILE("repeater1.qml")); + canvas->setSource(testFileUrl("repeater1.qml")); qApp->processEvents(); QQuickRepeater *repeater = findItem<QQuickRepeater>(canvas->rootObject(), "repeater"); QVERIFY(repeater != 0); @@ -589,7 +584,7 @@ void tst_QQuickRepeater::resetModel() void tst_QQuickRepeater::modelChanged() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, TEST_FILE("modelChanged.qml")); + QDeclarativeComponent component(&engine, testFileUrl("modelChanged.qml")); QQuickItem *rootObject = qobject_cast<QQuickItem*>(component.create()); QVERIFY(rootObject); @@ -612,7 +607,7 @@ void tst_QQuickRepeater::modelChanged() void tst_QQuickRepeater::properties() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, TEST_FILE("properties.qml")); + QDeclarativeComponent component(&engine, testFileUrl("properties.qml")); QQuickItem *rootObject = qobject_cast<QQuickItem*>(component.create()); QVERIFY(rootObject); @@ -646,7 +641,7 @@ void tst_QQuickRepeater::asynchronous() QDeclarativeIncubationController controller; canvas->engine()->setIncubationController(&controller); - canvas->setSource(TEST_FILE("asyncloader.qml")); + canvas->setSource(testFileUrl("asyncloader.qml")); QQuickItem *rootObject = qobject_cast<QQuickItem*>(canvas->rootObject()); QVERIFY(rootObject); @@ -698,7 +693,7 @@ void tst_QQuickRepeater::asynchronous() void tst_QQuickRepeater::initParent() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, TEST_FILE("initparent.qml")); + QDeclarativeComponent component(&engine, testFileUrl("initparent.qml")); QQuickItem *rootObject = qobject_cast<QQuickItem*>(component.create()); QVERIFY(rootObject); |