diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2011-10-04 17:27:39 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-05 10:41:32 +0200 |
commit | fc82364404a232607ff11ea1c4cda99abc722e85 (patch) | |
tree | 0d7376342bf0d8e9f61d98b29b82a40063ff6b0a /tests/auto/particles | |
parent | 08c975bd77f8fdbbdb5c4694d898a724db900849 (diff) |
Add .pro file to auto test dir
Also stabilize some tests
Change-Id: I1b508756ffca6a05d495c52d84f46fcaeafe879a
Reviewed-on: http://codereview.qt-project.org/5952
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/particles')
-rw-r--r-- | tests/auto/particles/particles.pro | 28 | ||||
-rw-r--r-- | tests/auto/particles/qsgage/tst_qsgage.cpp | 2 | ||||
-rw-r--r-- | tests/auto/particles/qsgcustomaffector/tst_qsgcustomaffector.cpp | 2 |
3 files changed, 32 insertions, 0 deletions
diff --git a/tests/auto/particles/particles.pro b/tests/auto/particles/particles.pro new file mode 100644 index 0000000000..2c793a988e --- /dev/null +++ b/tests/auto/particles/particles.pro @@ -0,0 +1,28 @@ +TEMPLATE = subdirs + +PRIVATETESTS += \ + qsgage \ + qsgangleddirection \ + qsgcumulativedirection \ + qsgcustomaffector \ + qsgcustomparticle \ + qsgellipseextruder \ + qsgfriction \ + qsggravity \ + qsgimageparticle \ + qsgitemparticle \ + qsglineextruder \ + qsgmaskextruder \ + qsgparticlegroup \ + qsgparticlesystem \ + qsgpointattractor \ + qsgpointdirection \ + qsgrectangleextruder \ + qsgtargetdirection \ + qsgtrailemitter \ + qsgturbulence \ + qsgwander + +contains(QT_CONFIG, private_tests) { + SUBDIRS += $$PRIVATETESTS +} diff --git a/tests/auto/particles/qsgage/tst_qsgage.cpp b/tests/auto/particles/qsgage/tst_qsgage.cpp index d595e6e2bd..45267e5046 100644 --- a/tests/auto/particles/qsgage/tst_qsgage.cpp +++ b/tests/auto/particles/qsgage/tst_qsgage.cpp @@ -67,6 +67,8 @@ void tst_qsgage::test_kill() QCOMPARE(system->groupData[0]->size(), 500); foreach (QSGParticleData *d, system->groupData[0]->data) { + if (d->t == -1) //Recycler out-smarted me and never needed to init this datum + continue; QCOMPARE(d->x, 0.f); QCOMPARE(d->y, 0.f); QCOMPARE(d->vx, 1000.f); diff --git a/tests/auto/particles/qsgcustomaffector/tst_qsgcustomaffector.cpp b/tests/auto/particles/qsgcustomaffector/tst_qsgcustomaffector.cpp index ec86fc7fff..2a7e978b8b 100644 --- a/tests/auto/particles/qsgcustomaffector/tst_qsgcustomaffector.cpp +++ b/tests/auto/particles/qsgcustomaffector/tst_qsgcustomaffector.cpp @@ -64,6 +64,8 @@ void tst_qsgcustomaffector::test_basic() QCOMPARE(system->groupData[0]->size(), 500); foreach (QSGParticleData *d, system->groupData[0]->data) { + if (d->t == -1) //Recycler out-smarted me and never needed to init this datum + continue; QCOMPARE(d->x, 100.f); QCOMPARE(d->y, 100.f); QCOMPARE(d->vx, 100.f); |