summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2017-03-24 13:33:50 +0000
committerSean Harmer <sean.harmer@kdab.com>2017-03-26 07:29:33 +0000
commiteec0906106c7367f155f84444703754a9e66f745 (patch)
tree1645e8c115e3dbda65c337ac23ec043cca092867 /tests
parent9a5139a2b59ac27afa190caa46ba22138f9dfa6c (diff)
Remove ClipBlendNode::parentId() function
No longer needed. The tree is not managed by parent/child relationships any longer. Change-Id: I711e71a4b54491f5713732ea54100b7ce9526527 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/animation/clipblendnode/tst_clipblendnode.cpp2
-rw-r--r--tests/auto/animation/clipblendnodevisitor/tst_clipblendnodevisitor.cpp9
2 files changed, 0 insertions, 11 deletions
diff --git a/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp b/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
index c945b6f3f..b5953251b 100644
--- a/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
+++ b/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
@@ -114,7 +114,6 @@ private Q_SLOTS:
// THEN
QCOMPARE(backendClipBlendNode.isEnabled(), false);
QVERIFY(backendClipBlendNode.peerId().isNull());
- QCOMPARE(backendClipBlendNode.parentId(), Qt3DCore::QNodeId());
QCOMPARE(backendClipBlendNode.childrenIds(), Qt3DCore::QNodeIdVector());
QVERIFY(backendClipBlendNode.clipBlendNodeManager() == nullptr);
QCOMPARE(backendClipBlendNode.blendType(), ClipBlendNode::LerpBlendType);
@@ -139,7 +138,6 @@ private Q_SLOTS:
// THEN
QCOMPARE(backendClipBlendNode.isEnabled(), true);
QCOMPARE(backendClipBlendNode.peerId(), clipBlendNode.id());
- QCOMPARE(backendClipBlendNode.parentId(), Qt3DCore::QNodeId());
QCOMPARE(backendClipBlendNode.childrenIds().size(), 0);
QCOMPARE(backendClipBlendNode.clipBlendNodeManager(), &manager);
QCOMPARE(backendClipBlendNode.blendType(), ClipBlendNode::LerpBlendType);
diff --git a/tests/auto/animation/clipblendnodevisitor/tst_clipblendnodevisitor.cpp b/tests/auto/animation/clipblendnodevisitor/tst_clipblendnodevisitor.cpp
index 77f835985..9aa3218e9 100644
--- a/tests/auto/animation/clipblendnodevisitor/tst_clipblendnodevisitor.cpp
+++ b/tests/auto/animation/clipblendnodevisitor/tst_clipblendnodevisitor.cpp
@@ -76,15 +76,10 @@ private Q_SLOTS:
simulateInitialization(&childBlendNode12, backendChildBlendNode12);
// THEN
- QVERIFY(backendRootBlendNode->parentId().isNull());
QCOMPARE(backendRootBlendNode->childrenIds().size(), 2);
- QCOMPARE(backendChildBlendNode1->parentId(), rootBlendNode.id());
QCOMPARE(backendChildBlendNode1->childrenIds().size(), 2);
- QCOMPARE(backendChildBlendNode2->parentId(), rootBlendNode.id());
QCOMPARE(backendChildBlendNode2->childrenIds().size(), 0);
- QCOMPARE(backendChildBlendNode11->parentId(), childBlendNode1.id());
QCOMPARE(backendChildBlendNode11->childrenIds().size(), 0);
- QCOMPARE(backendChildBlendNode12->parentId(), childBlendNode1.id());
QCOMPARE(backendChildBlendNode12->childrenIds().size(), 0);
// WHEN
@@ -125,7 +120,6 @@ private Q_SLOTS:
simulateInitialization(&rootBlendNode, backendRootBlendNode);
// THEN
- QVERIFY(backendRootBlendNode->parentId().isNull());
QCOMPARE(backendRootBlendNode->childrenIds().size(), 0);
// WHEN
@@ -164,11 +158,8 @@ private Q_SLOTS:
simulateInitialization(&childBlendNode2, backendChildBlendNode2);
// THEN
- QVERIFY(backendRootBlendNode->parentId().isNull());
QCOMPARE(backendRootBlendNode->childrenIds().size(), 2);
- QCOMPARE(backendChildBlendNode1->parentId(), rootBlendNode.id());
QCOMPARE(backendChildBlendNode1->childrenIds().size(), 0);
- QCOMPARE(backendChildBlendNode2->parentId(), rootBlendNode.id());
QCOMPARE(backendChildBlendNode2->childrenIds().size(), 0);
// WHEN