diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-08-22 16:10:01 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-22 18:40:17 +0200 |
commit | 0c955b49760519f0a22f07966eb2e27d2e02c6e2 (patch) | |
tree | f2fd992cbf461717f56e7a7c821d571edce275aa /tests | |
parent | 2b57a8ebfeb6e3495b63fac619631896ca670f11 (diff) |
Fix indexAbove and indexBelow to return indexes in the correct column.
They used to always return indexes in column 0.
Change-Id: I2cf4239e0a975b37548de00a1deb916fcd88b4c7
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp | 52 |
1 files changed, 37 insertions, 15 deletions
diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index 84acac5a96..fd93d3f817 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -1870,17 +1870,21 @@ void tst_QTreeView::indexAbove() model.fetchMore(p); int rows = model.rowCount(p); for (int r = rows - 1; r > 0; --r) { - QModelIndex idx = model.index(r, 0, p); - QModelIndex expected = model.index(r - 1, 0, p); - QCOMPARE(view.indexAbove(idx), expected); + for (int column = 0; column < 3; ++column) { + QModelIndex idx = model.index(r, column, p); + QModelIndex expected = model.index(r - 1, column, p); + QCOMPARE(view.indexAbove(idx), expected); + } } // hide even rows for (int r = 0; r < rows; r+=2) view.setRowHidden(r, p, true); for (int r = rows - 1; r > 0; r-=2) { - QModelIndex idx = model.index(r, 0, p); - QModelIndex expected = model.index(r - 2, 0, p); - QCOMPARE(view.indexAbove(idx), expected); + for (int column = 0; column < 3; ++column) { + QModelIndex idx = model.index(r, column, p); + QModelIndex expected = model.index(r - 2, column, p); + QCOMPARE(view.indexAbove(idx), expected); + } } // for (int r = 0; r < rows; ++r) // parents.push(model.index(r, 0, p)); @@ -1889,21 +1893,39 @@ void tst_QTreeView::indexAbove() void tst_QTreeView::indexBelow() { - QtTestModel model(2, 1); + QtTestModel model(2, 2); QTreeView view; view.setModel(&model); view.show(); - QModelIndex i = model.index(0, 0, view.rootIndex()); - QVERIFY(i.isValid()); - QCOMPARE(i.row(), 0); + { + QModelIndex i = model.index(0, 0, view.rootIndex()); + QVERIFY(i.isValid()); + QCOMPARE(i.row(), 0); + QCOMPARE(i.column(), 0); + + i = view.indexBelow(i); + QVERIFY(i.isValid()); + QCOMPARE(i.row(), 1); + QCOMPARE(i.column(), 0); + i = view.indexBelow(i); + QVERIFY(!i.isValid()); + } - i = view.indexBelow(i); - QVERIFY(i.isValid()); - QCOMPARE(i.row(), 1); - i = view.indexBelow(i); - QVERIFY(!i.isValid()); + { + QModelIndex i = model.index(0, 1, view.rootIndex()); + QVERIFY(i.isValid()); + QCOMPARE(i.row(), 0); + QCOMPARE(i.column(), 1); + + i = view.indexBelow(i); + QVERIFY(i.isValid()); + QCOMPARE(i.row(), 1); + QCOMPARE(i.column(), 1); + i = view.indexBelow(i); + QVERIFY(!i.isValid()); + } } void tst_QTreeView::clicked() |