kitemlistcontrollertest: fix warnings

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

diff --git a/src/tests/kitemlistcontrollertest.cpp b/src/tests/kitemlistcontrollertest.cpp
index ac2110c0fcd49b76cde6c894a30d1515e0afadd5..4cb999f06f2aca02865e02c0544f06d1059d878b 100644 (file)
--- a/src/tests/kitemlistcontrollertest.cpp
+++ b/src/tests/kitemlistcontrollertest.cpp
@@ -109,6 +109,9 @@ void KItemListControllerTest::initTestCase()
     m_view = new KFileItemListView();
     m_controller = new KItemListController(m_model, m_view, this);
     m_container = new KItemListContainer(m_controller);
     m_view = new KFileItemListView();
     m_controller = new KItemListController(m_model, m_view, this);
     m_container = new KItemListContainer(m_controller);

+#ifndef QT_NO_ACCESSIBILITY
+    m_view->setAccessibleParentsObject(m_container);
+#endif

     m_controller = m_container->controller();
     m_controller->setSelectionBehavior(KItemListController::MultiSelection);
     m_selectionManager = m_controller->selectionManager();
     m_controller = m_container->controller();
     m_controller->setSelectionBehavior(KItemListController::MultiSelection);
     m_selectionManager = m_controller->selectionManager();


@@ -171,6 +174,7 @@ void KItemListControllerTest::init()
 
 void KItemListControllerTest::cleanup()
 {
 
 void KItemListControllerTest::cleanup()
 {

+    m_controller->setSelectionModeEnabled(false);

 }
 
 /**
 }
 
 /**


@@ -225,8 +229,11 @@ void KItemListControllerTest::testKeyboardNavigation_data()
     QTest::addColumn<KFileItemListView::ItemLayout>("layout");
     QTest::addColumn<Qt::Orientation>("scrollOrientation");
     QTest::addColumn<int>("columnCount");
     QTest::addColumn<KFileItemListView::ItemLayout>("layout");
     QTest::addColumn<Qt::Orientation>("scrollOrientation");
     QTest::addColumn<int>("columnCount");

-    QTest::addColumn<KItemListController::SelectionBehavior>("selectionBehavior");
+    QTest::addColumn<KItemListController::SelectionBehavior>("selectionBehavior"); // Defines how many items can be selected at the same time.

     QTest::addColumn<bool>("groupingEnabled");
     QTest::addColumn<bool>("groupingEnabled");

+    QTest::addColumn<Qt::LayoutDirection>("layoutDirection");
+    QTest::addColumn<bool>(
+        "selectionModeEnabled"); // Don't confuse this with "selectionBehaviour". This is about changing controls for users to help multi-selecting.

     QTest::addColumn<QList<QPair<KeyPress, ViewState>>>("testList");
 
     QList<KFileItemListView::ItemLayout> layoutList;
     QTest::addColumn<QList<QPair<KeyPress, ViewState>>>("testList");
 
     QList<KFileItemListView::ItemLayout> layoutList;


@@ -254,16 +261,26 @@ void KItemListControllerTest::testKeyboardNavigation_data()
     groupingEnabledList.append(true);
     groupingEnabledNames[true] = "grouping enabled";
 
     groupingEnabledList.append(true);
     groupingEnabledNames[true] = "grouping enabled";
 

+    QList<Qt::LayoutDirection> layoutDirectionList;
+    QHash<Qt::LayoutDirection, QString> layoutDirectionNames;
+    layoutDirectionList.append(Qt::LeftToRight);
+    layoutDirectionNames[Qt::LeftToRight] = "Left-to-Right LayoutDirection";
+    layoutDirectionList.append(Qt::RightToLeft);
+    layoutDirectionNames[Qt::RightToLeft] = "Right-to-Left LayoutDirection";
+
+    bool selectionModeEnabled = false; // For most tests this is kept disabled because it is not really affected by all the other test conditions.
+                                       // We only enable it for a few separate tests at the end.
+

     for (const KFileItemListView::ItemLayout &layout : layoutList) {
         // The following settings depend on the layout.
         // Note that 'columns' are actually 'rows' in
         // Compact layout.
         Qt::Orientation scrollOrientation;
         QList<int> columnCountList;
     for (const KFileItemListView::ItemLayout &layout : layoutList) {
         // The following settings depend on the layout.
         // Note that 'columns' are actually 'rows' in
         // Compact layout.
         Qt::Orientation scrollOrientation;
         QList<int> columnCountList;

-        Qt::Key nextItemKey;
-        Qt::Key previousItemKey;
-        Qt::Key nextRowKey;
-        Qt::Key previousRowKey;
+        Qt::Key nextItemKey = Qt::Key_Right;
+        Qt::Key previousItemKey = Qt::Key_Right;
+        Qt::Key nextRowKey = Qt::Key_Right;
+        Qt::Key previousRowKey = Qt::Key_Right;

 
         switch (layout) {
         case KFileItemListView::IconsLayout:
 
         switch (layout) {
         case KFileItemListView::IconsLayout:


@@ -291,180 +308,274 @@ void KItemListControllerTest::testKeyboardNavigation_data()
             previousRowKey = Qt::Key_Up;
             break;
         }
             previousRowKey = Qt::Key_Up;
             break;
         }

+        for (auto layoutDirection : std::as_const(layoutDirectionList)) {
+            if (layoutDirection == Qt::RightToLeft) {
+                switch (layout) {
+                case KFileItemListView::IconsLayout:
+                    std::swap(nextItemKey, previousItemKey);
+                    break;
+                case KFileItemListView::CompactLayout:
+                    std::swap(nextRowKey, previousRowKey);
+                    break;
+                default:
+                    break;
+                }
+            }
+            for (int columnCount : std::as_const(columnCountList)) {
+                for (const KItemListController::SelectionBehavior &selectionBehavior : std::as_const(selectionBehaviorList)) {
+                    for (bool groupingEnabled : std::as_const(groupingEnabledList)) {
+                        QList<QPair<KeyPress, ViewState>> testList;

 
 

-        for (int columnCount : std::as_const(columnCountList)) {
-            for (const KItemListController::SelectionBehavior &selectionBehavior : std::as_const(selectionBehaviorList)) {
-                for (bool groupingEnabled : std::as_const(groupingEnabledList)) {
-                    QList<QPair<KeyPress, ViewState>> testList;
-
-                    // First, key presses which should have the same effect
-                    // for any layout and any number of columns.
-                    testList << qMakePair(KeyPress(nextItemKey), ViewState(1, KItemSet() << 1))
-                             << qMakePair(KeyPress(Qt::Key_Return), ViewState(1, KItemSet() << 1, true))
-                             << qMakePair(KeyPress(Qt::Key_Enter), ViewState(1, KItemSet() << 1, true))
-                             << qMakePair(KeyPress(nextItemKey), ViewState(2, KItemSet() << 2))
-                             << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(3, KItemSet() << 2 << 3))
-                             << qMakePair(KeyPress(Qt::Key_Return), ViewState(3, KItemSet() << 2 << 3, true))
-                             << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(2, KItemSet() << 2))
-                             << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(3, KItemSet() << 2 << 3))
-                             << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(4, KItemSet() << 2 << 3))
-                             << qMakePair(KeyPress(Qt::Key_Return), ViewState(4, KItemSet() << 2 << 3, true))
-                             << qMakePair(KeyPress(previousItemKey), ViewState(3, KItemSet() << 3))
-                             << qMakePair(KeyPress(Qt::Key_Home, Qt::ShiftModifier), ViewState(0, KItemSet() << 0 << 1 << 2 << 3))
-                             << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(1, KItemSet() << 0 << 1 << 2 << 3))
-                             << qMakePair(KeyPress(Qt::Key_Space, Qt::ControlModifier), ViewState(1, KItemSet() << 0 << 2 << 3))
-                             << qMakePair(KeyPress(Qt::Key_Space, Qt::ControlModifier), ViewState(1, KItemSet() << 0 << 1 << 2 << 3))
-                             << qMakePair(KeyPress(Qt::Key_End), ViewState(19, KItemSet() << 19))
-                             << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(18, KItemSet() << 18 << 19))
-                             << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, KItemSet() << 0))
-                             << qMakePair(KeyPress(Qt::Key_Space, Qt::ControlModifier), ViewState(0, KItemSet()))
-                             << qMakePair(KeyPress(Qt::Key_Enter), ViewState(0, KItemSet(), true))
-                             << qMakePair(KeyPress(Qt::Key_Space, Qt::ControlModifier), ViewState(0, KItemSet() << 0))
-                             << qMakePair(KeyPress(Qt::Key_Space, Qt::ControlModifier), ViewState(0, KItemSet()))
-                             << qMakePair(KeyPress(Qt::Key_Space), ViewState(0, KItemSet() << 0))
-                             << qMakePair(KeyPress(Qt::Key_E), ViewState(13, KItemSet() << 13))
-                             << qMakePair(KeyPress(Qt::Key_Space), ViewState(14, KItemSet() << 14))
-                             << qMakePair(KeyPress(Qt::Key_3), ViewState(15, KItemSet() << 15))
-                             << qMakePair(KeyPress(Qt::Key_Escape), ViewState(15, KItemSet()))
-                             << qMakePair(KeyPress(Qt::Key_E), ViewState(13, KItemSet() << 13))
-                             << qMakePair(KeyPress(Qt::Key_E), ViewState(14, KItemSet() << 14))
-                             << qMakePair(KeyPress(Qt::Key_E), ViewState(15, KItemSet() << 15))
-                             << qMakePair(KeyPress(Qt::Key_Escape), ViewState(15, KItemSet()))
-                             << qMakePair(KeyPress(Qt::Key_E), ViewState(13, KItemSet() << 13))
-                             << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, KItemSet() << 0))
-                             << qMakePair(KeyPress(Qt::Key_Escape), ViewState(0, KItemSet()));
-
-                    // Next, we test combinations of key presses which only work for a
-                    // particular number of columns and either enabled or disabled grouping.
-
-                    // One column.
-                    if (columnCount == 1) {
-                        testList << qMakePair(KeyPress(nextRowKey), ViewState(1, KItemSet() << 1))
-                                 << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(2, KItemSet() << 1 << 2))
-                                 << qMakePair(KeyPress(nextRowKey, Qt::ControlModifier), ViewState(3, KItemSet() << 1 << 2))
-                                 << qMakePair(KeyPress(previousRowKey), ViewState(2, KItemSet() << 2))
-                                 << qMakePair(KeyPress(previousItemKey), ViewState(1, KItemSet() << 1))
-                                 << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, KItemSet() << 0));
-                    }
-
-                    // Multiple columns: we test both 3 and 5 columns with grouping
-                    // enabled or disabled. For each case, the layout of the items
-                    // in the view is shown (both using file names and indices) to
-                    // make it easier to understand what the tests do.
-
-                    if (columnCount == 3 && !groupingEnabled) {
-                        // 3 columns, no grouping:
-                        //
-                        // a1 a2 a3 |  0  1  2
-                        // b1 c1 c2 |  3  4  5
-                        // c3 c4 c5 |  6  7  8
-                        // d1 d2 d3 |  9 10 11
-                        // d4 e1 e2 | 12 13 14
-                        // e3 e4 e5 | 15 16 17
-                        // e6 e7    | 18 19
-                        testList << qMakePair(KeyPress(nextRowKey), ViewState(3, KItemSet() << 3))
-                                 << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(4, KItemSet() << 3))
-                                 << qMakePair(KeyPress(nextRowKey), ViewState(7, KItemSet() << 7))
-                                 << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(8, KItemSet() << 7 << 8))
-                                 << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(9, KItemSet() << 7 << 8 << 9))
-                                 << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(8, KItemSet() << 7 << 8))
-                                 << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(7, KItemSet() << 7))
-                                 << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(6, KItemSet() << 6 << 7))
-                                 << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(5, KItemSet() << 5 << 6 << 7))
-                                 << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(6, KItemSet() << 6 << 7))
-                                 << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(7, KItemSet() << 7))
-                                 << qMakePair(KeyPress(nextRowKey), ViewState(10, KItemSet() << 10))
-                                 << qMakePair(KeyPress(nextItemKey), ViewState(11, KItemSet() << 11))
-                                 << qMakePair(KeyPress(nextRowKey), ViewState(14, KItemSet() << 14))
-                                 << qMakePair(KeyPress(nextRowKey), ViewState(17, KItemSet() << 17))
-                                 << qMakePair(KeyPress(nextRowKey), ViewState(19, KItemSet() << 19))
-                                 << qMakePair(KeyPress(previousRowKey), ViewState(17, KItemSet() << 17))
-                                 << qMakePair(KeyPress(Qt::Key_End), ViewState(19, KItemSet() << 19))
-                                 << qMakePair(KeyPress(previousRowKey), ViewState(16, KItemSet() << 16))
-                                 << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, KItemSet() << 0));
-                    }
-
-                    if (columnCount == 5 && !groupingEnabled) {
-                        // 5 columns, no grouping:
-                        //
-                        // a1 a2 a3 b1 c1 |  0  1  2  3  4
-                        // c2 c3 c4 c5 d1 |  5  6  7  8  9
-                        // d2 d3 d4 e1 e2 | 10 11 12 13 14
-                        // e3 e4 e5 e6 e7 | 15 16 17 18 19
-                        testList << qMakePair(KeyPress(nextRowKey), ViewState(5, KItemSet() << 5))
-                                 << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(6, KItemSet() << 5))
-                                 << qMakePair(KeyPress(nextRowKey), ViewState(11, KItemSet() << 11))
-                                 << qMakePair(KeyPress(nextItemKey), ViewState(12, KItemSet() << 12))
-                                 << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(17, KItemSet() << 12 << 13 << 14 << 15 << 16 << 17))
-                                 << qMakePair(KeyPress(previousRowKey, Qt::ShiftModifier), ViewState(12, KItemSet() << 12))
-                                 << qMakePair(KeyPress(previousRowKey, Qt::ShiftModifier), ViewState(7, KItemSet() << 7 << 8 << 9 << 10 << 11 << 12))
-                                 << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(12, KItemSet() << 12))
-                                 << qMakePair(KeyPress(Qt::Key_End, Qt::ControlModifier), ViewState(19, KItemSet() << 12))
-                                 << qMakePair(KeyPress(previousRowKey), ViewState(14, KItemSet() << 14))
-                                 << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, KItemSet() << 0));
-                    }
-
-                    if (columnCount == 3 && groupingEnabled) {
-                        // 3 columns, with grouping:
-                        //
-                        // a1 a2 a3 |  0  1  2
-                        // b1       |  3
-                        // c1 c2 c3 |  4  5  6
-                        // c4 c5    |  7  8
-                        // d1 d2 d3 |  9 10 11
-                        // d4       | 12
-                        // e1 e2 e3 | 13 14 15
-                        // e4 e5 e6 | 16 17 18
-                        // e7       | 19
+                        // First, key presses which should have the same effect
+                        // for any layout and any number of columns.

                         testList << qMakePair(KeyPress(nextItemKey), ViewState(1, KItemSet() << 1))
                         testList << qMakePair(KeyPress(nextItemKey), ViewState(1, KItemSet() << 1))

+                                 << qMakePair(KeyPress(Qt::Key_Return), ViewState(1, KItemSet() << 1, true))
+                                 << qMakePair(KeyPress(Qt::Key_Enter), ViewState(1, KItemSet() << 1, true))

                                  << qMakePair(KeyPress(nextItemKey), ViewState(2, KItemSet() << 2))
                                  << qMakePair(KeyPress(nextItemKey), ViewState(2, KItemSet() << 2))

-                                 << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(3, KItemSet() << 2 << 3))
-                                 << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(6, KItemSet() << 2 << 3 << 4 << 5 << 6))
-                                 << qMakePair(KeyPress(nextRowKey), ViewState(8, KItemSet() << 8))
-                                 << qMakePair(KeyPress(nextRowKey), ViewState(11, KItemSet() << 11))
-                                 << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(12, KItemSet() << 11))
-                                 << qMakePair(KeyPress(nextRowKey), ViewState(13, KItemSet() << 13))
-                                 << qMakePair(KeyPress(nextRowKey), ViewState(16, KItemSet() << 16))
-                                 << qMakePair(KeyPress(nextItemKey), ViewState(17, KItemSet() << 17))
-                                 << qMakePair(KeyPress(nextRowKey), ViewState(19, KItemSet() << 19))
-                                 << qMakePair(KeyPress(previousRowKey), ViewState(17, KItemSet() << 17))
-                                 << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, KItemSet() << 0));
-                    }
-
-                    if (columnCount == 5 && groupingEnabled) {
-                        // 5 columns, with grouping:
-                        //
-                        // a1 a2 a3       |  0  1  2
-                        // b1             |  3
-                        // c1 c2 c3 c4 c5 |  4  5  6  7  8
-                        // d1 d2 d3 d4    |  9 10 11 12
-                        // e1 e2 e3 e4 e5 | 13 14 15 16 17
-                        // e6 e7          | 18 19
-                        testList << qMakePair(KeyPress(nextItemKey), ViewState(1, KItemSet() << 1))
-                                 << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(3, KItemSet() << 1 << 2 << 3))
-                                 << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(5, KItemSet() << 1 << 2 << 3 << 4 << 5))
-                                 << qMakePair(KeyPress(nextItemKey), ViewState(6, KItemSet() << 6))
-                                 << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(7, KItemSet() << 6))
-                                 << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(8, KItemSet() << 6))
-                                 << qMakePair(KeyPress(nextRowKey), ViewState(12, KItemSet() << 12))
-                                 << qMakePair(KeyPress(nextRowKey), ViewState(17, KItemSet() << 17))
-                                 << qMakePair(KeyPress(nextRowKey), ViewState(19, KItemSet() << 19))
-                                 << qMakePair(KeyPress(previousRowKey), ViewState(17, KItemSet() << 17))
-                                 << qMakePair(KeyPress(Qt::Key_End, Qt::ShiftModifier), ViewState(19, KItemSet() << 17 << 18 << 19))
-                                 << qMakePair(KeyPress(previousRowKey, Qt::ShiftModifier), ViewState(14, KItemSet() << 14 << 15 << 16 << 17))
-                                 << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, KItemSet() << 0));
+                                 << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(3, KItemSet() << 2 << 3))
+                                 << qMakePair(KeyPress(Qt::Key_Return), ViewState(3, KItemSet() << 2 << 3, true))
+                                 << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(2, KItemSet() << 2))
+                                 << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(3, KItemSet() << 2 << 3))
+                                 << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(4, KItemSet() << 2 << 3))
+                                 << qMakePair(KeyPress(Qt::Key_Return), ViewState(4, KItemSet() << 2 << 3, true))
+                                 << qMakePair(KeyPress(previousItemKey), ViewState(3, KItemSet() << 3))
+                                 << qMakePair(KeyPress(Qt::Key_Home, Qt::ShiftModifier), ViewState(0, KItemSet() << 0 << 1 << 2 << 3))
+                                 << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(1, KItemSet() << 0 << 1 << 2 << 3))
+                                 << qMakePair(KeyPress(Qt::Key_Space, Qt::ControlModifier), ViewState(1, KItemSet() << 0 << 2 << 3))
+                                 << qMakePair(KeyPress(Qt::Key_Space, Qt::ControlModifier), ViewState(1, KItemSet() << 0 << 1 << 2 << 3))
+                                 << qMakePair(KeyPress(Qt::Key_End), ViewState(19, KItemSet() << 19))
+                                 << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(18, KItemSet() << 18 << 19))
+                                 << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, KItemSet() << 0))
+                                 << qMakePair(KeyPress(Qt::Key_Space, Qt::ControlModifier), ViewState(0, KItemSet()))
+                                 << qMakePair(KeyPress(Qt::Key_Enter), ViewState(0, KItemSet(), true))
+                                 << qMakePair(KeyPress(Qt::Key_Space, Qt::ControlModifier), ViewState(0, KItemSet() << 0))
+                                 << qMakePair(KeyPress(Qt::Key_Space, Qt::ControlModifier), ViewState(0, KItemSet()))
+                                 << qMakePair(KeyPress(Qt::Key_Space), ViewState(0, KItemSet() << 0))
+                                 << qMakePair(KeyPress(Qt::Key_E), ViewState(13, KItemSet() << 13))
+                                 << qMakePair(KeyPress(Qt::Key_Space), ViewState(14, KItemSet() << 14))
+                                 << qMakePair(KeyPress(Qt::Key_3), ViewState(15, KItemSet() << 15))
+                                 << qMakePair(KeyPress(Qt::Key_Escape), ViewState(15, KItemSet()))
+                                 << qMakePair(KeyPress(Qt::Key_E), ViewState(13, KItemSet() << 13))
+                                 << qMakePair(KeyPress(Qt::Key_E), ViewState(14, KItemSet() << 14))
+                                 << qMakePair(KeyPress(Qt::Key_E), ViewState(15, KItemSet() << 15))
+                                 << qMakePair(KeyPress(Qt::Key_Escape), ViewState(15, KItemSet()))
+                                 << qMakePair(KeyPress(Qt::Key_E), ViewState(13, KItemSet() << 13))
+                                 << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, KItemSet() << 0))
+                                 << qMakePair(KeyPress(Qt::Key_Escape), ViewState(0, KItemSet()));
+
+                        // Next, we test combinations of key presses which only work for a
+                        // particular number of columns and either enabled or disabled grouping.
+
+                        // One column.
+                        if (columnCount == 1) {
+                            testList << qMakePair(KeyPress(nextRowKey), ViewState(1, KItemSet() << 1))
+                                     << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(2, KItemSet() << 1 << 2))
+                                     << qMakePair(KeyPress(nextRowKey, Qt::ControlModifier), ViewState(3, KItemSet() << 1 << 2))
+                                     << qMakePair(KeyPress(previousRowKey), ViewState(2, KItemSet() << 2))
+                                     << qMakePair(KeyPress(previousItemKey), ViewState(1, KItemSet() << 1))
+                                     << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, KItemSet() << 0));
+                        }
+
+                        // Multiple columns: we test both 3 and 5 columns with grouping
+                        // enabled or disabled. For each case, the layout of the items
+                        // in the view is shown (both using file names and indices) to
+                        // make it easier to understand what the tests do.
+
+                        if (columnCount == 3 && !groupingEnabled) {
+                            // 3 columns, no grouping:
+                            //
+                            // a1 a2 a3 |  0  1  2
+                            // b1 c1 c2 |  3  4  5
+                            // c3 c4 c5 |  6  7  8
+                            // d1 d2 d3 |  9 10 11
+                            // d4 e1 e2 | 12 13 14
+                            // e3 e4 e5 | 15 16 17
+                            // e6 e7    | 18 19
+                            testList << qMakePair(KeyPress(nextRowKey), ViewState(3, KItemSet() << 3))
+                                     << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(4, KItemSet() << 3))
+                                     << qMakePair(KeyPress(nextRowKey), ViewState(7, KItemSet() << 7))
+                                     << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(8, KItemSet() << 7 << 8))
+                                     << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(9, KItemSet() << 7 << 8 << 9))
+                                     << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(8, KItemSet() << 7 << 8))
+                                     << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(7, KItemSet() << 7))
+                                     << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(6, KItemSet() << 6 << 7))
+                                     << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(5, KItemSet() << 5 << 6 << 7))
+                                     << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(6, KItemSet() << 6 << 7))
+                                     << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(7, KItemSet() << 7))
+                                     << qMakePair(KeyPress(nextRowKey), ViewState(10, KItemSet() << 10))
+                                     << qMakePair(KeyPress(nextItemKey), ViewState(11, KItemSet() << 11))
+                                     << qMakePair(KeyPress(nextRowKey), ViewState(14, KItemSet() << 14))
+                                     << qMakePair(KeyPress(nextRowKey), ViewState(17, KItemSet() << 17))
+                                     << qMakePair(KeyPress(nextRowKey), ViewState(19, KItemSet() << 19))
+                                     << qMakePair(KeyPress(previousRowKey), ViewState(17, KItemSet() << 17))
+                                     << qMakePair(KeyPress(Qt::Key_End), ViewState(19, KItemSet() << 19))
+                                     << qMakePair(KeyPress(previousRowKey), ViewState(16, KItemSet() << 16))
+                                     << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, KItemSet() << 0));
+                        }
+
+                        if (columnCount == 5 && !groupingEnabled) {
+                            // 5 columns, no grouping:
+                            //
+                            // a1 a2 a3 b1 c1 |  0  1  2  3  4
+                            // c2 c3 c4 c5 d1 |  5  6  7  8  9
+                            // d2 d3 d4 e1 e2 | 10 11 12 13 14
+                            // e3 e4 e5 e6 e7 | 15 16 17 18 19
+                            testList << qMakePair(KeyPress(nextRowKey), ViewState(5, KItemSet() << 5))
+                                     << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(6, KItemSet() << 5))
+                                     << qMakePair(KeyPress(nextRowKey), ViewState(11, KItemSet() << 11))
+                                     << qMakePair(KeyPress(nextItemKey), ViewState(12, KItemSet() << 12))
+                                     << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(17, KItemSet() << 12 << 13 << 14 << 15 << 16 << 17))
+                                     << qMakePair(KeyPress(previousRowKey, Qt::ShiftModifier), ViewState(12, KItemSet() << 12))
+                                     << qMakePair(KeyPress(previousRowKey, Qt::ShiftModifier), ViewState(7, KItemSet() << 7 << 8 << 9 << 10 << 11 << 12))
+                                     << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(12, KItemSet() << 12))
+                                     << qMakePair(KeyPress(Qt::Key_End, Qt::ControlModifier), ViewState(19, KItemSet() << 12))
+                                     << qMakePair(KeyPress(previousRowKey), ViewState(14, KItemSet() << 14))
+                                     << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, KItemSet() << 0));
+                        }
+
+                        if (columnCount == 3 && groupingEnabled) {
+                            // 3 columns, with grouping:
+                            //
+                            // a1 a2 a3 |  0  1  2
+                            // b1       |  3
+                            // c1 c2 c3 |  4  5  6
+                            // c4 c5    |  7  8
+                            // d1 d2 d3 |  9 10 11
+                            // d4       | 12
+                            // e1 e2 e3 | 13 14 15
+                            // e4 e5 e6 | 16 17 18
+                            // e7       | 19
+                            testList << qMakePair(KeyPress(nextItemKey), ViewState(1, KItemSet() << 1))
+                                     << qMakePair(KeyPress(nextItemKey), ViewState(2, KItemSet() << 2))
+                                     << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(3, KItemSet() << 2 << 3))
+                                     << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(6, KItemSet() << 2 << 3 << 4 << 5 << 6))
+                                     << qMakePair(KeyPress(nextRowKey), ViewState(8, KItemSet() << 8))
+                                     << qMakePair(KeyPress(nextRowKey), ViewState(11, KItemSet() << 11))
+                                     << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(12, KItemSet() << 11))
+                                     << qMakePair(KeyPress(nextRowKey), ViewState(13, KItemSet() << 13))
+                                     << qMakePair(KeyPress(nextRowKey), ViewState(16, KItemSet() << 16))
+                                     << qMakePair(KeyPress(nextItemKey), ViewState(17, KItemSet() << 17))
+                                     << qMakePair(KeyPress(nextRowKey), ViewState(19, KItemSet() << 19))
+                                     << qMakePair(KeyPress(previousRowKey), ViewState(17, KItemSet() << 17))
+                                     << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, KItemSet() << 0));
+                        }
+
+                        if (columnCount == 5 && groupingEnabled) {
+                            // 5 columns, with grouping:
+                            //
+                            // a1 a2 a3       |  0  1  2
+                            // b1             |  3
+                            // c1 c2 c3 c4 c5 |  4  5  6  7  8
+                            // d1 d2 d3 d4    |  9 10 11 12
+                            // e1 e2 e3 e4 e5 | 13 14 15 16 17
+                            // e6 e7          | 18 19
+                            testList << qMakePair(KeyPress(nextItemKey), ViewState(1, KItemSet() << 1))
+                                     << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(3, KItemSet() << 1 << 2 << 3))
+                                     << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(5, KItemSet() << 1 << 2 << 3 << 4 << 5))
+                                     << qMakePair(KeyPress(nextItemKey), ViewState(6, KItemSet() << 6))
+                                     << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(7, KItemSet() << 6))
+                                     << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(8, KItemSet() << 6))
+                                     << qMakePair(KeyPress(nextRowKey), ViewState(12, KItemSet() << 12))
+                                     << qMakePair(KeyPress(nextRowKey), ViewState(17, KItemSet() << 17))
+                                     << qMakePair(KeyPress(nextRowKey), ViewState(19, KItemSet() << 19))
+                                     << qMakePair(KeyPress(previousRowKey), ViewState(17, KItemSet() << 17))
+                                     << qMakePair(KeyPress(Qt::Key_End, Qt::ShiftModifier), ViewState(19, KItemSet() << 17 << 18 << 19))
+                                     << qMakePair(KeyPress(previousRowKey, Qt::ShiftModifier), ViewState(14, KItemSet() << 14 << 15 << 16 << 17))
+                                     << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, KItemSet() << 0));
+                        }
+
+                        const QString testName = layoutNames[layout] + ", " + QStringLiteral("%1 columns, ").arg(columnCount)
+                            + selectionBehaviorNames[selectionBehavior] + ", " + groupingEnabledNames[groupingEnabled] + ", "
+                            + layoutDirectionNames[layoutDirection];
+
+                        const QByteArray testNameAscii = testName.toLatin1();
+
+                        QTest::newRow(testNameAscii.data()) << layout << scrollOrientation << columnCount << selectionBehavior << groupingEnabled
+                                                            << layoutDirection << selectionModeEnabled << testList;

                     }
                     }

-
-                    const QString testName = layoutNames[layout] + ", " + QString("%1 columns, ").arg(columnCount) + selectionBehaviorNames[selectionBehavior]
-                        + ", " + groupingEnabledNames[groupingEnabled];
-
-                    const QByteArray testNameAscii = testName.toLatin1();
-
-                    QTest::newRow(testNameAscii.data()) << layout << scrollOrientation << columnCount << selectionBehavior << groupingEnabled << testList;

                 }
             }
         }
     }
                 }
             }
         }
     }

+
+    /**
+     * Selection mode tests
+     * We only test for the default icon view mode with typical scrollOrientation, selectionBehaviour, no grouping, left-to-right layoutDirection because none
+     * of this should affect selection mode and special-casing selection mode within the above test would make the above code even more complex than it already
+     * is.
+     */
+    selectionModeEnabled = true;
+    const KFileItemListView::ItemLayout layout = KFileItemListView::IconsLayout;
+    const Qt::Orientation scrollOrientation = Qt::Vertical;
+    const int columnCount = 3;
+    const Qt::Key nextItemKey = Qt::Key_Right;
+    const Qt::Key previousItemKey = Qt::Key_Left;
+    const Qt::Key nextRowKey = Qt::Key_Down;
+    const Qt::Key previousRowKey = Qt::Key_Up;
+
+    const Qt::LayoutDirection layoutDirection = Qt::LeftToRight;
+    const KItemListController::SelectionBehavior &selectionBehavior = KItemListController::MultiSelection;
+    const bool groupingEnabled = false;
+
+    QList<QPair<KeyPress, ViewState>> testList;
+
+    testList << qMakePair(KeyPress(nextItemKey), ViewState(1, KItemSet())) // In selection mode nothing is selected simply by moving with arrow keys.
+             << qMakePair(KeyPress(Qt::Key_Return), ViewState(1, KItemSet() << 1)) // Pressing Return toggles the selection but does not activate.
+             << qMakePair(KeyPress(Qt::Key_Enter), ViewState(1, KItemSet())) // Pressing Enter toggles the selection but does not activate.
+             << qMakePair(KeyPress(nextItemKey), ViewState(2, KItemSet()))
+             << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(3, KItemSet() << 2 << 3)) // Shift+Arrow key still selects in selection mode.
+             << qMakePair(KeyPress(Qt::Key_Return), ViewState(3, KItemSet() << 2))
+             << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(2, KItemSet() << 2 << 3))
+             << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(3, KItemSet() << 2)) // Shift+Left and then Shift+Right cancel each other out.
+             << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(4, KItemSet() << 2))
+             << qMakePair(KeyPress(Qt::Key_Return), ViewState(4, KItemSet() << 2 << 4))
+             << qMakePair(KeyPress(previousItemKey), ViewState(3, KItemSet() << 2 << 4))
+             << qMakePair(KeyPress(Qt::Key_Home, Qt::ShiftModifier), ViewState(0, KItemSet() << 0 << 1 << 2 << 3 << 4))
+             << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(1, KItemSet() << 0 << 1 << 2 << 3 << 4))
+             << qMakePair(KeyPress(Qt::Key_Space, Qt::ControlModifier), ViewState(1, KItemSet() << 0 << 2 << 3 << 4))
+             << qMakePair(KeyPress(Qt::Key_Space, Qt::ControlModifier), ViewState(1, KItemSet() << 0 << 1 << 2 << 3 << 4))
+             << qMakePair(KeyPress(Qt::Key_End), ViewState(19, KItemSet() << 0 << 1 << 2 << 3 << 4))
+             << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(18, KItemSet() << 0 << 1 << 2 << 3 << 4 << 18 << 19))
+             << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, KItemSet() << 0 << 1 << 2 << 3 << 4 << 18 << 19))
+             << qMakePair(KeyPress(Qt::Key_Space, Qt::ControlModifier), ViewState(0, KItemSet() << 1 << 2 << 3 << 4 << 18 << 19))
+             << qMakePair(KeyPress(Qt::Key_Enter), ViewState(0, KItemSet() << 0 << 1 << 2 << 3 << 4 << 18 << 19))
+             << qMakePair(KeyPress(Qt::Key_Space, Qt::ControlModifier), ViewState(0, KItemSet() << 1 << 2 << 3 << 4 << 18 << 19))
+             << qMakePair(KeyPress(Qt::Key_Space, Qt::ControlModifier), ViewState(0, KItemSet() << 0 << 1 << 2 << 3 << 4 << 18 << 19))
+             << qMakePair(KeyPress(Qt::Key_Space), ViewState(0, KItemSet() << 1 << 2 << 3 << 4 << 18 << 19)) // Space toggles selection in selection mode.
+             << qMakePair(KeyPress(Qt::Key_D), ViewState(9, KItemSet() << 1 << 2 << 3 << 4 << 18 << 19)) // No selection change by type-ahead.
+             << qMakePair(KeyPress(Qt::Key_Space), ViewState(9, KItemSet() << 1 << 2 << 3 << 4 << 9 << 18 << 19)) // Space is not added to type-ahead.
+             << qMakePair(KeyPress(Qt::Key_4), ViewState(12, KItemSet() << 1 << 2 << 3 << 4 << 9 << 18 << 19)) // No selection change by type-ahead.
+             << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, KItemSet() << 1 << 2 << 3 << 4 << 9 << 18 << 19))
+
+             // The following tests assume a columnCount of three and no grouping enabled.
+             << qMakePair(KeyPress(nextRowKey), ViewState(3, KItemSet() << 1 << 2 << 3 << 4 << 9 << 18 << 19))
+             << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(4, KItemSet() << 1 << 2 << 3 << 4 << 9 << 18 << 19))
+             << qMakePair(KeyPress(nextRowKey), ViewState(7, KItemSet() << 1 << 2 << 3 << 4 << 9 << 18 << 19))
+             << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(8, KItemSet() << 1 << 2 << 3 << 4 << 7 << 8 << 9 << 18 << 19))
+             << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(9, KItemSet() << 1 << 2 << 3 << 4 << 7 << 8 << 9 << 18 << 19))
+             << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(8, KItemSet() << 1 << 2 << 3 << 4 << 7 << 8 << 9 << 18 << 19))
+             << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(7, KItemSet() << 1 << 2 << 3 << 4 << 9 << 18 << 19))
+             << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(6, KItemSet() << 1 << 2 << 3 << 4 << 6 << 7 << 9 << 18 << 19))
+             << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(5, KItemSet() << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 9 << 18 << 19))
+             << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(6, KItemSet() << 1 << 2 << 3 << 4 << 6 << 7 << 9 << 18 << 19))
+             << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(7, KItemSet() << 1 << 2 << 3 << 4 << 9 << 18 << 19))
+             << qMakePair(KeyPress(nextRowKey), ViewState(10, KItemSet() << 1 << 2 << 3 << 4 << 9 << 18 << 19))
+             << qMakePair(KeyPress(nextItemKey), ViewState(11, KItemSet() << 1 << 2 << 3 << 4 << 9 << 18 << 19))
+             << qMakePair(KeyPress(nextRowKey), ViewState(14, KItemSet() << 1 << 2 << 3 << 4 << 9 << 18 << 19))
+             << qMakePair(KeyPress(nextRowKey), ViewState(17, KItemSet() << 1 << 2 << 3 << 4 << 9 << 18 << 19))
+             << qMakePair(KeyPress(nextRowKey), ViewState(19, KItemSet() << 1 << 2 << 3 << 4 << 9 << 18 << 19))
+             << qMakePair(KeyPress(previousRowKey), ViewState(17, KItemSet() << 1 << 2 << 3 << 4 << 9 << 18 << 19))
+             << qMakePair(KeyPress(Qt::Key_End), ViewState(19, KItemSet() << 1 << 2 << 3 << 4 << 9 << 18 << 19))
+             << qMakePair(KeyPress(previousRowKey), ViewState(16, KItemSet() << 1 << 2 << 3 << 4 << 9 << 18 << 19))
+             << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, KItemSet() << 1 << 2 << 3 << 4 << 9 << 18 << 19));
+
+    const QString testName = "Selection Mode: " + layoutNames[layout] + ", " + QStringLiteral("%1 columns, ").arg(columnCount)
+        + selectionBehaviorNames[selectionBehavior] + ", " + groupingEnabledNames[groupingEnabled] + ", " + layoutDirectionNames[layoutDirection];
+
+    const QByteArray testNameAscii = testName.toLatin1();
+
+    QTest::newRow(testNameAscii.data()) << layout << scrollOrientation << columnCount << selectionBehavior << groupingEnabled << layoutDirection
+                                        << selectionModeEnabled << testList;

 }
 
 /**
 }
 
 /**


@@ -481,8 +592,13 @@ void KItemListControllerTest::testKeyboardNavigation()
     QFETCH(int, columnCount);
     QFETCH(KItemListController::SelectionBehavior, selectionBehavior);
     QFETCH(bool, groupingEnabled);
     QFETCH(int, columnCount);
     QFETCH(KItemListController::SelectionBehavior, selectionBehavior);
     QFETCH(bool, groupingEnabled);

+    QFETCH(Qt::LayoutDirection, layoutDirection);
+    QFETCH(bool, selectionModeEnabled);

     QFETCH(QList<keyPressViewStatePair>, testList);
 
     QFETCH(QList<keyPressViewStatePair>, testList);
 

+    QApplication::setLayoutDirection(layoutDirection);
+    m_view->setLayoutDirection(layoutDirection);
+

     m_view->setItemLayout(layout);
     QCOMPARE(m_view->itemLayout(), layout);
 
     m_view->setItemLayout(layout);
     QCOMPARE(m_view->itemLayout(), layout);
 


@@ -495,13 +611,18 @@ void KItemListControllerTest::testKeyboardNavigation()
     m_model->setGroupedSorting(groupingEnabled);
     QCOMPARE(m_model->groupedSorting(), groupingEnabled);
 
     m_model->setGroupedSorting(groupingEnabled);
     QCOMPARE(m_model->groupedSorting(), groupingEnabled);
 

+    m_controller->setSelectionModeEnabled(selectionModeEnabled);
+    QCOMPARE(m_controller->selectionMode(), selectionModeEnabled);
+

     adjustGeometryForColumnCount(columnCount);
     QCOMPARE(m_view->m_layouter->m_columnCount, columnCount);
 
     QSignalSpy spySingleItemActivated(m_controller, &KItemListController::itemActivated);
     QSignalSpy spyMultipleItemsActivated(m_controller, &KItemListController::itemsActivated);
 
     adjustGeometryForColumnCount(columnCount);
     QCOMPARE(m_view->m_layouter->m_columnCount, columnCount);
 
     QSignalSpy spySingleItemActivated(m_controller, &KItemListController::itemActivated);
     QSignalSpy spyMultipleItemsActivated(m_controller, &KItemListController::itemsActivated);
 

+    int rowCount = 0;

     while (!testList.isEmpty()) {
     while (!testList.isEmpty()) {

+        ++rowCount;

         const QPair<KeyPress, ViewState> test = testList.takeFirst();
         const Qt::Key key = test.first.m_key;
         const Qt::KeyboardModifiers modifier = test.first.m_modifier;
         const QPair<KeyPress, ViewState> test = testList.takeFirst();
         const Qt::Key key = test.first.m_key;
         const Qt::KeyboardModifiers modifier = test.first.m_modifier;


@@ -511,7 +632,14 @@ void KItemListControllerTest::testKeyboardNavigation()
 
         QTest::keyClick(m_container, key, modifier);
 
 
         QTest::keyClick(m_container, key, modifier);
 

-        QCOMPARE(m_selectionManager->currentItem(), current);
+        QVERIFY2(
+            m_selectionManager->currentItem() == current,
+            qPrintable(QStringLiteral("currentItem() returns index %1 but %2 would be expected. Before this, key \"%3\" was pressed. This test case is defined "
+                                      "in row %4 of the testList from KItemListControllerTest::testKeyboardNavigation_data().")
+                           .arg(m_selectionManager->currentItem())
+                           .arg(current)
+                           .arg(QKeySequence(key).toString())
+                           .arg(rowCount)));

         switch (selectionBehavior) {
         case KItemListController::NoSelection:
             QVERIFY(m_selectionManager->selectedItems().isEmpty());
         switch (selectionBehavior) {
         case KItemListController::NoSelection:
             QVERIFY(m_selectionManager->selectedItems().isEmpty());


@@ -582,6 +710,41 @@ void KItemListControllerTest::testMouseClickActivation()
     mouseReleaseEvent.setButton(Qt::LeftButton);
     mouseReleaseEvent.setButtons(Qt::NoButton);
 
     mouseReleaseEvent.setButton(Qt::LeftButton);
     mouseReleaseEvent.setButtons(Qt::NoButton);
 

+    QGraphicsSceneMouseEvent mouseDoubleClickEvent(QEvent::GraphicsSceneMouseDoubleClick);
+    mouseDoubleClickEvent.setPos(pos);
+    mouseDoubleClickEvent.setButton(Qt::LeftButton);
+    mouseDoubleClickEvent.setButtons(Qt::LeftButton);
+
+    QGraphicsSceneMouseEvent mouseRightPressEvent(QEvent::GraphicsSceneMousePress);
+    mouseRightPressEvent.setPos(pos);
+    mouseRightPressEvent.setButton(Qt::RightButton);
+    mouseRightPressEvent.setButtons(Qt::RightButton);
+
+    QGraphicsSceneMouseEvent mouseRightReleaseEvent(QEvent::GraphicsSceneMouseRelease);
+    mouseRightReleaseEvent.setPos(pos);
+    mouseRightReleaseEvent.setButton(Qt::RightButton);
+    mouseRightReleaseEvent.setButtons(Qt::NoButton);
+
+    QGraphicsSceneMouseEvent mouseRightDoubleClickEvent(QEvent::GraphicsSceneMouseDoubleClick);
+    mouseRightDoubleClickEvent.setPos(pos);
+    mouseRightDoubleClickEvent.setButton(Qt::RightButton);
+    mouseRightDoubleClickEvent.setButtons(Qt::RightButton);
+
+    QGraphicsSceneMouseEvent mouseBackPressEvent(QEvent::GraphicsSceneMousePress);
+    mouseBackPressEvent.setPos(pos);
+    mouseBackPressEvent.setButton(Qt::BackButton);
+    mouseBackPressEvent.setButtons(Qt::BackButton);
+
+    QGraphicsSceneMouseEvent mouseBackReleaseEvent(QEvent::GraphicsSceneMouseRelease);
+    mouseBackReleaseEvent.setPos(pos);
+    mouseBackReleaseEvent.setButton(Qt::BackButton);
+    mouseBackReleaseEvent.setButtons(Qt::NoButton);
+
+    QGraphicsSceneMouseEvent mouseBackDoubleClickEvent(QEvent::GraphicsSceneMouseDoubleClick);
+    mouseBackDoubleClickEvent.setPos(pos);
+    mouseBackDoubleClickEvent.setButton(Qt::BackButton);
+    mouseBackDoubleClickEvent.setButtons(Qt::BackButton);
+

     QSignalSpy spyItemActivated(m_controller, &KItemListController::itemActivated);
 
     // Default setting: single click activation.
     QSignalSpy spyItemActivated(m_controller, &KItemListController::itemActivated);
 
     // Default setting: single click activation.


@@ -590,6 +753,7 @@ void KItemListControllerTest::testMouseClickActivation()
     m_view->event(&mouseReleaseEvent);
     QCOMPARE(spyItemActivated.count(), 1);
     spyItemActivated.clear();
     m_view->event(&mouseReleaseEvent);
     QCOMPARE(spyItemActivated.count(), 1);
     spyItemActivated.clear();

+    QVERIFY2(!m_view->controller()->selectionManager()->hasSelection(), "An item should not be implicitly selected during activation. @see bug 424723");

 
     // Set the global setting to "double click activation".
     m_testStyle->setActivateItemOnSingleClick(false);
 
     // Set the global setting to "double click activation".
     m_testStyle->setActivateItemOnSingleClick(false);


@@ -597,6 +761,30 @@ void KItemListControllerTest::testMouseClickActivation()
     m_view->event(&mouseReleaseEvent);
     QCOMPARE(spyItemActivated.count(), 0);
     spyItemActivated.clear();
     m_view->event(&mouseReleaseEvent);
     QCOMPARE(spyItemActivated.count(), 0);
     spyItemActivated.clear();

+    QVERIFY(m_view->controller()->selectionManager()->hasSelection());
+
+    // emulation of double click according to https://doc.qt.io/qt-6/qgraphicsscene.html#mouseDoubleClickEvent
+    m_view->event(&mousePressEvent);
+    m_view->event(&mouseReleaseEvent);
+    m_view->event(&mouseDoubleClickEvent);
+    m_view->event(&mouseReleaseEvent);
+    QCOMPARE(spyItemActivated.count(), 1);
+    spyItemActivated.clear();
+    QVERIFY2(!m_view->controller()->selectionManager()->hasSelection(), "An item should not be implicitly selected during activation. @see bug 424723");
+
+    // right mouse button should not trigger activation
+    m_view->event(&mouseRightPressEvent);
+    m_view->event(&mouseRightReleaseEvent);
+    m_view->event(&mouseRightDoubleClickEvent);
+    m_view->event(&mouseRightReleaseEvent);
+    QCOMPARE(spyItemActivated.count(), 0);
+
+    // back mouse button should not trigger activation
+    m_view->event(&mouseBackPressEvent);
+    m_view->event(&mouseBackReleaseEvent);
+    m_view->event(&mouseBackDoubleClickEvent);
+    m_view->event(&mouseBackReleaseEvent);
+    QCOMPARE(spyItemActivated.count(), 0);

 
     // Enforce single click activation in the controller.
     m_controller->setSingleClickActivationEnforced(true);
 
     // Enforce single click activation in the controller.
     m_controller->setSingleClickActivationEnforced(true);


@@ -604,6 +792,8 @@ void KItemListControllerTest::testMouseClickActivation()
     m_view->event(&mouseReleaseEvent);
     QCOMPARE(spyItemActivated.count(), 1);
     spyItemActivated.clear();
     m_view->event(&mouseReleaseEvent);
     QCOMPARE(spyItemActivated.count(), 1);
     spyItemActivated.clear();

+    constexpr const char *reasonWhySelectionShouldPersist = "An item was selected before this mouse click. The click should not have cleared this selection.";
+    QVERIFY2(m_view->controller()->selectionManager()->hasSelection(), reasonWhySelectionShouldPersist);

 
     // Do not enforce single click activation in the controller.
     m_controller->setSingleClickActivationEnforced(false);
 
     // Do not enforce single click activation in the controller.
     m_controller->setSingleClickActivationEnforced(false);


@@ -611,6 +801,7 @@ void KItemListControllerTest::testMouseClickActivation()
     m_view->event(&mouseReleaseEvent);
     QCOMPARE(spyItemActivated.count(), 0);
     spyItemActivated.clear();
     m_view->event(&mouseReleaseEvent);
     QCOMPARE(spyItemActivated.count(), 0);
     spyItemActivated.clear();

+    QVERIFY2(m_view->controller()->selectionManager()->hasSelection(), reasonWhySelectionShouldPersist);

 
     // Set the global setting back to "single click activation".
     m_testStyle->setActivateItemOnSingleClick(true);
 
     // Set the global setting back to "single click activation".
     m_testStyle->setActivateItemOnSingleClick(true);


@@ -618,6 +809,7 @@ void KItemListControllerTest::testMouseClickActivation()
     m_view->event(&mouseReleaseEvent);
     QCOMPARE(spyItemActivated.count(), 1);
     spyItemActivated.clear();
     m_view->event(&mouseReleaseEvent);
     QCOMPARE(spyItemActivated.count(), 1);
     spyItemActivated.clear();

+    QVERIFY2(m_view->controller()->selectionManager()->hasSelection(), reasonWhySelectionShouldPersist);

 
     // Enforce single click activation in the controller.
     m_controller->setSingleClickActivationEnforced(true);
 
     // Enforce single click activation in the controller.
     m_controller->setSingleClickActivationEnforced(true);


@@ -625,6 +817,7 @@ void KItemListControllerTest::testMouseClickActivation()
     m_view->event(&mouseReleaseEvent);
     QCOMPARE(spyItemActivated.count(), 1);
     spyItemActivated.clear();
     m_view->event(&mouseReleaseEvent);
     QCOMPARE(spyItemActivated.count(), 1);
     spyItemActivated.clear();

+    QVERIFY2(m_view->controller()->selectionManager()->hasSelection(), reasonWhySelectionShouldPersist);

 
     // Restore previous settings.
     m_controller->setSingleClickActivationEnforced(true);
 
     // Restore previous settings.
     m_controller->setSingleClickActivationEnforced(true);