X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/a06ee3399bece608790e419054f95807a017a020..a1c9bc5595a21299dab9260c6a77c0561c95c8ba:/src/tests/kitemsettest.cpp diff --git a/src/tests/kitemsettest.cpp b/src/tests/kitemsettest.cpp index ed683e1a8..0005daceb 100644 --- a/src/tests/kitemsettest.cpp +++ b/src/tests/kitemsettest.cpp @@ -1,36 +1,23 @@ -/*************************************************************************** - * Copyright (C) 2013 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: 2013 Frank Reininghaus + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #include "kitemviews/kitemset.h" +#include #include -#include -Q_DECLARE_METATYPE(KItemRangeList); +Q_DECLARE_METATYPE(KItemRangeList) /** * Converts a KItemRangeList to a KItemSet. */ -KItemSet KItemRangeList2KItemSet(const KItemRangeList& itemRanges) +KItemSet KItemRangeList2KItemSet(const KItemRangeList &itemRanges) { KItemSet result; - foreach (const KItemRange& range, itemRanges) { + for (const KItemRange &range : itemRanges) { for (int i = range.index; i < range.index + range.count; ++i) { result.insert(i); } @@ -41,10 +28,10 @@ KItemSet KItemRangeList2KItemSet(const KItemRangeList& itemRanges) /** * Converts a KItemRangeList to a QSet. */ -QSet KItemRangeList2QSet(const KItemRangeList& itemRanges) +QSet KItemRangeList2QSet(const KItemRangeList &itemRanges) { QSet result; - foreach (const KItemRange& range, itemRanges) { + for (const KItemRange &range : itemRanges) { for (int i = range.index; i < range.index + range.count; ++i) { result.insert(i); } @@ -55,10 +42,10 @@ QSet KItemRangeList2QSet(const KItemRangeList& itemRanges) /** * Converts a KItemRangeList to a QVector. */ -QVector KItemRangeList2QVector(const KItemRangeList& itemRanges) +QVector KItemRangeList2QVector(const KItemRangeList &itemRanges) { QVector result; - foreach (const KItemRange& range, itemRanges) { + for (const KItemRange &range : itemRanges) { for (int i = range.index; i < range.index + range.count; ++i) { result.append(i); } @@ -69,28 +56,27 @@ QVector KItemRangeList2QVector(const KItemRangeList& itemRanges) /** * Converts a KItemSet to a QSet. */ -static QSet KItemSet2QSet(const KItemSet& itemSet) +static QSet KItemSet2QSet(const KItemSet &itemSet) { QSet result; - foreach (int i, itemSet) { + for (int i : itemSet) { result.insert(i); } // Check that the conversion was successful. Q_ASSERT(itemSet.count() == result.count()); - foreach (int i, itemSet) { + for (int i : std::as_const(itemSet)) { Q_ASSERT(result.contains(i)); } - foreach (int i, result) { + for (int i : std::as_const(result)) { Q_ASSERT(itemSet.contains(i)); } return result; } - /** * The main test class. */ @@ -98,7 +84,7 @@ class KItemSetTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void testConstruction_data(); @@ -119,11 +105,13 @@ private slots: void testSymmetricDifference(); private: - QHash m_testCases; + QHash m_testCases; }; void KItemSetTest::initTestCase() { + QStandardPaths::setTestModeEnabled(true); + m_testCases.insert("empty", KItemRangeList()); m_testCases.insert("[0]", KItemRangeList() << KItemRange(0, 1)); m_testCases.insert("[1]", KItemRangeList() << KItemRange(1, 1)); @@ -133,7 +121,8 @@ void KItemSetTest::initTestCase() m_testCases.insert("[1, 2] [4, 5]", KItemRangeList() << KItemRange(1, 2) << KItemRange(4, 2)); m_testCases.insert("[1, 5]", KItemRangeList() << KItemRange(1, 5)); m_testCases.insert("[1, 2] [4, 5] [7] [9, 10] [13] [20, 25] [30]", - KItemRangeList() << KItemRange(1, 2) << KItemRange(4, 2) << KItemRange(7, 1) << KItemRange(9, 2) << KItemRange(20, 6) << KItemRange(30, 1)); + KItemRangeList() << KItemRange(1, 2) << KItemRange(4, 2) << KItemRange(7, 1) << KItemRange(9, 2) << KItemRange(20, 6) + << KItemRange(30, 1)); m_testCases.insert("[-10, -1]", KItemRangeList() << KItemRange(-10, 10)); m_testCases.insert("[-10, 0]", KItemRangeList() << KItemRange(-10, 11)); m_testCases.insert("[-10, 1]", KItemRangeList() << KItemRange(-10, 12)); @@ -145,8 +134,8 @@ void KItemSetTest::testConstruction_data() { QTest::addColumn("itemRanges"); - QHash::const_iterator it = m_testCases.constBegin(); - const QHash::const_iterator end = m_testCases.constEnd(); + QHash::const_iterator it = m_testCases.constBegin(); + const QHash::const_iterator end = m_testCases.constEnd(); while (it != end) { QTest::newRow(it.key()) << it.value(); @@ -181,8 +170,8 @@ void KItemSetTest::testIterators_data() { QTest::addColumn("itemRanges"); - QHash::const_iterator it = m_testCases.constBegin(); - const QHash::const_iterator end = m_testCases.constEnd(); + QHash::const_iterator it = m_testCases.constBegin(); + const QHash::const_iterator end = m_testCases.constEnd(); while (it != end) { QTest::newRow(it.key()) << it.value(); @@ -204,7 +193,7 @@ void KItemSetTest::testIterators() QVERIFY(itemSet.isValid()); QVERIFY(itemSet.count() == itemsQVector.count()); - if (itemSet.count() == 0) { + if (itemSet.isEmpty()) { QVERIFY(itemSet.isEmpty()); QVERIFY(itemSet.begin() == itemSet.end()); QVERIFY(itemSet.constBegin() == itemSet.constEnd()); @@ -239,7 +228,7 @@ void KItemSetTest::testIterators() QCOMPARE(testQVector, itemsQVector); testQVector.clear(); - foreach (int i, itemSet) { + for (int i : itemSet) { testQVector.append(i); } QCOMPARE(testQVector, itemsQVector); @@ -316,8 +305,8 @@ void KItemSetTest::testFind_data() { QTest::addColumn("itemRanges"); - QHash::const_iterator it = m_testCases.constBegin(); - const QHash::const_iterator end = m_testCases.constEnd(); + QHash::const_iterator it = m_testCases.constBegin(); + const QHash::const_iterator end = m_testCases.constEnd(); while (it != end) { QTest::newRow(it.key()) << it.value(); @@ -327,7 +316,7 @@ void KItemSetTest::testFind_data() /** * Test all functions that find items: - * contais(int), find(int), constFind(int) + * contains(int), find(int), constFind(int) */ void KItemSetTest::testFind() { @@ -343,7 +332,7 @@ void KItemSetTest::testFind() int min; int max; - if (itemSet.count() == 0) { + if (itemSet.isEmpty()) { // Use some arbitrary values for the upcoming tests. min = 0; max = 5; @@ -375,8 +364,8 @@ void KItemSetTest::testChangingOneItem_data() { QTest::addColumn("itemRanges"); - QHash::const_iterator it = m_testCases.constBegin(); - const QHash::const_iterator end = m_testCases.constEnd(); + QHash::const_iterator it = m_testCases.constBegin(); + const QHash::const_iterator end = m_testCases.constEnd(); while (it != end) { QTest::newRow(it.key()) << it.value(); @@ -402,7 +391,7 @@ void KItemSetTest::testChangingOneItem() int min; int max; - if (itemSet.count() == 0) { + if (itemSet.isEmpty()) { // Use some arbitrary values for the upcoming tests. min = 0; max = 5; @@ -414,7 +403,6 @@ void KItemSetTest::testChangingOneItem() // Test insert(int), remove(int), and erase(KItemSet::iterator) // for items between min - 2 and max + 2. for (int i = min - 2; i <= max + 2; ++i) { - // Test insert(int). { KItemSet tmp(itemSet); @@ -499,7 +487,7 @@ void KItemSetTest::testChangingOneItem() QCOMPARE(tmp.end(), tmp.find(i)); QCOMPARE(tmp.constEnd(), tmp.constFind(i)); - // Check the returen value, now contained in 'it'. + // Check the returned value, now contained in 'it'. if (i == max) { QCOMPARE(it, tmp.end()); } else { @@ -523,11 +511,11 @@ void KItemSetTest::testAddSets_data() QTest::addColumn("itemRanges1"); QTest::addColumn("itemRanges2"); - QHash::const_iterator it1 = m_testCases.constBegin(); - const QHash::const_iterator end = m_testCases.constEnd(); + QHash::const_iterator it1 = m_testCases.constBegin(); + const QHash::const_iterator end = m_testCases.constEnd(); while (it1 != end) { - QHash::const_iterator it2 = m_testCases.constBegin(); + QHash::const_iterator it2 = m_testCases.constBegin(); while (it2 != end) { QByteArray name = it1.key() + QByteArray(" + ") + it2.key(); @@ -562,11 +550,11 @@ void KItemSetTest::testSymmetricDifference_data() QTest::addColumn("itemRanges1"); QTest::addColumn("itemRanges2"); - QHash::const_iterator it1 = m_testCases.constBegin(); - const QHash::const_iterator end = m_testCases.constEnd(); + QHash::const_iterator it1 = m_testCases.constBegin(); + const QHash::const_iterator end = m_testCases.constEnd(); while (it1 != end) { - QHash::const_iterator it2 = m_testCases.constBegin(); + QHash::const_iterator it2 = m_testCases.constBegin(); while (it2 != end) { QByteArray name = it1.key() + QByteArray(" ^ ") + it2.key(); @@ -605,7 +593,6 @@ void KItemSetTest::testSymmetricDifference() QCOMPARE(itemSet2 ^ symmetricDifference, itemSet1); } - -QTEST_MAIN(KItemSetTest) +QTEST_GUILESS_MAIN(KItemSetTest) #include "kitemsettest.moc"