diff options
Diffstat (limited to 'tests/auto/particles/qquickcumulativedirection')
-rw-r--r-- | tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro | 5 | ||||
-rw-r--r-- | tests/auto/particles/qquickcumulativedirection/tst_qquickcumulativedirection.cpp | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro b/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro index 42029ce721..b5d3efac6d 100644 --- a/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro +++ b/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro @@ -3,9 +3,8 @@ TARGET = tst_qquickcumulativedirection SOURCES += tst_qquickcumulativedirection.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/qquickcumulativedirection/tst_qquickcumulativedirection.cpp b/tests/auto/particles/qquickcumulativedirection/tst_qquickcumulativedirection.cpp index aaa89ec19a..3fad1b8b09 100644 --- a/tests/auto/particles/qquickcumulativedirection/tst_qquickcumulativedirection.cpp +++ b/tests/auto/particles/qquickcumulativedirection/tst_qquickcumulativedirection.cpp @@ -44,24 +44,28 @@ #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> -class tst_qquickcumulativedirection : public QObject +#include "../../shared/util.h" + +class tst_qquickcumulativedirection : public QQmlDataTest { Q_OBJECT public: - tst_qquickcumulativedirection(); + tst_qquickcumulativedirection() {} private slots: + void initTestCase(); void test_basic(); }; -tst_qquickcumulativedirection::tst_qquickcumulativedirection() +void tst_qquickcumulativedirection::initTestCase() { + QQmlDataTest::initTestCase(); QUnifiedTimer::instance()->setConsistentTiming(true); } void tst_qquickcumulativedirection::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); |