From 999196e3369417969d4a561710d68c8bb1786c47 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 10 Nov 2011 20:34:46 +0100 Subject: Add API to clear the current index. Symmetric with clearing selection. Change-Id: I08070f4fdf26898d5b6edd5259f011f9b3c75512 Reviewed-by: Olivier Goffart --- .../tst_qitemselectionmodel.cpp | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'tests/auto/widgets/itemviews') diff --git a/tests/auto/widgets/itemviews/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/widgets/itemviews/qitemselectionmodel/tst_qitemselectionmodel.cpp index 19386d342c..6f805a04d2 100644 --- a/tests/auto/widgets/itemviews/qitemselectionmodel/tst_qitemselectionmodel.cpp +++ b/tests/auto/widgets/itemviews/qitemselectionmodel/tst_qitemselectionmodel.cpp @@ -103,6 +103,7 @@ private slots: void testValidRangesInSelectionsAfterReset(); void testChainedSelectionClear(); + void testClearCurrentIndex(); private: QAbstractItemModel *model; @@ -2681,6 +2682,12 @@ public: m_target->setCurrentIndex(index, command); } + void clearCurrentIndex() + { + QItemSelectionModel::clearCurrentIndex(); + m_target->clearCurrentIndex(); + } + private: QItemSelectionModel *m_target; @@ -2717,6 +2724,31 @@ void tst_QItemSelectionModel::testChainedSelectionClear() duplicate.setCurrentIndex(model.index(0, 0), QItemSelectionModel::NoUpdate); QVERIFY(selectionModel.currentIndex() == duplicate.currentIndex()); + + duplicate.clearCurrentIndex(); + + QVERIFY(!duplicate.currentIndex().isValid()); + QVERIFY(selectionModel.currentIndex() == duplicate.currentIndex()); +} + +void tst_QItemSelectionModel::testClearCurrentIndex() +{ + QStringListModel model(QStringList() << "Apples" << "Pears"); + + QItemSelectionModel selectionModel(&model, 0); + + QSignalSpy currentIndexSpy(&selectionModel, SIGNAL(currentChanged(QModelIndex,QModelIndex))); + + QModelIndex firstIndex = model.index(0, 0); + QVERIFY(firstIndex.isValid()); + selectionModel.setCurrentIndex(firstIndex, QItemSelectionModel::NoUpdate); + QVERIFY(selectionModel.currentIndex() == firstIndex); + QVERIFY(currentIndexSpy.size() == 1); + + selectionModel.clearCurrentIndex(); + + QVERIFY(selectionModel.currentIndex() == QModelIndex()); + QVERIFY(currentIndexSpy.size() == 2); } QTEST_MAIN(tst_QItemSelectionModel) -- cgit v1.2.3