Merge branch 'Applications/16.04'

[dolphin.git] / src / tests / kitemlistselectionmanagertest.cpp

diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp
index af2610d8c2248e172546c82bddfe1d2a931070f1..b183de3026924578cecd11fa9e45f596edaf6e34 100644 (file)
--- a/src/tests/kitemlistselectionmanagertest.cpp
+++ b/src/tests/kitemlistselectionmanagertest.cpp
@@ -18,11 +18,12 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include <qtest_kde.h>
-
 #include "kitemviews/kitemmodelbase.h"
 #include "kitemviews/kitemlistselectionmanager.h"
 
+#include <QTest>
+#include <QSignalSpy>
+
 class DummyModel : public KItemModelBase
 {
 public:
@@ -78,6 +79,7 @@ private slots:
     void testChangeSelection();
     void testDeleteCurrentItem_data();
     void testDeleteCurrentItem();
+    void testAnchoredSelectionAfterMovingItems();
 
 private:
     void verifySelectionChange(QSignalSpy& spy, const KItemSet& currentSelection, const KItemSet& previousSelection) const;
@@ -320,12 +322,12 @@ namespace {
     };
 }
 
-Q_DECLARE_METATYPE(KItemSet);
-Q_DECLARE_METATYPE(ChangeType);
-Q_DECLARE_METATYPE(KItemRange);
-Q_DECLARE_METATYPE(KItemRangeList);
-Q_DECLARE_METATYPE(KItemListSelectionManager::SelectionMode);
-Q_DECLARE_METATYPE(QList<int>);
+Q_DECLARE_METATYPE(KItemSet)
+Q_DECLARE_METATYPE(ChangeType)
+Q_DECLARE_METATYPE(KItemRange)
+Q_DECLARE_METATYPE(KItemRangeList)
+Q_DECLARE_METATYPE(KItemListSelectionManager::SelectionMode)
+Q_DECLARE_METATYPE(QList<int>)
 
 /**
  * The following function provides a generic way to test the selection functionality.
@@ -368,7 +370,7 @@ void KItemListSelectionManagerTest::testChangeSelection_data()
         << 2 << 3
         << (KItemSet() << 2 << 3 << 5 << 6)
         << NoChange
-        << QList<QVariant>()
+        << QList<QVariant>{}
         << (KItemSet() << 2 << 3 << 5 << 6);
 
     QTest::newRow("Insert Items")
@@ -376,7 +378,7 @@ void KItemListSelectionManagerTest::testChangeSelection_data()
         << 2 << 3
         << (KItemSet() << 2 << 3 << 5 << 6)
         << InsertItems
-        << (QList<QVariant>() << QVariant::fromValue(KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 2) << KItemRange(10, 5)))
+        << QList<QVariant>{QVariant::fromValue(KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 2) << KItemRange(10, 5))}
         << (KItemSet() << 3 << 4 << 8 << 9);
 
     QTest::newRow("Remove Items")
@@ -384,7 +386,7 @@ void KItemListSelectionManagerTest::testChangeSelection_data()
         << 2 << 3
         << (KItemSet() << 2 << 3 << 5 << 6)
         << RemoveItems
-        << (QList<QVariant>() << QVariant::fromValue(KItemRangeList() << KItemRange(1, 1) << KItemRange(3, 1) << KItemRange(10, 5)))
+        << QList<QVariant>{QVariant::fromValue(KItemRangeList() << KItemRange(1, 1) << KItemRange(3, 1) << KItemRange(10, 5))}
         << (KItemSet() << 1 << 2 << 3 << 4);
 
     QTest::newRow("Empty Anchored Selection")
@@ -392,7 +394,7 @@ void KItemListSelectionManagerTest::testChangeSelection_data()
         << 2 << 2
         << KItemSet()
         << EndAnchoredSelection
-        << QList<QVariant>()
+        << QList<QVariant>{}
         << KItemSet();
 
     QTest::newRow("Toggle selection")
@@ -400,7 +402,7 @@ void KItemListSelectionManagerTest::testChangeSelection_data()
         << 6 << 8
         << (KItemSet() << 1 << 3 << 4 << 6 << 7 << 8)
         << SetSelected
-        << (QList<QVariant>() << 0 << 10 << QVariant::fromValue(KItemListSelectionManager::Toggle))
+        << QList<QVariant>{0, 10, QVariant::fromValue(KItemListSelectionManager::Toggle)}
         << (KItemSet() << 0 << 2 << 5 << 9);
 
     // Swap items 2, 3 and 4, 5
@@ -409,8 +411,17 @@ void KItemListSelectionManagerTest::testChangeSelection_data()
         << -1 << -1
         << (KItemSet() << 0 << 1 << 2 << 3)
         << MoveItems
-        << (QList<QVariant>() << QVariant::fromValue(KItemRange(2, 4))
-                              << QVariant::fromValue(QList<int>() << 4 << 5 << 2 << 3))
+        << QList<QVariant>{QVariant::fromValue(KItemRange(2, 4)),
+                           QVariant::fromValue(QList<int>{4, 5, 2, 3})}
+        << (KItemSet() << 0 << 1 << 4 << 5);
+
+    QTest::newRow("Move items with active anchored selection")
+        << KItemSet()
+        << 0 << 3
+        << (KItemSet() << 0 << 1 << 2 << 3)
+        << MoveItems
+        << QList<QVariant>{QVariant::fromValue(KItemRange(2, 4)),
+                           QVariant::fromValue(QList<int>{4, 5, 2, 3})}
         << (KItemSet() << 0 << 1 << 4 << 5);
 
     // Revert sort order
@@ -419,8 +430,8 @@ void KItemListSelectionManagerTest::testChangeSelection_data()
         << 3 << 4
         << (KItemSet() << 0 << 1 << 3 << 4)
         << MoveItems
-        << (QList<QVariant>() << QVariant::fromValue(KItemRange(0, 10))
-                              << QVariant::fromValue(QList<int>() << 9 << 8 << 7 << 6 << 5 << 4 << 3 << 2 << 1 << 0))
+        << QList<QVariant>{QVariant::fromValue(KItemRange(0, 10)),
+                           QVariant::fromValue(QList<int>{9, 8, 7, 6, 5, 4, 3, 2, 1, 0})}
         << (KItemSet() << 5 << 6 << 8 << 9);
 }
 
@@ -466,7 +477,7 @@ void KItemListSelectionManagerTest::testChangeSelection()
         break;
     case MoveItems:
         m_selectionManager->itemsMoved(data.at(0).value<KItemRange>(),
-                                       data.at(1).value<QList<int> >());
+                                       data.at(1).value<QList<int>>());
         break;
     case EndAnchoredSelection:
         m_selectionManager->endAnchoredSelection();
@@ -519,6 +530,22 @@ void KItemListSelectionManagerTest::testDeleteCurrentItem()
     QCOMPARE(m_selectionManager->currentItem(), newCurrentItemIndex);
 }
 
+void KItemListSelectionManagerTest::testAnchoredSelectionAfterMovingItems()
+{
+    m_selectionManager->setCurrentItem(4);
+    m_selectionManager->beginAnchoredSelection(4);
+
+    // Reverse the items between 0 and 5.
+    m_selectionManager->itemsMoved(KItemRange(0, 6), {5, 4, 3, 2, 1, 0});
+
+    QCOMPARE(m_selectionManager->currentItem(), 1);
+    QCOMPARE(m_selectionManager->m_anchorItem, 1);
+
+    // Make 2 the current item -> 1 and 2 should be selected.
+    m_selectionManager->setCurrentItem(2);
+    QCOMPARE(m_selectionManager->selectedItems(), KItemSet() << 1 << 2);
+}
+
 void KItemListSelectionManagerTest::verifySelectionChange(QSignalSpy& spy,
                                                           const KItemSet& currentSelection,
                                                           const KItemSet& previousSelection) const
@@ -545,6 +572,6 @@ void KItemListSelectionManagerTest::verifySelectionChange(QSignalSpy& spy,
     }
 }
 
-QTEST_KDEMAIN(KItemListSelectionManagerTest, NoGUI)
+QTEST_GUILESS_MAIN(KItemListSelectionManagerTest)
 
 #include "kitemlistselectionmanagertest.moc"