diff options
| author | Peter Penz <[email protected]> | 2011-08-24 22:36:05 +0200 |
|---|---|---|
| committer | Peter Penz <[email protected]> | 2011-08-24 22:37:16 +0200 |
| commit | cae90c168ebf8e81f5bb8569f6a4d15156923196 (patch) | |
| tree | e374bcb829b5e0b3353402861f42b3884e1915d6 /src/tests | |
| parent | bf20b404c820f00b6d75f0ad123b93cb45eb7487 (diff) | |
Fix issues with the anchor selection
Don't change the selection if the anchor is invalid. This fixes
the issue that items might get selected during changing a directory.
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/kitemlistselectionmanagertest.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp index 5a3ffd55c..0e09a5dde 100644 --- a/src/tests/kitemlistselectionmanagertest.cpp +++ b/src/tests/kitemlistselectionmanagertest.cpp @@ -98,9 +98,6 @@ void KItemListSelectionManagerTest::testCurrentItemAnchorItem() QSignalSpy spyCurrent(m_selectionManager, SIGNAL(currentChanged(int,int))); QSignalSpy spyAnchor(m_selectionManager, SIGNAL(anchorChanged(int,int))); - m_selectionManager->setAnchoredSelectionActive(true); - QVERIFY(m_selectionManager->isAnchoredSelectionActive()); - // Set current item and check that the selection manager emits the currentChanged(int,int) signal correctly. m_selectionManager->setCurrentItem(4); QCOMPARE(m_selectionManager->currentItem(), 4); @@ -109,7 +106,8 @@ void KItemListSelectionManagerTest::testCurrentItemAnchorItem() spyCurrent.takeFirst(); // Set anchor item and check that the selection manager emits the anchorChanged(int,int) signal correctly. - m_selectionManager->setAnchorItem(3); + m_selectionManager->beginAnchoredSelection(3); + QVERIFY(m_selectionManager->isAnchoredSelectionActive()); QCOMPARE(m_selectionManager->anchorItem(), 3); QCOMPARE(spyAnchor.count(), 1); QCOMPARE(qvariant_cast<int>(spyAnchor.at(0).at(0)), 3); @@ -183,6 +181,9 @@ void KItemListSelectionManagerTest::testCurrentItemAnchorItem() m_selectionManager->clearSelection(); QCOMPARE(m_selectionManager->selectedItems(), QSet<int>()); QVERIFY(!m_selectionManager->hasSelection()); + + m_selectionManager->endAnchoredSelection(); + QVERIFY(!m_selectionManager->isAnchoredSelectionActive()); } void KItemListSelectionManagerTest::testSetSelected_data() @@ -339,7 +340,7 @@ void KItemListSelectionManagerTest::testChangeSelection_data() << 2 << 3 << (QSet<int>() << 2 << 3 << 5 << 6) << NoChange << KItemRangeList() - << (QSet<int>() << 2 << 3 << 5 << 6); + << (QSet<int>() << 2 << 3 << 5 << 6); QTest::newRow("Insert Items") << (QSet<int>() << 5 << 6) |