aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp
diff options
context:
space:
mode:
authorKurt Korbatits <kurt.korbatits@nokia.com>2012-03-07 08:02:44 +1000
committerQt by Nokia <qt-info@nokia.com>2012-03-07 06:24:33 +0100
commit83b4f5cc4f2661a41bbed4e17606a5e40bd06b7c (patch)
treeaa7bebfcc81a53ee999123f6c4aa05e75aceaca3 /tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp
parent72f4ccecf457eaa34469e9d7c2d05802214904d6 (diff)
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>
Diffstat (limited to 'tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp')
-rw-r--r--tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp b/tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp
index 584ef80347..ff0887647c 100644
--- a/tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp
+++ b/tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp
@@ -44,24 +44,28 @@
#include <private/qquickparticlesystem_p.h>
#include <private/qabstractanimation_p.h>
-class tst_qquickparticlegroup : public QObject
+#include "../../shared/util.h"
+
+class tst_qquickparticlegroup : public QQmlDataTest
{
Q_OBJECT
public:
- tst_qquickparticlegroup();
+ tst_qquickparticlegroup() {}
private slots:
+ void initTestCase();
void test_instantTransition();
};
-tst_qquickparticlegroup::tst_qquickparticlegroup()
+void tst_qquickparticlegroup::initTestCase()
{
+ QQmlDataTest::initTestCase();
QUnifiedTimer::instance()->setConsistentTiming(true);
}
void tst_qquickparticlegroup::test_instantTransition()
{
- 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);