diff options
Diffstat (limited to 'tests/auto/particles')
46 files changed, 117 insertions, 174 deletions
diff --git a/tests/auto/particles/qquickage/CMakeLists.txt b/tests/auto/particles/qquickage/CMakeLists.txt index ef1cb8fe45..82e5481a28 100644 --- a/tests/auto/particles/qquickage/CMakeLists.txt +++ b/tests/auto/particles/qquickage/CMakeLists.txt @@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickage SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquickage.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquickage Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickage/tst_qquickage.cpp b/tests/auto/particles/qquickage/tst_qquickage.cpp index 3a2d4e3927..2b9916d46c 100644 --- a/tests/auto/particles/qquickage/tst_qquickage.cpp +++ b/tests/auto/particles/qquickage/tst_qquickage.cpp @@ -30,14 +30,13 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquickage : public QQmlDataTest { Q_OBJECT public: - tst_qquickage() {} + tst_qquickage() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; diff --git a/tests/auto/particles/qquickangleddirection/CMakeLists.txt b/tests/auto/particles/qquickangleddirection/CMakeLists.txt index a60dfa8d6b..6e6a5b42e9 100644 --- a/tests/auto/particles/qquickangleddirection/CMakeLists.txt +++ b/tests/auto/particles/qquickangleddirection/CMakeLists.txt @@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickangleddirection SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquickangleddirection.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquickangleddirection Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickangleddirection/tst_qquickangleddirection.cpp b/tests/auto/particles/qquickangleddirection/tst_qquickangleddirection.cpp index 6186dc97de..66a39c1357 100644 --- a/tests/auto/particles/qquickangleddirection/tst_qquickangleddirection.cpp +++ b/tests/auto/particles/qquickangleddirection/tst_qquickangleddirection.cpp @@ -31,14 +31,13 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquickangleddirection : public QQmlDataTest { Q_OBJECT public: - tst_qquickangleddirection() {} + tst_qquickangleddirection() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; diff --git a/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt b/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt index 0eecede9a5..4a81fb010c 100644 --- a/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt +++ b/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt @@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickcumulativedirection SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquickcumulativedirection.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquickcumulativedirection Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickcumulativedirection/tst_qquickcumulativedirection.cpp b/tests/auto/particles/qquickcumulativedirection/tst_qquickcumulativedirection.cpp index c5c4bbb897..011ccf1ae7 100644 --- a/tests/auto/particles/qquickcumulativedirection/tst_qquickcumulativedirection.cpp +++ b/tests/auto/particles/qquickcumulativedirection/tst_qquickcumulativedirection.cpp @@ -30,14 +30,13 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquickcumulativedirection : public QQmlDataTest { Q_OBJECT public: - tst_qquickcumulativedirection() {} + tst_qquickcumulativedirection() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; diff --git a/tests/auto/particles/qquickcustomaffector/CMakeLists.txt b/tests/auto/particles/qquickcustomaffector/CMakeLists.txt index 7b09402ea4..f89bce3be0 100644 --- a/tests/auto/particles/qquickcustomaffector/CMakeLists.txt +++ b/tests/auto/particles/qquickcustomaffector/CMakeLists.txt @@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickcustomaffector SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquickcustomaffector.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquickcustomaffector Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp b/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp index 213768bbb6..c912c82650 100644 --- a/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp +++ b/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp @@ -30,14 +30,13 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquickcustomaffector : public QQmlDataTest { Q_OBJECT public: - tst_qquickcustomaffector() {} + tst_qquickcustomaffector() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; diff --git a/tests/auto/particles/qquickellipseextruder/CMakeLists.txt b/tests/auto/particles/qquickellipseextruder/CMakeLists.txt index 4d432f78d0..33126d1541 100644 --- a/tests/auto/particles/qquickellipseextruder/CMakeLists.txt +++ b/tests/auto/particles/qquickellipseextruder/CMakeLists.txt @@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickellipseextruder SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquickellipseextruder.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquickellipseextruder Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickellipseextruder/tst_qquickellipseextruder.cpp b/tests/auto/particles/qquickellipseextruder/tst_qquickellipseextruder.cpp index ec1659d486..56e3c457af 100644 --- a/tests/auto/particles/qquickellipseextruder/tst_qquickellipseextruder.cpp +++ b/tests/auto/particles/qquickellipseextruder/tst_qquickellipseextruder.cpp @@ -31,14 +31,13 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquickellipseextruder : public QQmlDataTest { Q_OBJECT public: - tst_qquickellipseextruder() {} + tst_qquickellipseextruder() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; diff --git a/tests/auto/particles/qquickfriction/CMakeLists.txt b/tests/auto/particles/qquickfriction/CMakeLists.txt index 5e7e270d69..3883a1dba3 100644 --- a/tests/auto/particles/qquickfriction/CMakeLists.txt +++ b/tests/auto/particles/qquickfriction/CMakeLists.txt @@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickfriction SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquickfriction.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquickfriction Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp b/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp index de535118f4..b840828fcd 100644 --- a/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp +++ b/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp @@ -30,14 +30,13 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquickfriction : public QQmlDataTest { Q_OBJECT public: - tst_qquickfriction() {} + tst_qquickfriction() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; diff --git a/tests/auto/particles/qquickgravity/CMakeLists.txt b/tests/auto/particles/qquickgravity/CMakeLists.txt index e555dd9f80..315c2b2129 100644 --- a/tests/auto/particles/qquickgravity/CMakeLists.txt +++ b/tests/auto/particles/qquickgravity/CMakeLists.txt @@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickgravity SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquickgravity.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquickgravity Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp b/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp index dcc0c017e8..27e30e68df 100644 --- a/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp +++ b/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp @@ -30,14 +30,13 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquickgravity : public QQmlDataTest { Q_OBJECT public: - tst_qquickgravity() {} + tst_qquickgravity() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; diff --git a/tests/auto/particles/qquickgroupgoal/CMakeLists.txt b/tests/auto/particles/qquickgroupgoal/CMakeLists.txt index dbacb28d29..410189917b 100644 --- a/tests/auto/particles/qquickgroupgoal/CMakeLists.txt +++ b/tests/auto/particles/qquickgroupgoal/CMakeLists.txt @@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickgroupgoal SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquickgroupgoal.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquickgroupgoal Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickgroupgoal/tst_qquickgroupgoal.cpp b/tests/auto/particles/qquickgroupgoal/tst_qquickgroupgoal.cpp index 6ede0eb968..86a63b1cfb 100644 --- a/tests/auto/particles/qquickgroupgoal/tst_qquickgroupgoal.cpp +++ b/tests/auto/particles/qquickgroupgoal/tst_qquickgroupgoal.cpp @@ -30,14 +30,13 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquickgroupgoal : public QQmlDataTest { Q_OBJECT public: - tst_qquickgroupgoal() {} + tst_qquickgroupgoal() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; diff --git a/tests/auto/particles/qquickimageparticle/BLACKLIST b/tests/auto/particles/qquickimageparticle/BLACKLIST index a615dcd6e6..8a9bd8d00c 100644 --- a/tests/auto/particles/qquickimageparticle/BLACKLIST +++ b/tests/auto/particles/qquickimageparticle/BLACKLIST @@ -1,16 +1,20 @@ # QTBUG-63055 [test_colored] b2qt +qnx # QTBUG-63055 [test_colorVariance] b2qt +qnx # QTBUG-63055 [test_deformed] b2qt +qnx # QTBUG-63055 [test_sprite] b2qt +qnx diff --git a/tests/auto/particles/qquickimageparticle/CMakeLists.txt b/tests/auto/particles/qquickimageparticle/CMakeLists.txt index 03f6ea0ef8..668d9c484d 100644 --- a/tests/auto/particles/qquickimageparticle/CMakeLists.txt +++ b/tests/auto/particles/qquickimageparticle/CMakeLists.txt @@ -7,15 +7,12 @@ # Collect test data file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - data/*) + data/* ../shared/*) list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickimageparticle SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquickimageparticle.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquickimageparticle Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp b/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp index 32a8a9435c..06c0e898d3 100644 --- a/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp +++ b/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp @@ -30,8 +30,7 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> const double CONV_FACTOR = 0.017453292519943295;//Degrees to radians @@ -39,7 +38,7 @@ class tst_qquickimageparticle : public QQmlDataTest { Q_OBJECT public: - tst_qquickimageparticle() {} + tst_qquickimageparticle() : QQmlDataTest(QT_QMLTEST_DATADIR) {} ~tst_qquickimageparticle(); private slots: @@ -244,46 +243,50 @@ void tst_qquickimageparticle::test_deformed() void tst_qquickimageparticle::test_tabled() { - QQuickView* view = createView(testFileUrl("tabled.qml"), 600); - QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); - ensureAnimTime(600, system->m_animation); - - QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10)); - for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) { - if (d->t == -1) - continue; //Particle data unused - - QCOMPARE(d->x, 0.f); - QCOMPARE(d->y, 0.f); - QCOMPARE(d->vx, 0.f); - QCOMPARE(d->vy, 0.f); - QCOMPARE(d->ax, 0.f); - QCOMPARE(d->ay, 0.f); - QCOMPARE(d->lifeSpan, 0.5f); - QCOMPARE(d->size, 32.f); - QCOMPARE(d->endSize, 32.f); - QVERIFY(myFuzzyLEQ(d->t, ((qreal)system->timeInt/1000.0))); - QCOMPARE(d->color.r, (uchar)255); - QCOMPARE(d->color.g, (uchar)255); - QCOMPARE(d->color.b, (uchar)255); - QCOMPARE(d->color.a, (uchar)255); - QCOMPARE(d->xx, 1.0f); - QCOMPARE(d->xy, 0.0f); - QCOMPARE(d->yy, 1.0f); - QCOMPARE(d->yx, 0.0f); - QCOMPARE(d->rotation, 0.0f); - QCOMPARE(d->rotationVelocity, 0.0f); - QCOMPARE(d->autoRotate, (uchar)0); - QCOMPARE(d->animX, 0.0f); - QCOMPARE(d->animY, 0.0f); - QCOMPARE(d->animWidth, 1.0f); - QCOMPARE(d->animHeight, 1.0f); - QCOMPARE(d->frameDuration, 1.0f); - QCOMPARE(d->frameCount, 1.0f); - QCOMPARE(d->animT, -1.0f); - //TODO: This performance level doesn't alter particleData, but goes straight to shaders. Find something to test - } - delete view; + #if defined(Q_OS_LINUX) + QSKIP("Crashing on Ubuntu 22.04: QTBUG-107707"); + #else + QQuickView* view = createView(testFileUrl("tabled.qml"), 600); + QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); + ensureAnimTime(600, system->m_animation); + + QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10)); + for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) { + if (d->t == -1) + continue; //Particle data unused + + QCOMPARE(d->x, 0.f); + QCOMPARE(d->y, 0.f); + QCOMPARE(d->vx, 0.f); + QCOMPARE(d->vy, 0.f); + QCOMPARE(d->ax, 0.f); + QCOMPARE(d->ay, 0.f); + QCOMPARE(d->lifeSpan, 0.5f); + QCOMPARE(d->size, 32.f); + QCOMPARE(d->endSize, 32.f); + QVERIFY(myFuzzyLEQ(d->t, ((qreal)system->timeInt/1000.0))); + QCOMPARE(d->color.r, (uchar)255); + QCOMPARE(d->color.g, (uchar)255); + QCOMPARE(d->color.b, (uchar)255); + QCOMPARE(d->color.a, (uchar)255); + QCOMPARE(d->xx, 1.0f); + QCOMPARE(d->xy, 0.0f); + QCOMPARE(d->yy, 1.0f); + QCOMPARE(d->yx, 0.0f); + QCOMPARE(d->rotation, 0.0f); + QCOMPARE(d->rotationVelocity, 0.0f); + QCOMPARE(d->autoRotate, (uchar)0); + QCOMPARE(d->animX, 0.0f); + QCOMPARE(d->animY, 0.0f); + QCOMPARE(d->animWidth, 1.0f); + QCOMPARE(d->animHeight, 1.0f); + QCOMPARE(d->frameDuration, 1.0f); + QCOMPARE(d->frameCount, 1.0f); + QCOMPARE(d->animT, -1.0f); + //TODO: This performance level doesn't alter particleData, but goes straight to shaders. Find something to test + } + delete view; + #endif } diff --git a/tests/auto/particles/qquickitemparticle/CMakeLists.txt b/tests/auto/particles/qquickitemparticle/CMakeLists.txt index ff695eb8af..c76cc1cd67 100644 --- a/tests/auto/particles/qquickitemparticle/CMakeLists.txt +++ b/tests/auto/particles/qquickitemparticle/CMakeLists.txt @@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickitemparticle SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquickitemparticle.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquickitemparticle Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp b/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp index 32fe1a63c4..57e2e324c4 100644 --- a/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp +++ b/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp @@ -32,14 +32,13 @@ #include <private/qquickparticleemitter_p.h> #include <private/qquickimage_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquickitemparticle : public QQmlDataTest { Q_OBJECT public: - tst_qquickitemparticle() {} + tst_qquickitemparticle() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; diff --git a/tests/auto/particles/qquicklineextruder/CMakeLists.txt b/tests/auto/particles/qquicklineextruder/CMakeLists.txt index d7791103be..2de4abfa87 100644 --- a/tests/auto/particles/qquicklineextruder/CMakeLists.txt +++ b/tests/auto/particles/qquicklineextruder/CMakeLists.txt @@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquicklineextruder SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquicklineextruder.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquicklineextruder Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquicklineextruder/tst_qquicklineextruder.cpp b/tests/auto/particles/qquicklineextruder/tst_qquicklineextruder.cpp index cfab3f8aee..f1e21ec98c 100644 --- a/tests/auto/particles/qquicklineextruder/tst_qquicklineextruder.cpp +++ b/tests/auto/particles/qquicklineextruder/tst_qquicklineextruder.cpp @@ -30,14 +30,13 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquicklineextruder : public QQmlDataTest { Q_OBJECT public: - tst_qquicklineextruder() {} + tst_qquicklineextruder() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; diff --git a/tests/auto/particles/qquickmaskextruder/CMakeLists.txt b/tests/auto/particles/qquickmaskextruder/CMakeLists.txt index 0ea7f18f6d..35926389c4 100644 --- a/tests/auto/particles/qquickmaskextruder/CMakeLists.txt +++ b/tests/auto/particles/qquickmaskextruder/CMakeLists.txt @@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickmaskextruder SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquickmaskextruder.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquickmaskextruder Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickmaskextruder/tst_qquickmaskextruder.cpp b/tests/auto/particles/qquickmaskextruder/tst_qquickmaskextruder.cpp index 8a80a93e3e..ec138809cf 100644 --- a/tests/auto/particles/qquickmaskextruder/tst_qquickmaskextruder.cpp +++ b/tests/auto/particles/qquickmaskextruder/tst_qquickmaskextruder.cpp @@ -30,14 +30,13 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquickmaskextruder : public QQmlDataTest { Q_OBJECT public: - tst_qquickmaskextruder() {} + tst_qquickmaskextruder() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; diff --git a/tests/auto/particles/qquickparticlegroup/CMakeLists.txt b/tests/auto/particles/qquickparticlegroup/CMakeLists.txt index 4d335b18d0..2f8d5e87de 100644 --- a/tests/auto/particles/qquickparticlegroup/CMakeLists.txt +++ b/tests/auto/particles/qquickparticlegroup/CMakeLists.txt @@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickparticlegroup SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquickparticlegroup.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquickparticlegroup Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp b/tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp index 8dcce6a73c..2e688fc625 100644 --- a/tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp +++ b/tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp @@ -30,14 +30,13 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquickparticlegroup : public QQmlDataTest { Q_OBJECT public: - tst_qquickparticlegroup() {} + tst_qquickparticlegroup() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; diff --git a/tests/auto/particles/qquickparticlesystem/CMakeLists.txt b/tests/auto/particles/qquickparticlesystem/CMakeLists.txt index 984a7350f0..1cc7dede47 100644 --- a/tests/auto/particles/qquickparticlesystem/CMakeLists.txt +++ b/tests/auto/particles/qquickparticlesystem/CMakeLists.txt @@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickparticlesystem SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquickparticlesystem.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquickparticlesystem Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp b/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp index 705e47230c..00ab7bd044 100644 --- a/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp +++ b/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp @@ -30,14 +30,13 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquickparticlesystem : public QQmlDataTest { Q_OBJECT public: - tst_qquickparticlesystem() {} + tst_qquickparticlesystem() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; diff --git a/tests/auto/particles/qquickpointattractor/CMakeLists.txt b/tests/auto/particles/qquickpointattractor/CMakeLists.txt index 6dfdc085af..e43159edb7 100644 --- a/tests/auto/particles/qquickpointattractor/CMakeLists.txt +++ b/tests/auto/particles/qquickpointattractor/CMakeLists.txt @@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickpointattractor SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquickpointattractor.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquickpointattractor Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickpointattractor/tst_qquickpointattractor.cpp b/tests/auto/particles/qquickpointattractor/tst_qquickpointattractor.cpp index 8e63c1802b..3630371de5 100644 --- a/tests/auto/particles/qquickpointattractor/tst_qquickpointattractor.cpp +++ b/tests/auto/particles/qquickpointattractor/tst_qquickpointattractor.cpp @@ -30,14 +30,13 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquickpointattractor : public QQmlDataTest { Q_OBJECT public: - tst_qquickpointattractor() {} + tst_qquickpointattractor() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; diff --git a/tests/auto/particles/qquickpointdirection/CMakeLists.txt b/tests/auto/particles/qquickpointdirection/CMakeLists.txt index 73867c74bb..ccc31b2c1d 100644 --- a/tests/auto/particles/qquickpointdirection/CMakeLists.txt +++ b/tests/auto/particles/qquickpointdirection/CMakeLists.txt @@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickpointdirection SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquickpointdirection.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquickpointdirection Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickpointdirection/tst_qquickpointdirection.cpp b/tests/auto/particles/qquickpointdirection/tst_qquickpointdirection.cpp index ae5bfe406a..ae8860fcf7 100644 --- a/tests/auto/particles/qquickpointdirection/tst_qquickpointdirection.cpp +++ b/tests/auto/particles/qquickpointdirection/tst_qquickpointdirection.cpp @@ -30,14 +30,13 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquickpointdirection : public QQmlDataTest { Q_OBJECT public: - tst_qquickpointdirection() {} + tst_qquickpointdirection() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; diff --git a/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt b/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt index 9e48fd6d93..52c87db86d 100644 --- a/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt +++ b/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt @@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickrectangleextruder SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquickrectangleextruder.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquickrectangleextruder Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickrectangleextruder/tst_qquickrectangleextruder.cpp b/tests/auto/particles/qquickrectangleextruder/tst_qquickrectangleextruder.cpp index 6447523cd1..d95c4bc464 100644 --- a/tests/auto/particles/qquickrectangleextruder/tst_qquickrectangleextruder.cpp +++ b/tests/auto/particles/qquickrectangleextruder/tst_qquickrectangleextruder.cpp @@ -30,14 +30,13 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquickrectangleextruder : public QQmlDataTest { Q_OBJECT public: - tst_qquickrectangleextruder() {} + tst_qquickrectangleextruder() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; diff --git a/tests/auto/particles/qquickspritegoal/BLACKLIST b/tests/auto/particles/qquickspritegoal/BLACKLIST index bd64621f77..f09c8912c6 100644 --- a/tests/auto/particles/qquickspritegoal/BLACKLIST +++ b/tests/auto/particles/qquickspritegoal/BLACKLIST @@ -1,3 +1,4 @@ # QTBUG-63057 [test_instantTransition] b2qt +qnx diff --git a/tests/auto/particles/qquickspritegoal/CMakeLists.txt b/tests/auto/particles/qquickspritegoal/CMakeLists.txt index 0f87615bb0..4fe39a3acd 100644 --- a/tests/auto/particles/qquickspritegoal/CMakeLists.txt +++ b/tests/auto/particles/qquickspritegoal/CMakeLists.txt @@ -7,15 +7,12 @@ # Collect test data file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - data/*) + data/* ../shared/*) list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickspritegoal SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquickspritegoal.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquickspritegoal Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickspritegoal/tst_qquickspritegoal.cpp b/tests/auto/particles/qquickspritegoal/tst_qquickspritegoal.cpp index 4f803b9b64..43fb3bafe7 100644 --- a/tests/auto/particles/qquickspritegoal/tst_qquickspritegoal.cpp +++ b/tests/auto/particles/qquickspritegoal/tst_qquickspritegoal.cpp @@ -30,14 +30,13 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquickspritegoal : public QQmlDataTest { Q_OBJECT public: - tst_qquickspritegoal() {} + tst_qquickspritegoal() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; diff --git a/tests/auto/particles/qquicktargetdirection/CMakeLists.txt b/tests/auto/particles/qquicktargetdirection/CMakeLists.txt index 1bb462af66..bd6526c83b 100644 --- a/tests/auto/particles/qquicktargetdirection/CMakeLists.txt +++ b/tests/auto/particles/qquicktargetdirection/CMakeLists.txt @@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquicktargetdirection SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquicktargetdirection.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquicktargetdirection Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquicktargetdirection/tst_qquicktargetdirection.cpp b/tests/auto/particles/qquicktargetdirection/tst_qquicktargetdirection.cpp index a96c6e15ef..7f9bc0815a 100644 --- a/tests/auto/particles/qquicktargetdirection/tst_qquicktargetdirection.cpp +++ b/tests/auto/particles/qquicktargetdirection/tst_qquicktargetdirection.cpp @@ -30,14 +30,13 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquicktargetdirection : public QQmlDataTest { Q_OBJECT public: - tst_qquicktargetdirection() {} + tst_qquicktargetdirection() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; diff --git a/tests/auto/particles/qquicktrailemitter/CMakeLists.txt b/tests/auto/particles/qquicktrailemitter/CMakeLists.txt index e7eb6ab607..97065a258e 100644 --- a/tests/auto/particles/qquicktrailemitter/CMakeLists.txt +++ b/tests/auto/particles/qquicktrailemitter/CMakeLists.txt @@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquicktrailemitter SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquicktrailemitter.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquicktrailemitter Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquicktrailemitter/tst_qquicktrailemitter.cpp b/tests/auto/particles/qquicktrailemitter/tst_qquicktrailemitter.cpp index a6b73e4f1d..9fce9a5b29 100644 --- a/tests/auto/particles/qquicktrailemitter/tst_qquicktrailemitter.cpp +++ b/tests/auto/particles/qquicktrailemitter/tst_qquicktrailemitter.cpp @@ -30,14 +30,13 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquicktrailemitter : public QQmlDataTest { Q_OBJECT public: - tst_qquicktrailemitter() {} + tst_qquicktrailemitter() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; diff --git a/tests/auto/particles/qquickturbulence/CMakeLists.txt b/tests/auto/particles/qquickturbulence/CMakeLists.txt index 166649214c..f538c04829 100644 --- a/tests/auto/particles/qquickturbulence/CMakeLists.txt +++ b/tests/auto/particles/qquickturbulence/CMakeLists.txt @@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickturbulence SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquickturbulence.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquickturbulence Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickturbulence/tst_qquickturbulence.cpp b/tests/auto/particles/qquickturbulence/tst_qquickturbulence.cpp index 69d47ffa1f..597b0dddaa 100644 --- a/tests/auto/particles/qquickturbulence/tst_qquickturbulence.cpp +++ b/tests/auto/particles/qquickturbulence/tst_qquickturbulence.cpp @@ -30,14 +30,13 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquickturbulence : public QQmlDataTest { Q_OBJECT public: - tst_qquickturbulence() {} + tst_qquickturbulence() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; diff --git a/tests/auto/particles/qquickwander/CMakeLists.txt b/tests/auto/particles/qquickwander/CMakeLists.txt index 8ce66a2318..f634b8bff2 100644 --- a/tests/auto/particles/qquickwander/CMakeLists.txt +++ b/tests/auto/particles/qquickwander/CMakeLists.txt @@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickwander SOURCES - ../../shared/util.cpp ../../shared/util.h tst_qquickwander.cpp - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquickwander Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickwander/tst_qquickwander.cpp b/tests/auto/particles/qquickwander/tst_qquickwander.cpp index 8df00184b4..ec45461501 100644 --- a/tests/auto/particles/qquickwander/tst_qquickwander.cpp +++ b/tests/auto/particles/qquickwander/tst_qquickwander.cpp @@ -30,14 +30,13 @@ #include "../shared/particlestestsshared.h" #include <private/qquickparticlesystem_p.h> #include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> class tst_qquickwander : public QQmlDataTest { Q_OBJECT public: - tst_qquickwander() {} + tst_qquickwander() : QQmlDataTest(QT_QMLTEST_DATADIR) {} private slots: void initTestCase() override; |