-/***************************************************************************
- * Copyright (C) 2012 by Frank Reininghaus <frank78ac@googlemail.com> *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
- ***************************************************************************/
-
-#include <qtest_kde.h>
-#include <qtestmouse.h>
-#include <qtestkeyboard.h>
-
-#include <KDirLister>
-#include "kitemviews/kitemlistcontainer.h"
+/*
+ * SPDX-FileCopyrightText: 2012 Frank Reininghaus <frank78ac@googlemail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "kitemviews/kitemlistcontroller.h"
#include "kitemviews/kfileitemlistview.h"
#include "kitemviews/kfileitemmodel.h"
-#include "kitemviews/kitemlistcontroller.h"
+#include "kitemviews/kitemlistcontainer.h"
#include "kitemviews/kitemlistselectionmanager.h"
-#include "kitemviews/kitemlistviewlayouter_p.h"
+#include "kitemviews/private/kitemlistviewlayouter.h"
#include "testdir.h"
-namespace {
- const int DefaultTimeout = 2000;
+#include <QGraphicsSceneMouseEvent>
+#include <QProxyStyle>
+#include <QSignalSpy>
+#include <QStandardPaths>
+#include <QTest>
+
+/**
+ * \class KItemListControllerTestStyle is a proxy style for testing the
+ * KItemListController with different style hint options, e.g. single/double
+ * click activation.
+ */
+class KItemListControllerTestStyle : public QProxyStyle
+{
+ Q_OBJECT
+public:
+ KItemListControllerTestStyle(QStyle *style)
+ : QProxyStyle(style)
+ , m_activateItemOnSingleClick((bool)style->styleHint(SH_ItemView_ActivateItemOnSingleClick))
+ {
+ }
+
+ void setActivateItemOnSingleClick(bool activateItemOnSingleClick)
+ {
+ m_activateItemOnSingleClick = activateItemOnSingleClick;
+ }
+
+ bool activateItemOnSingleClick() const
+ {
+ return m_activateItemOnSingleClick;
+ }
+
+ int styleHint(StyleHint hint, const QStyleOption *option = nullptr, const QWidget *widget = nullptr, QStyleHintReturn *returnData = nullptr) const override
+ {
+ switch (hint) {
+ case QStyle::SH_ItemView_ActivateItemOnSingleClick:
+ return (int)activateItemOnSingleClick();
+ default:
+ return QProxyStyle::styleHint(hint, option, widget, returnData);
+ }
+ }
+
+private:
+ bool m_activateItemOnSingleClick;
};
-Q_DECLARE_METATYPE(KFileItemListView::Layout);
-Q_DECLARE_METATYPE(Qt::Orientation);
-Q_DECLARE_METATYPE(KItemListController::SelectionBehavior);
+Q_DECLARE_METATYPE(KFileItemListView::ItemLayout)
+Q_DECLARE_METATYPE(Qt::Orientation)
+Q_DECLARE_METATYPE(KItemListController::SelectionBehavior)
+Q_DECLARE_METATYPE(KItemSet)
class KItemListControllerTest : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void initTestCase();
void cleanupTestCase();
void testKeyboardNavigation_data();
void testKeyboardNavigation();
+ void testMouseClickActivation();
private:
/**
void adjustGeometryForColumnCount(int count);
private:
- KFileItemListView* m_view;
- KItemListController* m_controller;
- KItemListSelectionManager* m_selectionManager;
- KFileItemModel* m_model;
- KDirLister* m_dirLister;
- TestDir* m_testDir;
- KItemListContainer* m_container;
+ KFileItemListView *m_view;
+ KItemListController *m_controller;
+ KItemListSelectionManager *m_selectionManager;
+ KFileItemModel *m_model;
+ TestDir *m_testDir;
+ KItemListContainer *m_container;
+ KItemListControllerTestStyle *m_testStyle;
};
/**
*/
void KItemListControllerTest::initTestCase()
{
+ QStandardPaths::setTestModeEnabled(true);
+ qRegisterMetaType<KItemSet>("KItemSet");
+
m_testDir = new TestDir();
- m_dirLister = new KDirLister();
- m_model = new KFileItemModel(m_dirLister);
- m_container = new KItemListContainer();
+ m_model = new KFileItemModel();
+ 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_view = new KFileItemListView();
- m_controller->setView(m_view);
- m_controller->setModel(m_model);
+ m_testStyle = new KItemListControllerTestStyle(m_view->style());
+ m_view->setStyle(m_testStyle);
QStringList files;
- files
- << "a1" << "a2" << "a3"
- << "b1"
- << "c1" << "c2" << "c3" << "c4" << "c5"
- << "d1" << "d2" << "d3" << "d4"
- << "e1" << "e2" << "e3" << "e4" << "e5" << "e6" << "e7";
+ files << "a1"
+ << "a2"
+ << "a3"
+ << "b1"
+ << "c1"
+ << "c2"
+ << "c3"
+ << "c4"
+ << "c5"
+ << "d1"
+ << "d2"
+ << "d3"
+ << "d4"
+ << "e"
+ << "e 2"
+ << "e 3"
+ << "e 4"
+ << "e 5"
+ << "e 6"
+ << "e 7";
m_testDir->createFiles(files);
- m_dirLister->openUrl(m_testDir->url());
- QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(loadingCompleted()), DefaultTimeout));
+ m_model->loadDirectory(m_testDir->url());
+ QSignalSpy spyDirectoryLoadingCompleted(m_model, &KFileItemModel::directoryLoadingCompleted);
+ QVERIFY(spyDirectoryLoadingCompleted.wait());
m_container->show();
- QTest::qWaitForWindowShown(m_container);
+ QVERIFY(QTest::qWaitForWindowExposed(m_container));
}
void KItemListControllerTest::cleanupTestCase()
{
- delete m_view;
- m_view = 0;
-
delete m_container;
- m_container = 0;
- m_controller = 0;
-
- delete m_model;
- m_model = 0;
-
- delete m_dirLister;
- m_dirLister = 0;
+ m_container = nullptr;
delete m_testDir;
- m_testDir = 0;
+ m_testDir = nullptr;
}
/** Before each test, the current item, selection, and item size are reset to the defaults. */
* including the key and the keyboard modifiers.
*/
struct KeyPress {
-
- KeyPress(Qt::Key key, Qt::KeyboardModifiers modifier = Qt::NoModifier) :
- m_key(key),
- m_modifier(modifier)
- {}
+ KeyPress(Qt::Key key, Qt::KeyboardModifiers modifier = Qt::NoModifier)
+ : m_key(key)
+ , m_modifier(modifier)
+ {
+ }
Qt::Key m_key;
Qt::KeyboardModifiers m_modifier;
/**
* \class ViewState is a small helper struct that represents a certain state
- * of the view, including the current item and the selected items.
+ * of the view, including the current item, the selected items in MultiSelection
+ * mode (in the other modes, the selection is either empty or equal to the
+ * current item), and the information whether items were activated by the last
+ * key press.
*/
struct ViewState {
-
- ViewState(int current, QSet<int> selection) :
- m_current(current),
- m_selection(selection)
- {}
+ ViewState(int current, const KItemSet &selection, bool activated = false)
+ : m_current(current)
+ , m_selection(selection)
+ , m_activated(activated)
+ {
+ }
int m_current;
- QSet<int> m_selection;
+ KItemSet m_selection;
+ bool m_activated;
};
// We have to define a typedef for the pair in order to make the test compile.
typedef QPair<KeyPress, ViewState> keyPressViewStatePair;
-Q_DECLARE_METATYPE(QList<keyPressViewStatePair>);
+Q_DECLARE_METATYPE(QList<keyPressViewStatePair>)
/**
* This function provides the data for the actual test function
*/
void KItemListControllerTest::testKeyboardNavigation_data()
{
- QTest::addColumn<KFileItemListView::Layout>("layout");
+ QTest::addColumn<KFileItemListView::ItemLayout>("layout");
QTest::addColumn<Qt::Orientation>("scrollOrientation");
QTest::addColumn<int>("columnCount");
QTest::addColumn<KItemListController::SelectionBehavior>("selectionBehavior");
QTest::addColumn<bool>("groupingEnabled");
- QTest::addColumn<QList<QPair<KeyPress, ViewState> > >("testList");
-
- static QList<KFileItemListView::Layout> layoutList;
- static QHash<KFileItemListView::Layout, QString> layoutNames;
- if (layoutList.isEmpty()) {
- layoutList.append(KFileItemListView::IconsLayout);
- layoutNames[KFileItemListView::IconsLayout] = "Icons";
-
- layoutList.append(KFileItemListView::CompactLayout);
- layoutNames[KFileItemListView::CompactLayout] = "Compact";
-
- layoutList.append(KFileItemListView::DetailsLayout);
- layoutNames[KFileItemListView::DetailsLayout] = "Details";
- }
-
- static QList<KItemListController::SelectionBehavior> selectionBehaviorList;
- static QHash<KItemListController::SelectionBehavior, QString> selectionBehaviorNames;
- if (selectionBehaviorList.isEmpty()) {
- selectionBehaviorList.append(KItemListController::NoSelection);
- selectionBehaviorNames[KItemListController::NoSelection] = "NoSelection";
-
- selectionBehaviorList.append(KItemListController::SingleSelection);
- selectionBehaviorNames[KItemListController::SingleSelection] = "SingleSelection";
-
- selectionBehaviorList.append(KItemListController::MultiSelection);
- selectionBehaviorNames[KItemListController::MultiSelection] = "MultiSelection";
- }
-
- static QList<bool> groupingEnabledList;
- static QHash<bool, QString> groupingEnabledNames;
- if (groupingEnabledList.isEmpty()) {
- groupingEnabledList.append(false);
- groupingEnabledNames[false] = "ungrouped";
-
- groupingEnabledList.append(true);
- groupingEnabledNames[true] = "grouping enabled";
- }
-
- foreach (KFileItemListView::Layout layout, layoutList) {
+ QTest::addColumn<QList<QPair<KeyPress, ViewState>>>("testList");
+
+ QList<KFileItemListView::ItemLayout> layoutList;
+ QHash<KFileItemListView::ItemLayout, QString> layoutNames;
+ layoutList.append(KFileItemListView::IconsLayout);
+ layoutNames[KFileItemListView::IconsLayout] = "Icons";
+ layoutList.append(KFileItemListView::CompactLayout);
+ layoutNames[KFileItemListView::CompactLayout] = "Compact";
+ layoutList.append(KFileItemListView::DetailsLayout);
+ layoutNames[KFileItemListView::DetailsLayout] = "Details";
+
+ QList<KItemListController::SelectionBehavior> selectionBehaviorList;
+ QHash<KItemListController::SelectionBehavior, QString> selectionBehaviorNames;
+ selectionBehaviorList.append(KItemListController::NoSelection);
+ selectionBehaviorNames[KItemListController::NoSelection] = "NoSelection";
+ selectionBehaviorList.append(KItemListController::SingleSelection);
+ selectionBehaviorNames[KItemListController::SingleSelection] = "SingleSelection";
+ selectionBehaviorList.append(KItemListController::MultiSelection);
+ selectionBehaviorNames[KItemListController::MultiSelection] = "MultiSelection";
+
+ QList<bool> groupingEnabledList;
+ QHash<bool, QString> groupingEnabledNames;
+ groupingEnabledList.append(false);
+ groupingEnabledNames[false] = "ungrouped";
+ groupingEnabledList.append(true);
+ groupingEnabledNames[true] = "grouping enabled";
+
+ for (const KFileItemListView::ItemLayout &layout : layoutList) {
// The following settings depend on the layout.
// Note that 'columns' are actually 'rows' in
// Compact layout.
break;
}
- foreach (int columnCount, columnCountList) {
- foreach (KItemListController::SelectionBehavior selectionBehavior, selectionBehaviorList) {
- foreach (bool groupingEnabled, 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, QSet<int>() << 1))
- << qMakePair(KeyPress(nextItemKey), ViewState(2, QSet<int>() << 2))
- << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(3, QSet<int>() << 2 << 3))
- << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(2, QSet<int>() << 2))
- << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(3, QSet<int>() << 2 << 3))
- << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(4, QSet<int>() << 2 << 3))
- << qMakePair(KeyPress(previousItemKey), ViewState(3, QSet<int>() << 3))
- << qMakePair(KeyPress(Qt::Key_Home, Qt::ShiftModifier), ViewState(0, QSet<int>() << 0 << 1 << 2 << 3))
- << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(1, QSet<int>() << 0 << 1 << 2 << 3))
- << qMakePair(KeyPress(Qt::Key_Space, Qt::ControlModifier), ViewState(1, QSet<int>() << 0 << 2 << 3))
- << qMakePair(KeyPress(Qt::Key_Space, Qt::ControlModifier), ViewState(1, QSet<int>() << 0 << 1 << 2 << 3))
- << qMakePair(KeyPress(Qt::Key_End), ViewState(19, QSet<int>() << 19))
- << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(18, QSet<int>() << 18 << 19))
- << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, QSet<int>() << 0));
+ 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, QSet<int>() << 1))
- << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(2, QSet<int>() << 1 << 2))
- << qMakePair(KeyPress(nextRowKey, Qt::ControlModifier), ViewState(3, QSet<int>() << 1 << 2))
- << qMakePair(KeyPress(previousRowKey), ViewState(2, QSet<int>() << 2))
- << qMakePair(KeyPress(previousItemKey), ViewState(1, QSet<int>() << 1))
- << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, QSet<int>() << 0));
+ 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
// d4 e1 e2 | 12 13 14
// e3 e4 e5 | 15 16 17
// e6 e7 | 18 19
- testList
- << qMakePair(KeyPress(nextRowKey), ViewState(3, QSet<int>() << 3))
- << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(4, QSet<int>() << 3))
- << qMakePair(KeyPress(nextRowKey), ViewState(7, QSet<int>() << 7))
- << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(8, QSet<int>() << 7 << 8))
- << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(9, QSet<int>() << 7 << 8 << 9))
- << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(8, QSet<int>() << 7 << 8))
- << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(7, QSet<int>() << 7))
- << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(6, QSet<int>() << 6 << 7))
- << qMakePair(KeyPress(previousItemKey, Qt::ShiftModifier), ViewState(5, QSet<int>() << 5 << 6 << 7))
- << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(6, QSet<int>() << 6 << 7))
- << qMakePair(KeyPress(nextItemKey, Qt::ShiftModifier), ViewState(7, QSet<int>() << 7))
- << qMakePair(KeyPress(nextRowKey), ViewState(10, QSet<int>() << 10))
- << qMakePair(KeyPress(nextItemKey), ViewState(11, QSet<int>() << 11))
- << qMakePair(KeyPress(nextRowKey), ViewState(14, QSet<int>() << 14))
- << qMakePair(KeyPress(nextRowKey), ViewState(17, QSet<int>() << 17))
- << qMakePair(KeyPress(nextRowKey), ViewState(19, QSet<int>() << 19))
- << qMakePair(KeyPress(previousRowKey), ViewState(17, QSet<int>() << 17))
- << qMakePair(KeyPress(Qt::Key_End), ViewState(19, QSet<int>() << 19))
- << qMakePair(KeyPress(previousRowKey), ViewState(16, QSet<int>() << 16))
- << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, QSet<int>() << 0));
+ 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) {
// 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, QSet<int>() << 5))
- << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(6, QSet<int>() << 5))
- << qMakePair(KeyPress(nextRowKey), ViewState(11, QSet<int>() << 11))
- << qMakePair(KeyPress(nextItemKey), ViewState(12, QSet<int>() << 12))
- << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(17, QSet<int>() << 12 << 13 << 14 << 15 << 16 << 17))
- << qMakePair(KeyPress(previousRowKey, Qt::ShiftModifier), ViewState(12, QSet<int>() << 12))
- << qMakePair(KeyPress(previousRowKey, Qt::ShiftModifier), ViewState(7, QSet<int>() << 7 << 8 << 9 << 10 << 11 << 12))
- << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(12, QSet<int>() << 12))
- << qMakePair(KeyPress(Qt::Key_End, Qt::ControlModifier), ViewState(19, QSet<int>() << 12))
- << qMakePair(KeyPress(previousRowKey), ViewState(14, QSet<int>() << 14))
- << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, QSet<int>() << 0));
+ 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) {
// e1 e2 e3 | 13 14 15
// e4 e5 e6 | 16 17 18
// e7 | 19
- testList
- << qMakePair(KeyPress(nextItemKey), ViewState(1, QSet<int>() << 1))
- << qMakePair(KeyPress(nextItemKey), ViewState(2, QSet<int>() << 2))
- << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(3, QSet<int>() << 2 << 3))
- << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(6, QSet<int>() << 2 << 3 << 4 << 5 << 6))
- << qMakePair(KeyPress(nextRowKey), ViewState(8, QSet<int>() << 8))
- << qMakePair(KeyPress(nextRowKey), ViewState(11, QSet<int>() << 11))
- << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(12, QSet<int>() << 11))
- << qMakePair(KeyPress(nextRowKey), ViewState(13, QSet<int>() << 13))
- << qMakePair(KeyPress(nextRowKey), ViewState(16, QSet<int>() << 16))
- << qMakePair(KeyPress(nextItemKey), ViewState(17, QSet<int>() << 17))
- << qMakePair(KeyPress(nextRowKey), ViewState(19, QSet<int>() << 19))
- << qMakePair(KeyPress(previousRowKey), ViewState(17, QSet<int>() << 17))
- << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, QSet<int>() << 0));
+ 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) {
// 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, QSet<int>() << 1))
- << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(3, QSet<int>() << 1 << 2 << 3))
- << qMakePair(KeyPress(nextRowKey, Qt::ShiftModifier), ViewState(5, QSet<int>() << 1 << 2 << 3 << 4 << 5))
- << qMakePair(KeyPress(nextItemKey), ViewState(6, QSet<int>() << 6))
- << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(7, QSet<int>() << 6))
- << qMakePair(KeyPress(nextItemKey, Qt::ControlModifier), ViewState(8, QSet<int>() << 6))
- << qMakePair(KeyPress(nextRowKey), ViewState(12, QSet<int>() << 12))
- << qMakePair(KeyPress(nextRowKey), ViewState(17, QSet<int>() << 17))
- << qMakePair(KeyPress(nextRowKey), ViewState(19, QSet<int>() << 19))
- << qMakePair(KeyPress(previousRowKey), ViewState(17, QSet<int>() << 17))
- << qMakePair(KeyPress(Qt::Key_End, Qt::ShiftModifier), ViewState(19, QSet<int>() << 17 << 18 << 19))
- << qMakePair(KeyPress(previousRowKey, Qt::ShiftModifier), ViewState(14, QSet<int>() << 14 << 15 << 16 << 17))
- << qMakePair(KeyPress(Qt::Key_Home), ViewState(0, QSet<int>() << 0));
+ 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] + ", " +
- QString("%1 columns, ").arg(columnCount) +
- selectionBehaviorNames[selectionBehavior] + ", " +
- groupingEnabledNames[groupingEnabled];
-
- const QByteArray testNameAscii = testName.toAscii();
-
- QTest::newRow(testNameAscii.data())
- << layout
- << scrollOrientation
- << columnCount
- << selectionBehavior
- << groupingEnabled
- << 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;
}
}
}
*/
void KItemListControllerTest::testKeyboardNavigation()
{
- QFETCH(KFileItemListView::Layout, layout);
+ QFETCH(KFileItemListView::ItemLayout, layout);
QFETCH(Qt::Orientation, scrollOrientation);
QFETCH(int, columnCount);
QFETCH(KItemListController::SelectionBehavior, selectionBehavior);
m_view->setScrollOrientation(scrollOrientation);
QCOMPARE(m_view->scrollOrientation(), scrollOrientation);
- adjustGeometryForColumnCount(columnCount);
- QCOMPARE(m_view->m_layouter->m_columnCount, columnCount);
-
m_controller->setSelectionBehavior(selectionBehavior);
QCOMPARE(m_controller->selectionBehavior(), selectionBehavior);
m_model->setGroupedSorting(groupingEnabled);
QCOMPARE(m_model->groupedSorting(), groupingEnabled);
+ adjustGeometryForColumnCount(columnCount);
+ QCOMPARE(m_view->m_layouter->m_columnCount, columnCount);
+
+ QSignalSpy spySingleItemActivated(m_controller, &KItemListController::itemActivated);
+ QSignalSpy spyMultipleItemsActivated(m_controller, &KItemListController::itemsActivated);
+
while (!testList.isEmpty()) {
const QPair<KeyPress, ViewState> test = testList.takeFirst();
const Qt::Key key = test.first.m_key;
const Qt::KeyboardModifiers modifier = test.first.m_modifier;
const int current = test.second.m_current;
- const QSet<int> selection = test.second.m_selection;
+ const KItemSet selection = test.second.m_selection;
+ const bool activated = test.second.m_activated;
QTest::keyClick(m_container, key, modifier);
+
QCOMPARE(m_selectionManager->currentItem(), current);
switch (selectionBehavior) {
- case KItemListController::NoSelection: QVERIFY(m_selectionManager->selectedItems().isEmpty()); break;
- case KItemListController::SingleSelection: QCOMPARE(m_selectionManager->selectedItems(), QSet<int>() << current); break;
- case KItemListController::MultiSelection: QCOMPARE(m_selectionManager->selectedItems(), selection); break;
+ case KItemListController::NoSelection:
+ QVERIFY(m_selectionManager->selectedItems().isEmpty());
+ break;
+ case KItemListController::SingleSelection:
+ QCOMPARE(m_selectionManager->selectedItems(), KItemSet() << current);
+ break;
+ case KItemListController::MultiSelection:
+ QCOMPARE(m_selectionManager->selectedItems(), selection);
+ break;
+ }
+
+ if (activated) {
+ switch (selectionBehavior) {
+ case KItemListController::MultiSelection:
+ if (!selection.isEmpty()) {
+ // The selected items should be activated.
+ if (selection.count() == 1) {
+ QVERIFY(!spySingleItemActivated.isEmpty());
+ QCOMPARE(qvariant_cast<int>(spySingleItemActivated.takeFirst().at(0)), selection.first());
+ QVERIFY(spyMultipleItemsActivated.isEmpty());
+ } else {
+ QVERIFY(spySingleItemActivated.isEmpty());
+ QVERIFY(!spyMultipleItemsActivated.isEmpty());
+ QCOMPARE(qvariant_cast<KItemSet>(spyMultipleItemsActivated.takeFirst().at(0)), selection);
+ }
+ break;
+ }
+ // No items are selected. Therefore, the current item should be activated.
+ // This is handled by falling through to the NoSelection/SingleSelection case.
+ Q_FALLTHROUGH();
+ case KItemListController::NoSelection:
+ case KItemListController::SingleSelection:
+ // In NoSelection and SingleSelection mode, the current item should be activated.
+ QVERIFY(!spySingleItemActivated.isEmpty());
+ QCOMPARE(qvariant_cast<int>(spySingleItemActivated.takeFirst().at(0)), current);
+ QVERIFY(spyMultipleItemsActivated.isEmpty());
+ break;
+ }
}
}
}
+void KItemListControllerTest::testMouseClickActivation()
+{
+ m_view->setItemLayout(KFileItemListView::IconsLayout);
+
+ // Make sure that we have a large window, such that
+ // the items are visible and clickable.
+ adjustGeometryForColumnCount(5);
+
+ // Make sure that the first item is visible in the view.
+ m_view->setScrollOffset(0);
+ QCOMPARE(m_view->firstVisibleIndex(), 0);
+
+ const QPointF pos = m_view->itemContextRect(0).center();
+
+ // Save the "single click" setting.
+ const bool restoreSettingsSingleClick = m_testStyle->activateItemOnSingleClick();
+
+ QGraphicsSceneMouseEvent mousePressEvent(QEvent::GraphicsSceneMousePress);
+ mousePressEvent.setPos(pos);
+ mousePressEvent.setButton(Qt::LeftButton);
+ mousePressEvent.setButtons(Qt::LeftButton);
+
+ QGraphicsSceneMouseEvent mouseReleaseEvent(QEvent::GraphicsSceneMouseRelease);
+ mouseReleaseEvent.setPos(pos);
+ mouseReleaseEvent.setButton(Qt::LeftButton);
+ mouseReleaseEvent.setButtons(Qt::NoButton);
+
+ QSignalSpy spyItemActivated(m_controller, &KItemListController::itemActivated);
+
+ // Default setting: single click activation.
+ m_testStyle->setActivateItemOnSingleClick(true);
+ m_view->event(&mousePressEvent);
+ m_view->event(&mouseReleaseEvent);
+ QCOMPARE(spyItemActivated.count(), 1);
+ spyItemActivated.clear();
+
+ // Set the global setting to "double click activation".
+ m_testStyle->setActivateItemOnSingleClick(false);
+ m_view->event(&mousePressEvent);
+ m_view->event(&mouseReleaseEvent);
+ QCOMPARE(spyItemActivated.count(), 0);
+ spyItemActivated.clear();
+
+ // Enforce single click activation in the controller.
+ m_controller->setSingleClickActivationEnforced(true);
+ m_view->event(&mousePressEvent);
+ m_view->event(&mouseReleaseEvent);
+ QCOMPARE(spyItemActivated.count(), 1);
+ spyItemActivated.clear();
+
+ // Do not enforce single click activation in the controller.
+ m_controller->setSingleClickActivationEnforced(false);
+ m_view->event(&mousePressEvent);
+ m_view->event(&mouseReleaseEvent);
+ QCOMPARE(spyItemActivated.count(), 0);
+ spyItemActivated.clear();
+
+ // Set the global setting back to "single click activation".
+ m_testStyle->setActivateItemOnSingleClick(true);
+ m_view->event(&mousePressEvent);
+ m_view->event(&mouseReleaseEvent);
+ QCOMPARE(spyItemActivated.count(), 1);
+ spyItemActivated.clear();
+
+ // Enforce single click activation in the controller.
+ m_controller->setSingleClickActivationEnforced(true);
+ m_view->event(&mousePressEvent);
+ m_view->event(&mouseReleaseEvent);
+ QCOMPARE(spyItemActivated.count(), 1);
+ spyItemActivated.clear();
+
+ // Restore previous settings.
+ m_controller->setSingleClickActivationEnforced(true);
+ m_testStyle->setActivateItemOnSingleClick(restoreSettingsSingleClick);
+}
+
void KItemListControllerTest::adjustGeometryForColumnCount(int count)
{
const QSize size = m_view->itemSize().toSize();
}
}
-QTEST_KDEMAIN(KItemListControllerTest, GUI)
+QTEST_MAIN(KItemListControllerTest)
#include "kitemlistcontrollertest.moc"
projects / dolphin.git / blobdiff