From 53df9279c0d798d7e7ff4a33863ce341af410200 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Fri, 20 Mar 2015 13:52:06 +0100 Subject: Make TreeView auto-tests pass pending list to array changes This should be updated once the two following patches are merged, https://codereview.qt-project.org/107687 https://codereview.qt-project.org/107973 Change-Id: I89a9ee29f4234a489971463e4035d1bc9863d677 Reviewed-by: Caroline Chao --- tests/auto/controls/data/tst_treeview.qml | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/tests/auto/controls/data/tst_treeview.qml b/tests/auto/controls/data/tst_treeview.qml index 4345ffcf..101c4239 100644 --- a/tests/auto/controls/data/tst_treeview.qml +++ b/tests/auto/controls/data/tst_treeview.qml @@ -80,6 +80,13 @@ Item { } } + function nth(list, i) + { + if (list instanceof Array) + return list[i] + return list.at(i) + } + function test_basic_setup() { var test_instanceStr = @@ -379,7 +386,7 @@ Item { var list = tree.selection.selectedIndexes() compare(list.length, 1) if (list.length === 1) { - compare(list.at(0).internalId, secondItem.internalId) + compare(nth(list, 0).internalId, secondItem.internalId) compare(tree.selection.isSelected(secondItem), true) } @@ -493,7 +500,7 @@ Item { compare(tree.selection.isSelected(secondItem), true) var listIndexes = tree.selection.selectedIndexes() compare(listIndexes.length, 1) - compare(listIndexes.at(0).internalId, secondItem.internalId) + compare(nth(listIndexes, 0).internalId, secondItem.internalId) verify(tree.selection.currentIndex.valid) if (tree.selection.currentIndex.valid) compare(tree.selection.currentIndex.internalId, secondItem.internalId) @@ -505,8 +512,8 @@ Item { compare(tree.selection.isSelected(fourthItem), true) listIndexes = tree.selection.selectedIndexes() compare(listIndexes.length, 2) - compare(listIndexes.at(0).internalId, secondItem.internalId) - compare(listIndexes.at(1).internalId, fourthItem.internalId) + compare(nth(listIndexes, 0).internalId, secondItem.internalId) + compare(nth(listIndexes, 1).internalId, fourthItem.internalId) verify(tree.selection.currentIndex.valid) if (tree.selection.currentIndex.valid) compare(tree.selection.currentIndex.internalId, fourthItem.internalId) @@ -522,9 +529,9 @@ Item { listIndexes = tree.selection.selectedIndexes() compare(listIndexes.length, 3) - compare(listIndexes.at(0).internalId, secondItem.internalId) - compare(listIndexes.at(1).internalId, fourthItem.internalId) - compare(listIndexes.at(2).internalId, sixthItem.internalId) + compare(nth(listIndexes, 0).internalId, secondItem.internalId) + compare(nth(listIndexes, 1).internalId, fourthItem.internalId) + compare(nth(listIndexes, 2).internalId, sixthItem.internalId) verify(tree.selection.currentIndex.valid) if (tree.selection.currentIndex.valid) compare(tree.selection.currentIndex.internalId, sixthItem.internalId) @@ -538,8 +545,8 @@ Item { listIndexes = tree.selection.selectedIndexes() compare(listIndexes.length, 2) - compare(listIndexes.at(0).internalId, secondItem.internalId) - compare(listIndexes.at(1).internalId, sixthItem.internalId) + compare(nth(listIndexes, 0).internalId, secondItem.internalId) + compare(nth(listIndexes, 1).internalId, sixthItem.internalId) verify(tree.selection.currentIndex.valid) mouseClick(tree, semiIndent + 50, 70+150, Qt.LeftButton) @@ -604,7 +611,7 @@ Item { compare(tree.selection.isSelected(secondItem), true) var listIndexes = tree.selection.selectedIndexes() compare(listIndexes.length, 1) - compare(listIndexes.at(0).internalId, secondItem.internalId) + compare(nth(listIndexes, 0).internalId, secondItem.internalId) verify(tree.selection.currentIndex.valid) if (tree.selection.currentIndex.valid) compare(tree.selection.currentIndex.internalId, secondItem.internalId) @@ -692,7 +699,7 @@ Item { compare(tree.selection.isSelected(secondItem), true) var listIndexes = tree.selection.selectedIndexes() compare(listIndexes.length, 1) - compare(listIndexes.at(0).internalId, secondItem.internalId) + compare(nth(listIndexes, 0).internalId, secondItem.internalId) verify(tree.selection.currentIndex.valid) if (tree.selection.currentIndex.valid) compare(tree.selection.currentIndex.internalId, secondItem.internalId) -- cgit v1.2.1