diff options
Diffstat (limited to 'tests/auto/particles/qquickcustomaffector')
-rw-r--r-- | tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro | 5 | ||||
-rw-r--r-- | tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp | 14 |
2 files changed, 11 insertions, 8 deletions
diff --git a/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro b/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro index fdc2445bd1..b1533d6be1 100644 --- a/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro +++ b/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro @@ -3,9 +3,8 @@ TARGET = tst_qquickcustomaffector SOURCES += tst_qquickcustomaffector.cpp macx:CONFIG -= app_bundle -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +include (../../shared/util.pri) +TESTDATA = data/* QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp b/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp index c854ebe0ae..b63cde14f3 100644 --- a/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp +++ b/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp @@ -44,25 +44,29 @@ #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qquickcustomaffector : public QObject +#include "../../shared/util.h" + +class tst_qquickcustomaffector : public QQmlDataTest { Q_OBJECT public: - tst_qquickcustomaffector(); + tst_qquickcustomaffector() {} private slots: + void initTestCase(); void test_basic(); void test_move(); }; -tst_qquickcustomaffector::tst_qquickcustomaffector() +void tst_qquickcustomaffector::initTestCase() { + QQmlDataTest::initTestCase(); QUnifiedTimer::instance()->setConsistentTiming(true); } void tst_qquickcustomaffector::test_basic() { - QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600); + QQuickView* view = createView(testFileUrl("basic.qml"), 600); QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); @@ -95,7 +99,7 @@ void tst_qquickcustomaffector::test_basic() void tst_qquickcustomaffector::test_move() { - QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/move.qml", 600); + QQuickView* view = createView(testFileUrl("move.qml"), 600); QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); ensureAnimTime(600, system->m_animation); |