summaryrefslogtreecommitdiffstats
path: root/tests/auto/render/qeffect
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2019-09-06 15:02:25 +0100
committerPaul Lemire <paul.lemire@kdab.com>2019-09-19 09:45:05 +0200
commitb16ff31b2689a43bdbcb3e84094b49ab99a4cd92 (patch)
tree13f4c1fea22459688f66d046b3123d558ba4611e /tests/auto/render/qeffect
parentd09e9d24bfcbee260d7adc8ab1ecfb6ca4713584 (diff)
Update QEffect to use direct sync
Change-Id: Idb1fcc4b13c310843cb479f7d3f02de7a89a784e Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'tests/auto/render/qeffect')
-rw-r--r--tests/auto/render/qeffect/tst_qeffect.cpp40
1 files changed, 12 insertions, 28 deletions
diff --git a/tests/auto/render/qeffect/tst_qeffect.cpp b/tests/auto/render/qeffect/tst_qeffect.cpp
index 7449fee2c..955b58a1e 100644
--- a/tests/auto/render/qeffect/tst_qeffect.cpp
+++ b/tests/auto/render/qeffect/tst_qeffect.cpp
@@ -217,13 +217,8 @@ private Q_SLOTS:
QCoreApplication::processEvents();
// THEN
- QCOMPARE(arbiter.events.size(), 1);
- auto change = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeAddedChange>();
- QCOMPARE(change->propertyName(), "parameter");
- QCOMPARE(change->addedNodeId(), parameter.id());
- QCOMPARE(change->type(), Qt3DCore::PropertyValueAdded);
-
- arbiter.events.clear();
+ QCOMPARE(arbiter.events.size(), 0);
+ QVERIFY(effect.parameters().contains(&parameter));
}
{
@@ -232,13 +227,8 @@ private Q_SLOTS:
QCoreApplication::processEvents();
// THEN
- QCOMPARE(arbiter.events.size(), 1);
- auto change = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>();
- QCOMPARE(change->propertyName(), "parameter");
- QCOMPARE(change->removedNodeId(), parameter.id());
- QCOMPARE(change->type(), Qt3DCore::PropertyValueRemoved);
-
- arbiter.events.clear();
+ QCOMPARE(arbiter.events.size(), 0);
+ QVERIFY(!effect.parameters().contains(&parameter));
}
}
@@ -257,13 +247,10 @@ private Q_SLOTS:
QCoreApplication::processEvents();
// THEN
- QCOMPARE(arbiter.events.size(), 1);
- auto change = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeAddedChange>();
- QCOMPARE(change->propertyName(), "technique");
- QCOMPARE(change->addedNodeId(), technique.id());
- QCOMPARE(change->type(), Qt3DCore::PropertyValueAdded);
-
- arbiter.events.clear();
+ QCOMPARE(arbiter.events.size(), 0);
+ QCOMPARE(arbiter.dirtyNodes.size(), 1);
+ QCOMPARE(arbiter.dirtyNodes.front(), &effect);
+ arbiter.dirtyNodes.clear();
}
{
@@ -272,13 +259,10 @@ private Q_SLOTS:
QCoreApplication::processEvents();
// THEN
- QCOMPARE(arbiter.events.size(), 1);
- auto change = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>();
- QCOMPARE(change->propertyName(), "technique");
- QCOMPARE(change->removedNodeId(), technique.id());
- QCOMPARE(change->type(), Qt3DCore::PropertyValueRemoved);
-
- arbiter.events.clear();
+ QCOMPARE(arbiter.events.size(), 0);
+ QCOMPARE(arbiter.dirtyNodes.size(), 1);
+ QCOMPARE(arbiter.dirtyNodes.front(), &effect);
+ arbiter.dirtyNodes.clear();
}
}