X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/67c007889ecc4eada434cbe390110b2e7566aa41..09a0a44a073cf6396f0a28dc3847d081c4dab24e:/src/tests/kitemlistselectionmanagertest.cpp diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp index 5dce57f3c..da761d9a7 100644 --- a/src/tests/kitemlistselectionmanagertest.cpp +++ b/src/tests/kitemlistselectionmanagertest.cpp @@ -1,28 +1,16 @@ -/*************************************************************************** - * Copyright (C) 2011 by Peter Penz * - * Copyright (C) 2011 by Frank Reininghaus * - * * - * 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 * - ***************************************************************************/ +/* + * SPDX-FileCopyrightText: 2011 Peter Penz + * SPDX-FileCopyrightText: 2011 Frank Reininghaus + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ -#include "kitemviews/kitemmodelbase.h" #include "kitemviews/kitemlistselectionmanager.h" +#include "kitemviews/kitemmodelbase.h" -#include #include +#include +#include class DummyModel : public KItemModelBase { @@ -30,16 +18,16 @@ class DummyModel : public KItemModelBase public: DummyModel(); void setCount(int count); - virtual int count() const; - virtual QHash data(int index) const; + int count() const override; + QHash data(int index) const override; private: int m_count; }; -DummyModel::DummyModel() : - KItemModelBase(), - m_count(100) +DummyModel::DummyModel() + : KItemModelBase() + , m_count(100) { } @@ -55,16 +43,16 @@ int DummyModel::count() const QHash DummyModel::data(int index) const { - Q_UNUSED(index); + Q_UNUSED(index) return QHash(); } - class KItemListSelectionManagerTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: + void initTestCase(); void init(); void cleanup(); @@ -83,12 +71,17 @@ private slots: void testAnchoredSelectionAfterMovingItems(); private: - void verifySelectionChange(QSignalSpy& spy, const KItemSet& currentSelection, const KItemSet& previousSelection) const; + void verifySelectionChange(QSignalSpy &spy, const KItemSet ¤tSelection, const KItemSet &previousSelection) const; - KItemListSelectionManager* m_selectionManager; - DummyModel* m_model; + KItemListSelectionManager *m_selectionManager; + DummyModel *m_model; }; +void KItemListSelectionManagerTest::initTestCase() +{ + QStandardPaths::setTestModeEnabled(true); +} + void KItemListSelectionManagerTest::init() { m_model = new DummyModel(); @@ -99,10 +92,10 @@ void KItemListSelectionManagerTest::init() void KItemListSelectionManagerTest::cleanup() { delete m_selectionManager; - m_selectionManager = 0; + m_selectionManager = nullptr; delete m_model; - m_model = 0; + m_model = nullptr; } void KItemListSelectionManagerTest::testConstructor() @@ -115,7 +108,7 @@ void KItemListSelectionManagerTest::testConstructor() void KItemListSelectionManagerTest::testCurrentItemAnchorItem() { - QSignalSpy spyCurrent(m_selectionManager, SIGNAL(currentChanged(int,int))); + QSignalSpy spyCurrent(m_selectionManager, &KItemListSelectionManager::currentChanged); // Set current item and check that the selection manager emits the currentChanged(int,int) signal correctly. m_selectionManager->setCurrentItem(4); @@ -145,10 +138,7 @@ void KItemListSelectionManagerTest::testCurrentItemAnchorItem() QVERIFY(m_selectionManager->hasSelection()); // Inserting items should update current item and anchor item. - m_selectionManager->itemsInserted(KItemRangeList() << - KItemRange(0, 1) << - KItemRange(2, 2) << - KItemRange(6, 3)); + m_selectionManager->itemsInserted(KItemRangeList() << KItemRange(0, 1) << KItemRange(2, 2) << KItemRange(6, 3)); QCOMPARE(m_selectionManager->currentItem(), 5); QCOMPARE(spyCurrent.count(), 1); @@ -162,10 +152,7 @@ void KItemListSelectionManagerTest::testCurrentItemAnchorItem() QVERIFY(m_selectionManager->hasSelection()); // Removing items should update current item and anchor item. - m_selectionManager->itemsRemoved(KItemRangeList() << - KItemRange(0, 2) << - KItemRange(2, 1) << - KItemRange(9, 2)); + m_selectionManager->itemsRemoved(KItemRangeList() << KItemRange(0, 2) << KItemRange(2, 1) << KItemRange(9, 2)); QCOMPARE(m_selectionManager->currentItem(), 2); QCOMPARE(spyCurrent.count(), 1); @@ -230,10 +217,7 @@ void KItemListSelectionManagerTest::testItemsInserted() QVERIFY(selectedItems.contains(17)); // Insert 3 items between the selections - m_selectionManager->itemsInserted(KItemRangeList() << - KItemRange(15, 1) << - KItemRange(16, 1) << - KItemRange(17, 1)); + m_selectionManager->itemsInserted(KItemRangeList() << KItemRange(15, 1) << KItemRange(16, 1) << KItemRange(17, 1)); selectedItems = m_selectionManager->selectedItems(); QCOMPARE(selectedItems.count(), 3); QVERIFY(selectedItems.contains(16)); @@ -260,10 +244,7 @@ void KItemListSelectionManagerTest::testItemsRemoved() } // Remove the items 6 , 8 and 10 - m_selectionManager->itemsRemoved(KItemRangeList() << - KItemRange(6, 1) << - KItemRange(8, 1) << - KItemRange(10, 1)); + m_selectionManager->itemsRemoved(KItemRangeList() << KItemRange(6, 1) << KItemRange(8, 1) << KItemRange(10, 1)); selectedItems = m_selectionManager->selectedItems(); QCOMPARE(selectedItems.count(), 3); QVERIFY(selectedItems.contains(5)); @@ -312,15 +293,9 @@ void KItemListSelectionManagerTest::testAnchoredSelection() QCOMPARE(m_selectionManager->selectedItems(), KItemSet() << 5 << 6 << 7 << 9 << 10); } -namespace { - enum ChangeType { - NoChange, - InsertItems, - RemoveItems, - MoveItems, - EndAnchoredSelection, - SetSelected - }; +namespace +{ +enum ChangeType { NoChange, InsertItems, RemoveItems, MoveItems, EndAnchoredSelection, SetSelected }; } Q_DECLARE_METATYPE(KItemSet) @@ -335,27 +310,26 @@ Q_DECLARE_METATYPE(QList) * * The test is data-driven and takes the following arguments: * - * \param initialSelection The selection at the beginning. - * \param anchor This item will be the anchor item. - * \param current This item will be the current item. - * \param expectedSelection Expected selection after anchor and current are set. - * \param changeType Type of the change that is done then: - * - NoChange - * - InsertItems -> data.at(0) provides the KItemRangeList. \sa KItemListSelectionManager::itemsInserted() - * - RemoveItems -> data.at(0) provides the KItemRangeList. \sa KItemListSelectionManager::itemsRemoved() - * - MoveItems -> data.at(0) provides the KItemRange containing the original indices, - * data.at(1) provides the list containing the new indices - * \sa KItemListSelectionManager::itemsMoved(), KItemModelBase::itemsMoved() - * - EndAnchoredSelection - * - SetSelected -> data.at(0) provides the index where the selection process starts, - * data.at(1) provides the number of indices to be selected, - * data.at(2) provides the selection mode. - * \sa KItemListSelectionManager::setSelected() - * \param data A list of QVariants which will be cast to the arguments needed for the chosen ChangeType (see above). - * \param finalSelection The expected final selection. + * param initialSelection The selection at the beginning. + * param anchor This item will be the anchor item. + * param current This item will be the current item. + * param expectedSelection Expected selection after anchor and current are set. + * param changeType Type of the change that is done then: + * - NoChange + * - InsertItems -> data.at(0) provides the KItemRangeList. \sa KItemListSelectionManager::itemsInserted() + * - RemoveItems -> data.at(0) provides the KItemRangeList. \sa KItemListSelectionManager::itemsRemoved() + * - MoveItems -> data.at(0) provides the KItemRange containing the original indices, + * data.at(1) provides the list containing the new indices + * \sa KItemListSelectionManager::itemsMoved(), KItemModelBase::itemsMoved() + * - EndAnchoredSelection + * - SetSelected -> data.at(0) provides the index where the selection process starts, + * data.at(1) provides the number of indices to be selected, + * data.at(2) provides the selection mode. + * \sa KItemListSelectionManager::setSelected() + * param data A list of QVariants which will be cast to the arguments needed for the chosen ChangeType (see above). + * param finalSelection The expected final selection. * */ - void KItemListSelectionManagerTest::testChangeSelection_data() { QTest::addColumn("initialSelection"); @@ -363,77 +337,38 @@ void KItemListSelectionManagerTest::testChangeSelection_data() QTest::addColumn("current"); QTest::addColumn("expectedSelection"); QTest::addColumn("changeType"); - QTest::addColumn >("data"); + QTest::addColumn>("data"); QTest::addColumn("finalSelection"); - QTest::newRow("No change") - << (KItemSet() << 5 << 6) - << 2 << 3 - << (KItemSet() << 2 << 3 << 5 << 6) - << NoChange - << QList{} - << (KItemSet() << 2 << 3 << 5 << 6); - - QTest::newRow("Insert Items") - << (KItemSet() << 5 << 6) - << 2 << 3 - << (KItemSet() << 2 << 3 << 5 << 6) - << InsertItems - << QList{QVariant::fromValue(KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 2) << KItemRange(10, 5))} - << (KItemSet() << 3 << 4 << 8 << 9); - - QTest::newRow("Remove Items") - << (KItemSet() << 5 << 6) - << 2 << 3 - << (KItemSet() << 2 << 3 << 5 << 6) - << RemoveItems - << QList{QVariant::fromValue(KItemRangeList() << KItemRange(1, 1) << KItemRange(3, 1) << KItemRange(10, 5))} - << (KItemSet() << 1 << 2 << 3 << 4); - - QTest::newRow("Empty Anchored Selection") - << KItemSet() - << 2 << 2 - << KItemSet() - << EndAnchoredSelection - << QList{} - << KItemSet(); - - QTest::newRow("Toggle selection") - << (KItemSet() << 1 << 3 << 4) - << 6 << 8 - << (KItemSet() << 1 << 3 << 4 << 6 << 7 << 8) - << SetSelected - << QList{0, 10, QVariant::fromValue(KItemListSelectionManager::Toggle)} - << (KItemSet() << 0 << 2 << 5 << 9); + QTest::newRow("No change") << (KItemSet() << 5 << 6) << 2 << 3 << (KItemSet() << 2 << 3 << 5 << 6) << NoChange << QList{} + << (KItemSet() << 2 << 3 << 5 << 6); + + QTest::newRow("Insert Items") << (KItemSet() << 5 << 6) << 2 << 3 << (KItemSet() << 2 << 3 << 5 << 6) << InsertItems + << QList{QVariant::fromValue(KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 2) << KItemRange(10, 5))} + << (KItemSet() << 3 << 4 << 8 << 9); + + QTest::newRow("Remove Items") << (KItemSet() << 5 << 6) << 2 << 3 << (KItemSet() << 2 << 3 << 5 << 6) << RemoveItems + << QList{QVariant::fromValue(KItemRangeList() << KItemRange(1, 1) << KItemRange(3, 1) << KItemRange(10, 5))} + << (KItemSet() << 1 << 2 << 3 << 4); + + QTest::newRow("Empty Anchored Selection") << KItemSet() << 2 << 2 << KItemSet() << EndAnchoredSelection << QList{} << KItemSet(); + + QTest::newRow("Toggle selection") << (KItemSet() << 1 << 3 << 4) << 6 << 8 << (KItemSet() << 1 << 3 << 4 << 6 << 7 << 8) << SetSelected + << QList{0, 10, QVariant::fromValue(KItemListSelectionManager::Toggle)} << (KItemSet() << 0 << 2 << 5 << 9); // Swap items 2, 3 and 4, 5 - QTest::newRow("Move items") - << (KItemSet() << 0 << 1 << 2 << 3) - << -1 << -1 - << (KItemSet() << 0 << 1 << 2 << 3) - << MoveItems - << QList{QVariant::fromValue(KItemRange(2, 4)), - QVariant::fromValue(QList{4, 5, 2, 3})} - << (KItemSet() << 0 << 1 << 4 << 5); + QTest::newRow("Move items") << (KItemSet() << 0 << 1 << 2 << 3) << -1 << -1 << (KItemSet() << 0 << 1 << 2 << 3) << MoveItems + << QList{QVariant::fromValue(KItemRange(2, 4)), QVariant::fromValue(QList{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::fromValue(KItemRange(2, 4)), - QVariant::fromValue(QList{4, 5, 2, 3})} - << (KItemSet() << 0 << 1 << 4 << 5); + << KItemSet() << 0 << 3 << (KItemSet() << 0 << 1 << 2 << 3) << MoveItems + << QList{QVariant::fromValue(KItemRange(2, 4)), QVariant::fromValue(QList{4, 5, 2, 3})} << (KItemSet() << 0 << 1 << 4 << 5); // Revert sort order - QTest::newRow("Revert sort order") - << (KItemSet() << 0 << 1) - << 3 << 4 - << (KItemSet() << 0 << 1 << 3 << 4) - << MoveItems - << QList{QVariant::fromValue(KItemRange(0, 10)), - QVariant::fromValue(QList{9, 8, 7, 6, 5, 4, 3, 2, 1, 0})} - << (KItemSet() << 5 << 6 << 8 << 9); + QTest::newRow("Revert sort order") << (KItemSet() << 0 << 1) << 3 << 4 << (KItemSet() << 0 << 1 << 3 << 4) << MoveItems + << QList{QVariant::fromValue(KItemRange(0, 10)), QVariant::fromValue(QList{9, 8, 7, 6, 5, 4, 3, 2, 1, 0})} + << (KItemSet() << 5 << 6 << 8 << 9); } void KItemListSelectionManagerTest::testChangeSelection() @@ -446,13 +381,13 @@ void KItemListSelectionManagerTest::testChangeSelection() QFETCH(QList, data); QFETCH(KItemSet, finalSelection); - QSignalSpy spySelectionChanged(m_selectionManager, SIGNAL(selectionChanged(KItemSet,KItemSet))); + QSignalSpy spySelectionChanged(m_selectionManager, &KItemListSelectionManager::selectionChanged); // Initial selection should be empty QVERIFY(!m_selectionManager->hasSelection()); QVERIFY(m_selectionManager->selectedItems().isEmpty()); - // Perform the initial selectiion + // Perform the initial selection m_selectionManager->setSelectedItems(initialSelection); verifySelectionChange(spySelectionChanged, initialSelection, KItemSet()); @@ -477,8 +412,7 @@ void KItemListSelectionManagerTest::testChangeSelection() m_selectionManager->itemsRemoved(data.at(0).value()); break; case MoveItems: - m_selectionManager->itemsMoved(data.at(0).value(), - data.at(1).value>()); + m_selectionManager->itemsMoved(data.at(0).value(), data.at(1).value>()); break; case EndAnchoredSelection: m_selectionManager->endAnchoredSelection(); @@ -508,11 +442,11 @@ void KItemListSelectionManagerTest::testDeleteCurrentItem_data() QTest::addColumn("removeCount"); QTest::addColumn("newCurrentItemIndex"); - QTest::newRow("Remove before") << 50 << 0 << 10 << 40; - QTest::newRow("Remove after") << 50 << 51 << 10 << 50; - QTest::newRow("Remove exactly current item") << 50 << 50 << 1 << 50; - QTest::newRow("Remove around current item") << 50 << 45 << 10 << 45; - QTest::newRow("Remove all except one item") << 50 << 1 << 99 << 0; + QTest::newRow("Remove before") << 50 << 0 << 10 << 40; + QTest::newRow("Remove after") << 50 << 51 << 10 << 50; + QTest::newRow("Remove exactly current item") << 50 << 50 << 1 << 50; + QTest::newRow("Remove around current item") << 50 << 45 << 10 << 45; + QTest::newRow("Remove all except one item") << 50 << 1 << 99 << 0; } void KItemListSelectionManagerTest::testDeleteCurrentItem() @@ -547,25 +481,21 @@ void KItemListSelectionManagerTest::testAnchoredSelectionAfterMovingItems() QCOMPARE(m_selectionManager->selectedItems(), KItemSet() << 1 << 2); } -void KItemListSelectionManagerTest::verifySelectionChange(QSignalSpy& spy, - const KItemSet& currentSelection, - const KItemSet& previousSelection) const +void KItemListSelectionManagerTest::verifySelectionChange(QSignalSpy &spy, const KItemSet ¤tSelection, const KItemSet &previousSelection) const { QCOMPARE(m_selectionManager->selectedItems(), currentSelection); QCOMPARE(m_selectionManager->hasSelection(), !currentSelection.isEmpty()); for (int index = 0; index < m_selectionManager->model()->count(); ++index) { if (currentSelection.contains(index)) { QVERIFY(m_selectionManager->isSelected(index)); - } - else { + } else { QVERIFY(!m_selectionManager->isSelected(index)); } } if (currentSelection == previousSelection) { QCOMPARE(spy.count(), 0); - } - else { + } else { QCOMPARE(spy.count(), 1); QList arguments = spy.takeFirst(); QCOMPARE(qvariant_cast(arguments.at(0)), currentSelection);