summaryrefslogtreecommitdiffstats
path: root/tests/auto/animation/qclock/tst_qclock.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/animation/qclock/tst_qclock.cpp')
-rw-r--r--tests/auto/animation/qclock/tst_qclock.cpp59
1 files changed, 5 insertions, 54 deletions
diff --git a/tests/auto/animation/qclock/tst_qclock.cpp b/tests/auto/animation/qclock/tst_qclock.cpp
index 65c485566..04e479774 100644
--- a/tests/auto/animation/qclock/tst_qclock.cpp
+++ b/tests/auto/animation/qclock/tst_qclock.cpp
@@ -30,11 +30,9 @@
#include <QtTest/QTest>
#include <Qt3DAnimation/qclock.h>
#include <Qt3DAnimation/private/qclock_p.h>
-#include <Qt3DCore/qnodecreatedchange.h>
-#include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
#include <QObject>
#include <QSignalSpy>
-#include <testpostmanarbiter.h>
+#include <testarbiter.h>
class tst_QClock : public QObject
{
@@ -79,53 +77,6 @@ private Q_SLOTS:
QCOMPARE(spy.count(), 0);
}
- void checkCreationData()
- {
- // GIVEN
- Qt3DAnimation::QClock clock;
- clock.setPlaybackRate(10.f);
-
- // WHEN
- QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges;
- {
- Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(&clock);
- creationChanges = creationChangeGenerator.creationChanges();
- }
-
- // THEN
- {
- QCOMPARE(creationChanges.size(), 1);
-
- const auto creationChangeData = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DAnimation::QClockData>>(creationChanges.first());
- const Qt3DAnimation::QClockData data = creationChangeData->data;
-
- QCOMPARE(clock.id(), creationChangeData->subjectId());
- QCOMPARE(clock.isEnabled(), true);
- QCOMPARE(clock.isEnabled(), creationChangeData->isNodeEnabled());
- QCOMPARE(clock.metaObject(), creationChangeData->metaObject());
- QCOMPARE(clock.playbackRate(), data.playbackRate);
- }
-
- // WHEN
- clock.setEnabled(false);
- {
- Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(&clock);
- creationChanges = creationChangeGenerator.creationChanges();
- }
-
- // THEN
- {
- QCOMPARE(creationChanges.size(), 1);
-
- const auto creationChangeData = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DAnimation::QClockData>>(creationChanges.first());
-
- QCOMPARE(clock.id(), creationChangeData->subjectId());
- QCOMPARE(clock.isEnabled(), false);
- QCOMPARE(clock.isEnabled(), creationChangeData->isNodeEnabled());
- QCOMPARE(clock.metaObject(), creationChangeData->metaObject());
- }
- }
-
void checkPropertyUpdate()
{
// GIVEN
@@ -138,10 +89,10 @@ private Q_SLOTS:
clock.setPlaybackRate(10.5f);
// THEN
- QCOMPARE(arbiter.dirtyNodes.size(), 1);
- QCOMPARE(arbiter.dirtyNodes.front(), &clock);
+ QCOMPARE(arbiter.dirtyNodes().size(), 1);
+ QCOMPARE(arbiter.dirtyNodes().front(), &clock);
- arbiter.dirtyNodes.clear();
+ arbiter.clear();
}
{
@@ -149,7 +100,7 @@ private Q_SLOTS:
clock.setPlaybackRate(10.5f);
// THEN
- QCOMPARE(arbiter.dirtyNodes.size(), 0);
+ QCOMPARE(arbiter.dirtyNodes().size(), 0);
}
}
};