Changed particles tests to work from install directory

- Changed particles tests to use TESTDATA
- Changed particles tests to inherit from QQmlDataTest
  and use testFileUrl() to find test data

Change-Id: Iae7c5111d976ec3efe473c40a3bab2f0a38c0969
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

2 files changed, 15 insertions, 12 deletions

diff --git a/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro b/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro
index 1241467ba1..590f698510 100644
--- a/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro
+++ b/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro
@@ -3,8 +3,7 @@ TARGET = tst_qquickimageparticle
 SOURCES += tst_qquickimageparticle.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/qquickimageparticle/tst_qquickimageparticle.cpp b/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp
index 4d8a2e9e38..b953859d8d 100644
--- a/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp
+++ b/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp
@@ -44,16 +44,19 @@
 #include <private/qquickparticlesystem_p.h>
 #include <private/qabstractanimation_p.h>
 
+#include "../../shared/util.h"
+
 const double CONV_FACTOR = 0.017453292519943295;//Degrees to radians
 
-class tst_qquickimageparticle : public QObject
+class tst_qquickimageparticle : public QQmlDataTest
 {
     Q_OBJECT
 public:
-    tst_qquickimageparticle();
+    tst_qquickimageparticle() {}
     ~tst_qquickimageparticle();
 
 private slots:
+    void initTestCase();
     void test_basic();
     void test_colored();
     void test_colorVariance();
@@ -62,8 +65,9 @@ private slots:
     void test_sprite();
 };
 
-tst_qquickimageparticle::tst_qquickimageparticle()
+void tst_qquickimageparticle::initTestCase()
 {
+    QQmlDataTest::initTestCase();
     QUnifiedTimer::instance()->setConsistentTiming(true);
     setenv("QML_PARTICLES_DEBUG","please",0);//QQuickImageParticle has several debug statements, with possible pointer dereferences
 }
@@ -75,7 +79,7 @@ tst_qquickimageparticle::~tst_qquickimageparticle()
 
 void tst_qquickimageparticle::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);
 
@@ -119,7 +123,7 @@ void tst_qquickimageparticle::test_basic()
 
 void tst_qquickimageparticle::test_colored()
 {
-    QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/colored.qml", 600);
+    QQuickView* view = createView(testFileUrl("colored.qml"), 600);
     QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system");
     ensureAnimTime(600, system->m_animation);
 
@@ -163,7 +167,7 @@ void tst_qquickimageparticle::test_colored()
 
 void tst_qquickimageparticle::test_colorVariance()
 {
-    QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/colorVariance.qml", 600);
+    QQuickView* view = createView(testFileUrl("colorVariance.qml"), 600);
     QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system");
     ensureAnimTime(600, system->m_animation);
 
@@ -208,7 +212,7 @@ void tst_qquickimageparticle::test_colorVariance()
 
 void tst_qquickimageparticle::test_deformed()
 {
-    QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/deformed.qml", 600);
+    QQuickView* view = createView(testFileUrl("deformed.qml"), 600);
     QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system");
     ensureAnimTime(600, system->m_animation);
 
@@ -252,7 +256,7 @@ void tst_qquickimageparticle::test_deformed()
 
 void tst_qquickimageparticle::test_tabled()
 {
-    QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/tabled.qml", 600);
+    QQuickView* view = createView(testFileUrl("tabled.qml"), 600);
     QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system");
     ensureAnimTime(600, system->m_animation);
 
@@ -297,7 +301,7 @@ void tst_qquickimageparticle::test_tabled()
 
 void tst_qquickimageparticle::test_sprite()
 {
-    QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/sprite.qml", 600);
+    QQuickView* view = createView(testFileUrl("sprite.qml"), 600);
     QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system");
     ensureAnimTime(600, system->m_animation);