diff options
| author | Julian de Bhal <julian.debhal@nokia.com> | 2011-07-04 15:32:27 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-06 04:13:16 +0200 |
| commit | 231f6caa2dcda184cc3e043625ef7d227c493779 (patch) | |
| tree | 171b8d2081f6147e7bc8ca4e7cf05e65004175df /tests | |
| parent | e43fd2367f692a8077810be86acfd2256935e016 (diff) | |
Refactor QDeclarativeItem3D to use QDeclarativeItem's parent tree.
Change-Id: I2b7709b36112795d5a3c501fa04a040c8bb5c3d8
Reviewed-on: http://codereview.qt.nokia.com/1134
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qml3d/item3d/tst_item3d.qml | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/tests/auto/qml3d/item3d/tst_item3d.qml b/tests/auto/qml3d/item3d/tst_item3d.qml index b7af907e8..ffa0a6ee3 100644 --- a/tests/auto/qml3d/item3d/tst_item3d.qml +++ b/tests/auto/qml3d/item3d/tst_item3d.qml @@ -321,7 +321,7 @@ Viewport { function test_children() { - verify(item.children.length == 3, "item has 3 children"); + verify(item.children.length >= 0, "item.children can be called"); verify(indexOf(item.children, child1) != -1, "item.children contains child1") verify(indexOf(item.children, child2) != -1, "item.children contains child2") verify(indexOf(item.children, inheritEventTestChild) != -1, "item.children contains inheritEventTestChild") @@ -355,35 +355,32 @@ Viewport { compare(item.childrenHasBeenChanged,0, "pretest marker verification"); // Test the initial Item3D parent/child relationships. - verify(item.parent == null, "root item") + verify(item.parent == viewport, "root item") verify(child1.parent == item, "child1 item") verify(child2.parent == item, "child2 item") - compare(item.children.length, 3, "root item children count") compare(child1.children.length, 0, "child1 children") - verify(item.children[0] == child1, "children[0] is child1") - verify(item.children[1] == child2, "children[1] is child2") + verify(indexOf(item.children, child1) != -1, "children contains child1") + verify(indexOf(item.children, child2) != -1, "children contains child2") // Reparent the second child and re-test. child2.parent = child1 compare(item.childrenHasBeenChanged,1, "childrenChanged triggered by removing child"); - verify(item.parent == null, "root item (B)") + verify(item.parent == viewport, "root item (B)") verify(child1.parent == item, "child1's parent (B)") verify(child2.parent == child1, "child2's parent (B)") - compare(item.children.length, 2, "root item children count (B)") compare(child1.children.length, 1, "child1 children (B)") - verify(item.children[0] == child1, "children[0] is child1 (B)") - verify(child1.children[0] == child2, "children[1] is child2 (B)") + verify(indexOf(item.children, child1) != -1, "item.children contains child1 (B)") + verify(indexOf(item.children, child2) == -1, "reparented child not removed from old parent (B)"); verify(indexOf(child1.children, child2) != -1, "child1.children contains child2"); // Change the parent back and test again child2.parent = item compare(item.childrenHasBeenChanged,2, "childrenChanged triggered by re-adding child"); - verify(item.parent == null, "root item after revert") + verify(item.parent == viewport, "root item after revert") verify(child1.parent == item, "child1 item after revert") verify(child2.parent == item, "child2 item after revert") - compare(item.children.length, 3, "root children count after revert") compare(child1.children.length, 0, "child1 has no children after revert") verify(indexOf(item.children, child1) != -1, "item.children contains child1 after revert"); |