From 58ab93541c70de4fa7cbb90dc3423cfec556dc38 Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Sat, 13 Aug 2011 11:40:17 +0200 Subject: Implement selection of items using mouse clicks. --- src/tests/kitemlistselectionmanagertest.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'src/tests') diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp index 3174a8b4d..7f79332a3 100644 --- a/src/tests/kitemlistselectionmanagertest.cpp +++ b/src/tests/kitemlistselectionmanagertest.cpp @@ -311,15 +311,16 @@ void KItemListSelectionManagerTest::testAnchoredSelection() } namespace { - enum ModelChangeType { + enum ChangeType { NoChange, InsertItems, - RemoveItems + RemoveItems, + EndAnchoredSelection }; } Q_DECLARE_METATYPE(QSet); -Q_DECLARE_METATYPE(ModelChangeType); +Q_DECLARE_METATYPE(ChangeType); Q_DECLARE_METATYPE(KItemRangeList); void KItemListSelectionManagerTest::testChangeSelection_data() @@ -328,7 +329,7 @@ void KItemListSelectionManagerTest::testChangeSelection_data() QTest::addColumn("anchor"); QTest::addColumn("current"); QTest::addColumn >("expectedSelection"); - QTest::addColumn("changeType"); + QTest::addColumn("changeType"); QTest::addColumn("changedItems"); QTest::addColumn >("finalSelection"); @@ -352,6 +353,13 @@ void KItemListSelectionManagerTest::testChangeSelection_data() << (QSet() << 2 << 3 << 5 << 6) << RemoveItems << (KItemRangeList() << KItemRange(1, 1) << KItemRange(3, 1) << KItemRange(10, 5)) << (QSet() << 1 << 2 << 3 << 4); + + QTest::newRow("Empty Anchored Selection") + << QSet() + << 2 << 2 + << QSet() + << EndAnchoredSelection << KItemRangeList() + << QSet(); } void KItemListSelectionManagerTest::testChangeSelection() @@ -360,7 +368,7 @@ void KItemListSelectionManagerTest::testChangeSelection() QFETCH(int, anchor); QFETCH(int, current); QFETCH(QSet , expectedSelection); - QFETCH(ModelChangeType, changeType); + QFETCH(ChangeType, changeType); QFETCH(KItemRangeList, changedItems); QFETCH(QSet , finalSelection); @@ -411,6 +419,10 @@ void KItemListSelectionManagerTest::testChangeSelection() case RemoveItems: m_selectionManager->itemsRemoved(changedItems); break; + case EndAnchoredSelection: + m_selectionManager->endAnchoredSelection(); + QVERIFY(!m_selectionManager->isAnchoredSelectionActive()); + break; case NoChange: break; } -- cgit v1.3