From ea765ba5737074dcffc67be20d33a7f01890dd7f Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Fri, 26 Aug 2011 18:39:32 +0200 Subject: Simplify KItemListSelectionManager 1. The anchorChanged() signal is not needed. 2. The only place where setAnchorItem() is called is in beginAnchoredSelection() -> merge both functions. --- src/tests/kitemlistselectionmanagertest.cpp | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'src/tests') diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp index 0e09a5dde..0602d2798 100644 --- a/src/tests/kitemlistselectionmanagertest.cpp +++ b/src/tests/kitemlistselectionmanagertest.cpp @@ -96,7 +96,6 @@ void KItemListSelectionManagerTest::testConstructor() void KItemListSelectionManagerTest::testCurrentItemAnchorItem() { QSignalSpy spyCurrent(m_selectionManager, SIGNAL(currentChanged(int,int))); - QSignalSpy spyAnchor(m_selectionManager, SIGNAL(anchorChanged(int,int))); // Set current item and check that the selection manager emits the currentChanged(int,int) signal correctly. m_selectionManager->setCurrentItem(4); @@ -105,20 +104,10 @@ void KItemListSelectionManagerTest::testCurrentItemAnchorItem() QCOMPARE(qvariant_cast(spyCurrent.at(0).at(0)), 4); spyCurrent.takeFirst(); - // Set anchor item and check that the selection manager emits the anchorChanged(int,int) signal correctly. - m_selectionManager->beginAnchoredSelection(3); + // Begin an anchored selection. + m_selectionManager->beginAnchoredSelection(5); QVERIFY(m_selectionManager->isAnchoredSelectionActive()); - QCOMPARE(m_selectionManager->anchorItem(), 3); - QCOMPARE(spyAnchor.count(), 1); - QCOMPARE(qvariant_cast(spyAnchor.at(0).at(0)), 3); - spyAnchor.takeFirst(); - - m_selectionManager->setAnchorItem(5); QCOMPARE(m_selectionManager->anchorItem(), 5); - QCOMPARE(spyAnchor.count(), 1); - QCOMPARE(qvariant_cast(spyAnchor.at(0).at(0)), 5); - QCOMPARE(qvariant_cast(spyAnchor.at(0).at(1)), 3); - spyAnchor.takeFirst(); // Items between current and anchor should be selected now QCOMPARE(m_selectionManager->selectedItems(), QSet() << 4 << 5); @@ -148,10 +137,6 @@ void KItemListSelectionManagerTest::testCurrentItemAnchorItem() spyCurrent.takeFirst(); QCOMPARE(m_selectionManager->anchorItem(), 8); - QCOMPARE(spyAnchor.count(), 1); - QCOMPARE(qvariant_cast(spyAnchor.at(0).at(0)), 8); - QCOMPARE(qvariant_cast(spyAnchor.at(0).at(1)), 5); - spyAnchor.takeFirst(); QCOMPARE(m_selectionManager->selectedItems(), QSet() << 5 << 6 << 7 << 8); QVERIFY(m_selectionManager->hasSelection()); @@ -169,10 +154,6 @@ void KItemListSelectionManagerTest::testCurrentItemAnchorItem() spyCurrent.takeFirst(); QCOMPARE(m_selectionManager->anchorItem(), 5); - QCOMPARE(spyAnchor.count(), 1); - QCOMPARE(qvariant_cast(spyAnchor.at(0).at(0)), 5); - QCOMPARE(qvariant_cast(spyAnchor.at(0).at(1)), 8); - spyAnchor.takeFirst(); QCOMPARE(m_selectionManager->selectedItems(), QSet() << 2 << 3 << 4 << 5); QVERIFY(m_selectionManager->hasSelection()); -- cgit v1.3