From 9b83d15be44d698c26b55bf8cbc126321f5a4e9b Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Thu, 11 Aug 2011 14:20:12 +0200 Subject: [PATCH] Test signal emission on selection changes This commit adds a unit test that changes the selection in various ways, verifies the result and checks that the selection manager's selectionChanged signal has been emitted correctly. The test is data-driven, so I hope that most further testing needs can be fulfilled by adding new test data. Moreover, I changed selectedItems() such that the anchored selection is only taken into account if anchor and current item are different. The reason is that in some situation the anchor should not be selected initially (i.e., if an already selected item is Control-clicked). If the anchor should be selected from the beginning, it must be selected manually. --- src/kitemviews/kitemlistselectionmanager.cpp | 4 +- src/tests/kitemlistselectionmanagertest.cpp | 135 +++++++++++++++++++ 2 files changed, 137 insertions(+), 2 deletions(-) diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp index cfe847b69..e0ec4060c 100644 --- a/src/kitemviews/kitemlistselectionmanager.cpp +++ b/src/kitemviews/kitemlistselectionmanager.cpp @@ -81,7 +81,7 @@ QSet KItemListSelectionManager::selectedItems() const { QSet selectedItems = m_selectedItems; - if (m_isAnchoredSelectionActive) { + if (m_isAnchoredSelectionActive && (m_anchorItem != m_currentItem)) { const int from = qMin(m_anchorItem, m_currentItem); const int to = qMax(m_anchorItem, m_currentItem); @@ -95,7 +95,7 @@ QSet KItemListSelectionManager::selectedItems() const bool KItemListSelectionManager::hasSelection() const { - return !m_selectedItems.isEmpty() || m_isAnchoredSelectionActive; + return !m_selectedItems.isEmpty() || (m_isAnchoredSelectionActive && (m_anchorItem != m_currentItem)); } void KItemListSelectionManager::setSelected(int index, int count, SelectionMode mode) diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp index a79b9e6f3..3174a8b4d 100644 --- a/src/tests/kitemlistselectionmanagertest.cpp +++ b/src/tests/kitemlistselectionmanagertest.cpp @@ -65,6 +65,8 @@ private slots: void testItemsInserted(); void testItemsRemoved(); void testAnchoredSelection(); + void testChangeSelection_data(); + void testChangeSelection(); private: KItemListSelectionManager* m_selectionManager; @@ -308,6 +310,139 @@ void KItemListSelectionManagerTest::testAnchoredSelection() QCOMPARE(m_selectionManager->selectedItems(), QSet() << 5 << 6 << 7 << 9 << 10); } +namespace { + enum ModelChangeType { + NoChange, + InsertItems, + RemoveItems + }; +} + +Q_DECLARE_METATYPE(QSet); +Q_DECLARE_METATYPE(ModelChangeType); +Q_DECLARE_METATYPE(KItemRangeList); + +void KItemListSelectionManagerTest::testChangeSelection_data() +{ + QTest::addColumn >("initialSelection"); + QTest::addColumn("anchor"); + QTest::addColumn("current"); + QTest::addColumn >("expectedSelection"); + QTest::addColumn("changeType"); + QTest::addColumn("changedItems"); + QTest::addColumn >("finalSelection"); + + QTest::newRow("No change") + << (QSet() << 5 << 6) + << 2 << 3 + << (QSet() << 2 << 3 << 5 << 6) + << NoChange << KItemRangeList() + << (QSet() << 2 << 3 << 5 << 6); + + QTest::newRow("Insert Items") + << (QSet() << 5 << 6) + << 2 << 3 + << (QSet() << 2 << 3 << 5 << 6) + << InsertItems << (KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 2) << KItemRange(10, 5)) + << (QSet() << 3 << 4 << 8 << 9); + + QTest::newRow("Remove Items") + << (QSet() << 5 << 6) + << 2 << 3 + << (QSet() << 2 << 3 << 5 << 6) + << RemoveItems << (KItemRangeList() << KItemRange(1, 1) << KItemRange(3, 1) << KItemRange(10, 5)) + << (QSet() << 1 << 2 << 3 << 4); +} + +void KItemListSelectionManagerTest::testChangeSelection() +{ + QFETCH(QSet, initialSelection); + QFETCH(int, anchor); + QFETCH(int, current); + QFETCH(QSet , expectedSelection); + QFETCH(ModelChangeType, changeType); + QFETCH(KItemRangeList, changedItems); + QFETCH(QSet , finalSelection); + + QSignalSpy spySelectionChanged(m_selectionManager, SIGNAL(selectionChanged(QSet,QSet))); + + // Initial selection should be empty + QVERIFY(!m_selectionManager->hasSelection()); + QVERIFY(m_selectionManager->selectedItems().isEmpty()); + + // Perform the initial selectiion + m_selectionManager->setSelectedItems(initialSelection); + QCOMPARE(m_selectionManager->selectedItems(), initialSelection); + if (initialSelection.isEmpty()) { + QVERIFY(!m_selectionManager->hasSelection()); + QCOMPARE(spySelectionChanged.count(), 0); + } + else { + QVERIFY(m_selectionManager->hasSelection()); + QCOMPARE(spySelectionChanged.count(), 1); + QList arguments = spySelectionChanged.takeFirst(); + QCOMPARE(qvariant_cast >(arguments.at(0)), initialSelection); + QCOMPARE(qvariant_cast >(arguments.at(1)), QSet()); + } + + // Perform an anchored selection. + // Note that current and anchor index are equal first because this is the case in typical uses of the + // selection manager, and because this makes it easier to test the correctness of the signal's arguments. + m_selectionManager->setCurrentItem(anchor); + m_selectionManager->beginAnchoredSelection(anchor); + m_selectionManager->setCurrentItem(current); + QCOMPARE(m_selectionManager->selectedItems(), expectedSelection); + QCOMPARE(m_selectionManager->hasSelection(), !expectedSelection.isEmpty()); + if (expectedSelection == initialSelection) { + QCOMPARE(spySelectionChanged.count(), 0); + } + else { + QCOMPARE(spySelectionChanged.count(), 1); + QList arguments = spySelectionChanged.takeFirst(); + QCOMPARE(qvariant_cast >(arguments.at(0)), expectedSelection); + QCOMPARE(qvariant_cast >(arguments.at(1)), initialSelection); + } + + // Change the model by inserting or removing items. + switch (changeType) { + case InsertItems: + m_selectionManager->itemsInserted(changedItems); + break; + case RemoveItems: + m_selectionManager->itemsRemoved(changedItems); + break; + case NoChange: + break; + } + + QCOMPARE(m_selectionManager->selectedItems(), finalSelection); + QCOMPARE(m_selectionManager->hasSelection(), !finalSelection.isEmpty()); + if (finalSelection == expectedSelection) { + QCOMPARE(spySelectionChanged.count(), 0); + } + else { + QCOMPARE(spySelectionChanged.count(), 1); + QList arguments = spySelectionChanged.takeFirst(); + QCOMPARE(qvariant_cast >(arguments.at(0)), finalSelection); + QCOMPARE(qvariant_cast >(arguments.at(1)), expectedSelection); + } + + // Finally, clear the selection + m_selectionManager->clearSelection(); + QCOMPARE(m_selectionManager->selectedItems(), QSet()); + QVERIFY(!m_selectionManager->hasSelection()); + if (finalSelection.isEmpty()) { + // Selection has been empty already + QCOMPARE(spySelectionChanged.count(), 0); + } + else { + QCOMPARE(spySelectionChanged.count(), 1); + QList arguments = spySelectionChanged.takeFirst(); + QCOMPARE(qvariant_cast >(arguments.at(0)), QSet()); + QCOMPARE(qvariant_cast >(arguments.at(1)), finalSelection); + } +} + QTEST_KDEMAIN(KItemListSelectionManagerTest, NoGUI) #include "kitemlistselectionmanagertest.moc" -- 2.47.3