From 989fca660c3556fa957ed9a3f7cd3b948a4166a2 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 6 Jul 2020 16:15:23 +0200 Subject: Use QList instead of QVector in corelib tests Task-number: QTBUG-84469 Change-Id: Ic80fde5517aed363f17d0da55cadcc958c3c8895 Reviewed-by: Friedemann Kleint --- .../corelib/tools/collections/tst_collections.cpp | 93 ++++++------- .../tst_containerapisymmetry.cpp | 15 +- .../corelib/tools/qalgorithms/tst_qalgorithms.cpp | 113 +++++++-------- .../corelib/tools/qarraydata/tst_qarraydata.cpp | 40 +++--- .../tools/qeasingcurve/tst_qeasingcurve.cpp | 2 +- tests/auto/corelib/tools/qflatmap/tst_qflatmap.cpp | 1 - tests/auto/corelib/tools/qlist/tst_qlist.cpp | 2 +- .../corelib/tools/qringbuffer/tst_qringbuffer.cpp | 4 +- .../tools/qsharedpointer/tst_qsharedpointer.cpp | 4 +- .../tools/qversionnumber/tst_qversionnumber.cpp | 154 ++++++++++----------- 10 files changed, 198 insertions(+), 230 deletions(-) (limited to 'tests/auto/corelib/tools') diff --git a/tests/auto/corelib/tools/collections/tst_collections.cpp b/tests/auto/corelib/tools/collections/tst_collections.cpp index f7b6f478cf..61a0db26de 100644 --- a/tests/auto/corelib/tools/collections/tst_collections.cpp +++ b/tests/auto/corelib/tools/collections/tst_collections.cpp @@ -42,7 +42,7 @@ static QSet *setX; static QStack *stackX; static QVarLengthArray *varLengthArrayX; static QVarLengthArray *varLengthArrayY; -static QVector *vectorX; +static QList *vectorX; void foo() { @@ -78,7 +78,6 @@ void foo() #include "qstring.h" #include "qstringlist.h" #include "qvarlengtharray.h" -#include "qvector.h" #include "qqueue.h" class tst_Collections : public QObject @@ -470,7 +469,7 @@ void tst_Collections::list() } { - QVector vector(5); + QList vector(5); vector[0] = "99"; vector[4] ="100"; QList list = vector.toList(); @@ -726,7 +725,7 @@ void tst_Collections::list() void tst_Collections::vector() { - QVector v1; + QList v1; v1 << 1 << 2 << 3; QVector v2; v2 << 4 << 5; @@ -2495,13 +2494,12 @@ void testMapLikeStlIterators() void tst_Collections::constAndNonConstStlIterators() { - testListLikeStlIterators >(); - testListLikeStlIterators(); - testListLikeStlIterators >(); - testMapLikeStlIterators >(); - testMapLikeStlIterators >(); - testMapLikeStlIterators >(); - testMapLikeStlIterators >(); + testListLikeStlIterators>(); + testListLikeStlIterators(); + testMapLikeStlIterators>(); + testMapLikeStlIterators>(); + testMapLikeStlIterators>(); + testMapLikeStlIterators>(); } void tst_Collections::vector_stl_data() @@ -2518,7 +2516,7 @@ void tst_Collections::vector_stl() { QFETCH(QStringList, elements); - QVector vector; + QList vector; for (int i = 0; i < elements.count(); ++i) vector << elements.at(i); @@ -2534,9 +2532,9 @@ void tst_Collections::vector_stl() QCOMPARE(*it, vector[j]); #if QT_VERSION < QT_VERSION_CHECK(6,0,0) - QCOMPARE(QVector::fromStdVector(stdVector), vector); + QCOMPARE(QList::fromStdVector(stdVector), vector); #endif - QCOMPARE(QVector(stdVector.begin(), stdVector.end()), vector); + QCOMPARE(QList(stdVector.begin(), stdVector.end()), vector); } void tst_Collections::list_stl_data() @@ -2789,10 +2787,6 @@ void tst_Collections::containerInstantiation() list.removeAll(value); } - //Instantiate QVector member functions. - typedef QVector Vector; - instantiateRandomAccess(); - //Instantiate QQueue member functions. typedef QQueue Queue; instantiateRandomAccess(); @@ -2883,7 +2877,6 @@ void testSetContainerTypedefs(Container container) */ void tst_Collections::containerTypedefs() { - testContainerTypedefs(QVector()); testContainerTypedefs(QStack()); testContainerTypedefs(QList()); testContainerTypedefs(QQueue()); @@ -3032,18 +3025,18 @@ void testAssociativeContainerAlignment() void tst_Collections::alignment() { - testVectorAlignment >(); - testVectorAlignment >(); - testContiguousCacheAlignment >(); - testContiguousCacheAlignment >(); - testAssociativeContainerAlignment >(); - testAssociativeContainerAlignment >(); - testAssociativeContainerAlignment >(); - testAssociativeContainerAlignment >(); - testAssociativeContainerAlignment >(); - testAssociativeContainerAlignment >(); - testAssociativeContainerAlignment >(); - testAssociativeContainerAlignment >(); + testVectorAlignment>(); + testVectorAlignment>(); + testContiguousCacheAlignment>(); + testContiguousCacheAlignment>(); + testAssociativeContainerAlignment>(); + testAssociativeContainerAlignment>(); + testAssociativeContainerAlignment>(); + testAssociativeContainerAlignment>(); + testAssociativeContainerAlignment>(); + testAssociativeContainerAlignment>(); + testAssociativeContainerAlignment>(); + testAssociativeContainerAlignment>(); } #ifndef QT_NO_TEMPLATE_TEMPLATE_PARAMETERS @@ -3327,25 +3320,25 @@ using ExtList = QList; void tst_Collections::insert_remove_loop() { - insert_remove_loop_impl >(); - insert_remove_loop_impl >(); - insert_remove_loop_impl >(); - insert_remove_loop_impl >(); - insert_remove_loop_impl >(); - insert_remove_loop_impl >(); - insert_remove_loop_impl >(); - insert_remove_loop_impl >(); - insert_remove_loop_impl >(); - insert_remove_loop_impl >(); - insert_remove_loop_impl >(); - insert_remove_loop_impl >(); - - insert_remove_loop_impl >(); - insert_remove_loop_impl >(); - insert_remove_loop_impl >(); - insert_remove_loop_impl >(); - insert_remove_loop_impl >(); - insert_remove_loop_impl >(); + insert_remove_loop_impl>(); + insert_remove_loop_impl>(); + insert_remove_loop_impl>(); + insert_remove_loop_impl>(); + insert_remove_loop_impl>(); + insert_remove_loop_impl>(); + insert_remove_loop_impl>(); + insert_remove_loop_impl>(); + insert_remove_loop_impl>(); + insert_remove_loop_impl>(); + insert_remove_loop_impl>(); + insert_remove_loop_impl>(); + + insert_remove_loop_impl>(); + insert_remove_loop_impl>(); + insert_remove_loop_impl>(); + insert_remove_loop_impl>(); + insert_remove_loop_impl>(); + insert_remove_loop_impl>(); } diff --git a/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp b/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp index 558c15d441..a7fa5094c5 100644 --- a/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp +++ b/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp @@ -29,12 +29,11 @@ #include #include "qbytearray.h" +#include "qdebug.h" +#include "qhash.h" #include "qlist.h" #include "qstring.h" #include "qvarlengtharray.h" -#include "qvector.h" -#include "qhash.h" -#include "qdebug.h" #include #include @@ -269,19 +268,14 @@ private Q_SLOTS: void ranged_ctor_std_vector_Complex() { ranged_ctor_non_associative_impl>(); } void ranged_ctor_std_vector_duplicates_strategy() { non_associative_container_duplicates_strategy(); } - void ranged_ctor_QVector_int() { ranged_ctor_non_associative_impl>(); } - void ranged_ctor_QVector_char() { ranged_ctor_non_associative_impl>(); } - void ranged_ctor_QVector_QChar() { ranged_ctor_non_associative_impl>(); } - void ranged_ctor_QVector_Movable() { ranged_ctor_non_associative_impl>(); } - void ranged_ctor_QVector_Complex() { ranged_ctor_non_associative_impl>(); } - void ranged_ctor_QVector_duplicates_strategy() { non_associative_container_duplicates_strategy(); } - void ranged_ctor_QVarLengthArray_int() { ranged_ctor_non_associative_impl>(); } void ranged_ctor_QVarLengthArray_Movable() { ranged_ctor_non_associative_impl>(); } void ranged_ctor_QVarLengthArray_Complex() { ranged_ctor_non_associative_impl>(); } void ranged_ctor_QVarLengthArray_duplicates_strategy() { non_associative_container_duplicates_strategy(); } // note the VarLengthArray passed void ranged_ctor_QList_int() { ranged_ctor_non_associative_impl>(); } + void ranged_ctor_QList_char() { ranged_ctor_non_associative_impl>(); } + void ranged_ctor_QList_QChar() { ranged_ctor_non_associative_impl>(); } void ranged_ctor_QList_Movable() { ranged_ctor_non_associative_impl>(); } void ranged_ctor_QList_Complex() { ranged_ctor_non_associative_impl>(); } void ranged_ctor_QList_duplicates_strategy() { non_associative_container_duplicates_strategy(); } @@ -474,7 +468,6 @@ private: private Q_SLOTS: void front_back_std_vector() { front_back_impl>(); } - void front_back_QVector() { front_back_impl>(); } void front_back_QList() { front_back_impl>(); } void front_back_QVarLengthArray() { front_back_impl>(); } void front_back_QString() { front_back_impl(); } diff --git a/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp index aac429043d..078351f388 100644 --- a/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp +++ b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp @@ -35,10 +35,10 @@ #include #include #include -#include -#include +#include #include -#include +#include +#include #define Q_TEST_PERFORMANCE 0 @@ -137,9 +137,9 @@ QStringList dataSetTypes = QStringList() << "Random" << "Ascending" << "Descending" << "Equal" << "Duplicates" << "Almost Sorted" ; template -QVector generateData(QString dataSetType, const int length) +QList generateData(QString dataSetType, const int length) { - QVector container; + QList container; if (dataSetType == "Random") { for (int i = 0; i < length; ++i) container.append(QRandomGenerator::global()->generate()); @@ -236,7 +236,7 @@ QList testAlgorithm(Algorithm &algorithm, QStringList dataSetTypes, { QList results; foreach(QString dataSetType, dataSetTypes) { - QVector container = generateData(dataSetType, size); + QList container = generateData(dataSetType, size); results.append(testRun(container, algorithm, time)); if (!isSorted(container)) qWarning("%s: container is not sorted after test", Q_FUNC_INFO); @@ -534,22 +534,6 @@ void tst_QAlgorithms::qBinaryFindOneEntry() void tst_QAlgorithms::sortAPItest() { - QVector testVector = generateData("Random", 101); - qSort(testVector); - QVERIFY(isSorted(testVector)); - qSort(testVector.begin(), testVector.end()); - QVERIFY(isSorted(testVector)); - qSort(testVector.begin(), testVector.end(), qLess()); - QVERIFY(isSorted(testVector)); - - testVector = generateData("Random", 71); - qStableSort(testVector); - QVERIFY(isSorted(testVector)); - qStableSort(testVector.begin(), testVector.end()); - QVERIFY(isSorted(testVector)); - qStableSort(testVector.begin(), testVector.end(), qLess()); - QVERIFY(isSorted(testVector)); - QList testList = generateData("Random", 101).toList(); qSort(testList); QVERIFY(isSorted(testList)); @@ -582,15 +566,14 @@ int Minor; ostream &operator<<(ostream &out, const StableSortTest& obj) { out << obj.Major << "-" << obj.Minor; return out; } -QVector createStableTestVector() +QList createStableTestList() { - QVector stableTestVector; - for (int i=500; i>=0; --i) { - for (int j=0; j<10; ++j) { - stableTestVector.append(StableSortTest(i, j)); - } + QList stableTestList; + for (int i = 500; i >= 0; --i) { + for (int j = 0; j < 10; ++j) + stableTestList.append(StableSortTest(i, j)); } - return stableTestVector; + return stableTestList; } template @@ -614,52 +597,52 @@ void tst_QAlgorithms::stableSortTest() { // Selftests: { - QVector stableTestVector = createStableTestVector(); - qSort(stableTestVector.begin(), stableTestVector.end(), qLess()); - QVERIFY(isSorted(stableTestVector, qLess())); - QVERIFY(!isStableSorted(stableTestVector, qLess())); + QList stableTestList = createStableTestList(); + qSort(stableTestList.begin(), stableTestList.end(), qLess()); + QVERIFY(isSorted(stableTestList, qLess())); + QVERIFY(!isStableSorted(stableTestList, qLess())); } { - QVector stableTestVector = createStableTestVector(); - qSort(stableTestVector.begin(), stableTestVector.end(), qGreater()); - QVERIFY(isSorted(stableTestVector, qGreater())); - QVERIFY(!isStableSorted(stableTestVector, qGreater())); + QList stableTestList = createStableTestList(); + qSort(stableTestList.begin(), stableTestList.end(), qGreater()); + QVERIFY(isSorted(stableTestList, qGreater())); + QVERIFY(!isStableSorted(stableTestList, qGreater())); } { - QVector stableTestVector = createStableTestVector(); - qSort(stableTestVector.begin(), stableTestVector.end(), qGreater()); - QVERIFY(!isSorted(stableTestVector, qLess())); - QVERIFY(!isStableSorted(stableTestVector, qGreater())); + QList stableTestList = createStableTestList(); + qSort(stableTestList.begin(), stableTestList.end(), qGreater()); + QVERIFY(!isSorted(stableTestList, qLess())); + QVERIFY(!isStableSorted(stableTestList, qGreater())); } // Stable sort with qLess { - QVector stableTestVector = createStableTestVector(); - std::stable_sort(stableTestVector.begin(), stableTestVector.end(), qLess()); - QVERIFY(isSorted(stableTestVector, qLess())); - QVERIFY(isStableSorted(stableTestVector, qLess())); + QList stableTestList = createStableTestList(); + std::stable_sort(stableTestList.begin(), stableTestList.end(), qLess()); + QVERIFY(isSorted(stableTestList, qLess())); + QVERIFY(isStableSorted(stableTestList, qLess())); } { - QVector stableTestVector = createStableTestVector(); - qStableSort(stableTestVector.begin(), stableTestVector.end(), qLess()); - QVERIFY(isSorted(stableTestVector, qLess())); - QVERIFY(isStableSorted(stableTestVector, qLess())); + QList stableTestList = createStableTestList(); + qStableSort(stableTestList.begin(), stableTestList.end(), qLess()); + QVERIFY(isSorted(stableTestList, qLess())); + QVERIFY(isStableSorted(stableTestList, qLess())); } // Stable sort with qGreater { - QVector stableTestVector = createStableTestVector(); - std::stable_sort(stableTestVector.begin(), stableTestVector.end(), qGreater()); - QVERIFY(isSorted(stableTestVector, qGreater())); - QVERIFY(isStableSorted(stableTestVector, qGreater())); + QList stableTestList = createStableTestList(); + std::stable_sort(stableTestList.begin(), stableTestList.end(), qGreater()); + QVERIFY(isSorted(stableTestList, qGreater())); + QVERIFY(isStableSorted(stableTestList, qGreater())); } { - QVector stableTestVector = createStableTestVector(); - qStableSort(stableTestVector.begin(), stableTestVector.end(), qGreater()); - QVERIFY(isSorted(stableTestVector, qGreater())); - QVERIFY(isStableSorted(stableTestVector, qGreater())); + QList stableTestList = createStableTestList(); + qStableSort(stableTestList.begin(), stableTestList.end(), qGreater()); + QVERIFY(isSorted(stableTestList, qGreater())); + QVERIFY(isStableSorted(stableTestList, qGreater())); } } @@ -667,8 +650,8 @@ void tst_QAlgorithms::stableSortTest() void tst_QAlgorithms::stableSortCorrectnessTest_data() { const int dataSize = 1000; - QTest::addColumn >("unsorted"); - QTest::newRow("From documentation") << (QVector() << 33 << 12 << 68 << 6 << 12); + QTest::addColumn>("unsorted"); + QTest::newRow("From documentation") << (QList() << 33 << 12 << 68 << 6 << 12); QTest::newRow("Equal") << (generateData("Equal", dataSize)); QTest::newRow("Ascending") << (generateData("Ascending", dataSize)); QTest::newRow("Descending") << (generateData("Descending", dataSize)); @@ -679,9 +662,9 @@ void tst_QAlgorithms::stableSortCorrectnessTest_data() void tst_QAlgorithms::stableSortCorrectnessTest() { - QFETCH(QVector, unsorted); + QFETCH(QList, unsorted); - QVector sorted = unsorted; + QList sorted = unsorted; qStableSort(sorted.begin(), sorted.end()); // Verify that sorted contains the same numbers as unsorted. @@ -743,7 +726,7 @@ template class QuickSortHelper { public: - void operator()(QVector list) + void operator()(QList list) { ::qSort(list); } @@ -753,7 +736,7 @@ template class StableSortHelper { public: - void operator()(QVector list) + void operator()(QList list) { ::qStableSort(list); } @@ -763,7 +746,7 @@ template class StlSortHelper { public: - void operator()(QVector list) + void operator()(QList list) { std::sort(list.begin(), list.end()); } @@ -773,7 +756,7 @@ template class StlStableSortHelper { public: - void operator()(QVector list) + void operator()(QList list) { std::stable_sort(list.begin(), list.end()); } diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp index 9ebcda4cef..c7f20ec6a4 100644 --- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp +++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp @@ -417,7 +417,7 @@ struct Deallocator size_t objectSize; size_t alignment; - QVector headers; + QList headers; }; Q_DECLARE_METATYPE(const QArrayData *) @@ -652,7 +652,7 @@ void tst_QArrayData::gccBug43247() { // This test tries to verify QArrayData is not affected by GCC optimizer // bug #43247. - // Reported on GCC 4.4.3, Linux, affects QVector + // Reported on GCC 4.4.3, Linux, affects QList QTest::ignoreMessage(QtDebugMsg, "GCC Optimization bug #43247 not triggered (3)"); QTest::ignoreMessage(QtDebugMsg, "GCC Optimization bug #43247 not triggered (4)"); @@ -661,7 +661,7 @@ void tst_QArrayData::gccBug43247() QTest::ignoreMessage(QtDebugMsg, "GCC Optimization bug #43247 not triggered (7)"); SimpleVector array(10, 0); - // QVector vector(10, 0); + // QList list(10, 0); for (int i = 0; i < 10; ++i) { if (i >= 3 && i < 8) @@ -671,7 +671,7 @@ void tst_QArrayData::gccBug43247() // line lets the compiler assume i == 0, and the conditional above is // skipped. QVERIFY(array.at(i) == 0); - // QVERIFY(vector.at(i) == 0); + // QVERIFY(list.at(i) == 0); } } @@ -1141,18 +1141,18 @@ void tst_QArrayData::literals() } { - QVector v(Q_ARRAY_LITERAL(char, "ABCDEFGHIJ")); - QCOMPARE(v.size(), 11); - QCOMPARE(v.capacity(), 0); + QList l(Q_ARRAY_LITERAL(char, "ABCDEFGHIJ")); + QCOMPARE(l.size(), 11); + QCOMPARE(l.capacity(), 0); for (int i = 0; i < 10; ++i) - QCOMPARE(v.at(i), char('A' + i)); + QCOMPARE(l.at(i), char('A' + i)); - (void)v.begin(); // "detach" + (void)l.begin(); // "detach" - QCOMPARE(v.size(), 11); - QVERIFY(v.capacity() >= v.size()); + QCOMPARE(l.size(), 11); + QVERIFY(l.capacity() >= l.size()); for (int i = 0; i < 10; ++i) - QCOMPARE(v[i], char('A' + i)); + QCOMPARE(l[i], char('A' + i)); } { @@ -1176,18 +1176,18 @@ void tst_QArrayData::literals() } { - QVector v(Q_ARRAY_LITERAL(LiteralType, LiteralType(0), LiteralType(1), LiteralType(2))); - QCOMPARE(v.size(), 3); - QCOMPARE(v.capacity(), 0); + QList l(Q_ARRAY_LITERAL(LiteralType, LiteralType(0), LiteralType(1), LiteralType(2))); + QCOMPARE(l.size(), 3); + QCOMPARE(l.capacity(), 0); for (int i = 0; i < 3; ++i) - QCOMPARE(v.at(i).value, i); + QCOMPARE(l.at(i).value, i); - (void)v.begin(); // "detach" + (void)l.begin(); // "detach" - QCOMPARE(v.size(), 3); - QVERIFY(v.capacity() >= v.size()); + QCOMPARE(l.size(), 3); + QVERIFY(l.capacity() >= l.size()); for (int i = 0; i < 3; ++i) - QCOMPARE(v[i].value, i); + QCOMPARE(l[i].value, i); } } diff --git a/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp index 898ac86874..9b32d3a797 100644 --- a/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp +++ b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp @@ -602,7 +602,7 @@ static inline void setupBezierSpline(QEasingCurve *easingCurve, const QString &s { QStringList pointStr = string.split(QLatin1Char(' ')); - QVector points; + QList points; foreach (const QString &str, pointStr) { QStringList coordStr = str.split(QLatin1Char(',')); QPointF point(coordStr.first().toDouble(), coordStr.last().toDouble()); diff --git a/tests/auto/corelib/tools/qflatmap/tst_qflatmap.cpp b/tests/auto/corelib/tools/qflatmap/tst_qflatmap.cpp index a5ae6f5f44..dbde140d70 100644 --- a/tests/auto/corelib/tools/qflatmap/tst_qflatmap.cpp +++ b/tests/auto/corelib/tools/qflatmap/tst_qflatmap.cpp @@ -33,7 +33,6 @@ #include #include #include -#include #include #include diff --git a/tests/auto/corelib/tools/qlist/tst_qlist.cpp b/tests/auto/corelib/tools/qlist/tst_qlist.cpp index fbd5cf6402..e2044288d2 100644 --- a/tests/auto/corelib/tools/qlist/tst_qlist.cpp +++ b/tests/auto/corelib/tools/qlist/tst_qlist.cpp @@ -2826,7 +2826,7 @@ void tst_QList::emplaceConsistentWithStdVectorImpl() const vecEq(qVec, stdVec); T t; - // while QVector is safe with regards to emplacing elements moved form itself, it's UB + // while QList is safe with regards to emplacing elements moved form itself, it's UB // for std::vector, so do the moving in two steps there. qVec.emplaceBack(std::move(qVec[0])); stdVec.emplace_back(std::move(t = std::move(stdVec[0]))); diff --git a/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp b/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp index e355a7fcfb..10e6294b48 100644 --- a/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp +++ b/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include class tst_QRingBuffer : public QObject { @@ -82,7 +82,7 @@ void tst_QRingBuffer::constructing() void tst_QRingBuffer::usingInVector() { QRingBuffer ringBuffer; - QVector buffers; + QList buffers; ringBuffer.reserve(5); buffers.append(ringBuffer); diff --git a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp index cfc1f13cb2..ccbae61c06 100644 --- a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp +++ b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp @@ -31,9 +31,9 @@ #include "qsharedpointer.h" #include #include +#include #include #include -#include #include "externaltests.h" #include "forwarddeclared.h" @@ -2114,7 +2114,7 @@ void tst_QSharedPointer::threadStressTest() memset(guard2, 0, sizeof guard2); for (int r = 0; r < 5; ++r) { - QVector allThreads(6 * qMax(strongThreadCount, weakThreadCount) + 3, 0); + QList allThreads(6 * qMax(strongThreadCount, weakThreadCount) + 3, 0); QSharedPointer base = QSharedPointer(new ThreadData(&counter)); counter.storeRelaxed(0); diff --git a/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp b/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp index 928bd365fd..291fcca88c 100644 --- a/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp +++ b/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp @@ -89,56 +89,56 @@ private slots: void tst_QVersionNumber::singleInstanceData() { - QTest::addColumn >("segments"); + QTest::addColumn>("segments"); QTest::addColumn("expectedVersion"); QTest::addColumn("expectedString"); QTest::addColumn("constructionString"); QTest::addColumn("suffixIndex"); QTest::addColumn("isNull"); - // segments expectedVersion expectedString constructionString suffixIndex null - QTest::newRow("null") << QVector() << QVersionNumber(QVector()) << QString() << QString() << 0 << true; - QTest::newRow("text") << QVector() << QVersionNumber(QVector()) << QString() << QStringLiteral("text") << 0 << true; - QTest::newRow(" text") << QVector() << QVersionNumber(QVector()) << QString() << QStringLiteral(" text") << 0 << true; - QTest::newRow("Empty String") << QVector() << QVersionNumber(QVector()) << QString() << QStringLiteral("Empty String") << 0 << true; - QTest::newRow("-1.-2") << (QVector()) << QVersionNumber() << QStringLiteral("") << QStringLiteral("-1.-2") << 0 << true; - QTest::newRow("1.-2-3") << (QVector() << 1) << QVersionNumber(QVector() << 1) << QStringLiteral("1") << QStringLiteral("1.-2-3") << 1 << false; - QTest::newRow("1.2-3") << (QVector() << 1 << 2) << QVersionNumber(QVector() << 1 << 2) << QStringLiteral("1.2") << QStringLiteral("1.2-3") << 3 << false; - QTest::newRow("0") << (QVector() << 0) << QVersionNumber(QVector() << 0) << QStringLiteral("0") << QStringLiteral("0") << 1 << false; - QTest::newRow("0.1") << (QVector() << 0 << 1) << QVersionNumber(QVector() << 0 << 1) << QStringLiteral("0.1") << QStringLiteral("0.1") << 3 << false; - QTest::newRow("0.1.2") << (QVector() << 0 << 1 << 2) << QVersionNumber(0, 1, 2) << QStringLiteral("0.1.2") << QStringLiteral("0.1.2") << 5 << false; - QTest::newRow("0.1.2alpha") << (QVector() << 0 << 1 << 2) << QVersionNumber(0, 1, 2) << QStringLiteral("0.1.2") << QStringLiteral("0.1.2alpha") << 5 << false; - QTest::newRow("0.1.2-alpha") << (QVector() << 0 << 1 << 2) << QVersionNumber(0, 1, 2) << QStringLiteral("0.1.2") << QStringLiteral("0.1.2-alpha") << 5 << false; - QTest::newRow("0.1.2.alpha") << (QVector() << 0 << 1 << 2) << QVersionNumber(0, 1, 2) << QStringLiteral("0.1.2") << QStringLiteral("0.1.2.alpha") << 5 << false; - QTest::newRow("0.1.2.3alpha") << (QVector() << 0 << 1 << 2 << 3) << QVersionNumber(QVector() << 0 << 1 << 2 << 3) << QStringLiteral("0.1.2.3") << QStringLiteral("0.1.2.3alpha") << 7 << false; - QTest::newRow("0.1.2.3.alpha") << (QVector() << 0 << 1 << 2 << 3) << QVersionNumber(QVector() << 0 << 1 << 2 << 3) << QStringLiteral("0.1.2.3") << QStringLiteral("0.1.2.3.alpha") << 7 << false; - QTest::newRow("0.1.2.3.4.alpha") << (QVector() << 0 << 1 << 2 << 3 << 4) << QVersionNumber(QVector() << 0 << 1 << 2 << 3 << 4) << QStringLiteral("0.1.2.3.4") << QStringLiteral("0.1.2.3.4.alpha") << 9 << false; - QTest::newRow("0.1.2.3.4 alpha") << (QVector() << 0 << 1 << 2 << 3 << 4) << QVersionNumber(QVector() << 0 << 1 << 2 << 3 << 4) << QStringLiteral("0.1.2.3.4") << QStringLiteral("0.1.2.3.4 alpha") << 9 << false; - QTest::newRow("0.1.2.3.4 alp ha") << (QVector() << 0 << 1 << 2 << 3 << 4) << QVersionNumber(QVector() << 0 << 1 << 2 << 3 << 4) << QStringLiteral("0.1.2.3.4") << QStringLiteral("0.1.2.3.4 alp ha") << 9 << false; - QTest::newRow("0.1.2.3.4alp ha") << (QVector() << 0 << 1 << 2 << 3 << 4) << QVersionNumber(QVector() << 0 << 1 << 2 << 3 << 4) << QStringLiteral("0.1.2.3.4") << QStringLiteral("0.1.2.3.4alp ha") << 9 << false; - QTest::newRow("0.1.2.3.4alpha ") << (QVector() << 0 << 1 << 2 << 3 << 4) << QVersionNumber(QVector() << 0 << 1 << 2 << 3 << 4) << QStringLiteral("0.1.2.3.4") << QStringLiteral("0.1.2.3.4alpha ") << 9 << false; - QTest::newRow("0.1.2.3.4.5alpha ") << (QVector() << 0 << 1 << 2 << 3 << 4 << 5) << QVersionNumber(QVector() << 0 << 1 << 2 << 3 << 4 << 5) << QStringLiteral("0.1.2.3.4.5") << QStringLiteral("0.1.2.3.4.5alpha ") << 11 << false; - QTest::newRow("0.1.2.3.4.5.6alpha ") << (QVector() << 0 << 1 << 2 << 3 << 4 << 5 << 6) << QVersionNumber(QVector() << 0 << 1 << 2 << 3 << 4 << 5 << 6) << QStringLiteral("0.1.2.3.4.5.6") << QStringLiteral("0.1.2.3.4.5.6alpha ") << 13 << false; - QTest::newRow("0.1.2.3.4.5.6.7alpha ") << (QVector() << 0 << 1 << 2 << 3 << 4 << 5 << 6 << 7) << QVersionNumber(QVector() << 0 << 1 << 2 << 3 << 4 << 5 << 6 << 7) << QStringLiteral("0.1.2.3.4.5.6.7") << QStringLiteral("0.1.2.3.4.5.6.7alpha ") << 15 << false; - QTest::newRow("0.1.2.3.4.5.6.7.8alpha ") << (QVector() << 0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8) << QVersionNumber(QVector() << 0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8) << QStringLiteral("0.1.2.3.4.5.6.7.8") << QStringLiteral("0.1.2.3.4.5.6.7.8alpha ") << 17 << false; - QTest::newRow("0.1.2.3.4.5.6.7.8.alpha") << (QVector() << 0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8) << QVersionNumber(QVector() << 0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8) << QStringLiteral("0.1.2.3.4.5.6.7.8") << QStringLiteral("0.1.2.3.4.5.6.7.8.alpha") << 17 << false; - QTest::newRow("0.1.2.3.4.5.6.7.8 alpha") << (QVector() << 0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8) << QVersionNumber(QVector() << 0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8) << QStringLiteral("0.1.2.3.4.5.6.7.8") << QStringLiteral("0.1.2.3.4.5.6.7.8 alpha") << 17 << false; - QTest::newRow("0.1.2.3.4.5.6.7.8 alp ha") << (QVector() << 0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8) << QVersionNumber(QVector() << 0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8) << QStringLiteral("0.1.2.3.4.5.6.7.8") << QStringLiteral("0.1.2.3.4.5.6.7.8 alp ha") << 17 << false; - QTest::newRow("0.1.2.3.4.5.6.7.8alp ha") << (QVector() << 0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8) << QVersionNumber(QVector() << 0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8) << QStringLiteral("0.1.2.3.4.5.6.7.8") << QStringLiteral("0.1.2.3.4.5.6.7.8alp ha") << 17 << false; - QTest::newRow("10.09") << (QVector() << 10 << 9) << QVersionNumber(QVector() << 10 << 9) << QStringLiteral("10.9") << QStringLiteral("10.09") << 5 << false; - QTest::newRow("10.0x") << (QVector() << 10 << 0) << QVersionNumber(QVector() << 10 << 0) << QStringLiteral("10.0") << QStringLiteral("10.0x") << 4 << false; - QTest::newRow("10.0xTest") << (QVector() << 10 << 0) << QVersionNumber(QVector() << 10 << 0) << QStringLiteral("10.0") << QStringLiteral("10.0xTest") << 4 << false; - QTest::newRow("127.09") << (QVector() << 127 << 9) << QVersionNumber(QVector() << 127 << 9) << QStringLiteral("127.9") << QStringLiteral("127.09") << 6 << false; - QTest::newRow("127.0x") << (QVector() << 127 << 0) << QVersionNumber(QVector() << 127 << 0) << QStringLiteral("127.0") << QStringLiteral("127.0x") << 5 << false; - QTest::newRow("127.0xTest") << (QVector() << 127 << 0) << QVersionNumber(QVector() << 127 << 0) << QStringLiteral("127.0") << QStringLiteral("127.0xTest") << 5 << false; - QTest::newRow("128.09") << (QVector() << 128 << 9) << QVersionNumber(QVector() << 128 << 9) << QStringLiteral("128.9") << QStringLiteral("128.09") << 6 << false; - QTest::newRow("128.0x") << (QVector() << 128 << 0) << QVersionNumber(QVector() << 128 << 0) << QStringLiteral("128.0") << QStringLiteral("128.0x") << 5 << false; - QTest::newRow("128.0xTest") << (QVector() << 128 << 0) << QVersionNumber(QVector() << 128 << 0) << QStringLiteral("128.0") << QStringLiteral("128.0xTest") << 5 << false; + // segments expectedVersion expectedString constructionString suffixIndex null + QTest::newRow("null") << QList() << QVersionNumber() << QString() << QString() << 0 << true; + QTest::newRow("text") << QList() << QVersionNumber() << QString() << QStringLiteral("text") << 0 << true; + QTest::newRow(" text") << QList() << QVersionNumber() << QString() << QStringLiteral(" text") << 0 << true; + QTest::newRow("Empty String") << QList() << QVersionNumber() << QString() << QStringLiteral("Empty String") << 0 << true; + QTest::newRow("-1.-2") << QList() << QVersionNumber() << QStringLiteral("") << QStringLiteral("-1.-2") << 0 << true; + QTest::newRow("1.-2-3") << QList { 1 } << QVersionNumber(QList { 1 }) << QStringLiteral("1") << QStringLiteral("1.-2-3") << 1 << false; + QTest::newRow("1.2-3") << QList { 1, 2 } << QVersionNumber(QList { 1, 2 }) << QStringLiteral("1.2") << QStringLiteral("1.2-3") << 3 << false; + QTest::newRow("0") << QList { 0 } << QVersionNumber(QList { 0 }) << QStringLiteral("0") << QStringLiteral("0") << 1 << false; + QTest::newRow("0.1") << QList { 0, 1 } << QVersionNumber(QList { 0, 1 }) << QStringLiteral("0.1") << QStringLiteral("0.1") << 3 << false; + QTest::newRow("0.1.2") << QList { 0, 1, 2 } << QVersionNumber(QList { 0, 1, 2 }) << QStringLiteral("0.1.2") << QStringLiteral("0.1.2") << 5 << false; + QTest::newRow("0.1.2alpha") << QList { 0, 1, 2 } << QVersionNumber(QList { 0, 1, 2 }) << QStringLiteral("0.1.2") << QStringLiteral("0.1.2alpha") << 5 << false; + QTest::newRow("0.1.2-alpha") << QList { 0, 1, 2 } << QVersionNumber(QList { 0, 1, 2 }) << QStringLiteral("0.1.2") << QStringLiteral("0.1.2-alpha") << 5 << false; + QTest::newRow("0.1.2.alpha") << QList { 0, 1, 2 } << QVersionNumber(QList { 0, 1, 2 }) << QStringLiteral("0.1.2") << QStringLiteral("0.1.2.alpha") << 5 << false; + QTest::newRow("0.1.2.3alpha") << QList { 0, 1, 2, 3 } << QVersionNumber(QList { 0, 1, 2, 3 }) << QStringLiteral("0.1.2.3") << QStringLiteral("0.1.2.3alpha") << 7 << false; + QTest::newRow("0.1.2.3.alpha") << QList { 0, 1, 2, 3 } << QVersionNumber(QList { 0, 1, 2, 3 }) << QStringLiteral("0.1.2.3") << QStringLiteral("0.1.2.3.alpha") << 7 << false; + QTest::newRow("0.1.2.3.4.alpha") << QList { 0, 1, 2, 3, 4 } << QVersionNumber(QList { 0, 1, 2, 3, 4 }) << QStringLiteral("0.1.2.3.4") << QStringLiteral("0.1.2.3.4.alpha") << 9 << false; + QTest::newRow("0.1.2.3.4 alpha") << QList { 0, 1, 2, 3, 4 } << QVersionNumber(QList { 0, 1, 2, 3, 4 }) << QStringLiteral("0.1.2.3.4") << QStringLiteral("0.1.2.3.4 alpha") << 9 << false; + QTest::newRow("0.1.2.3.4 alp ha") << QList { 0, 1, 2, 3, 4 } << QVersionNumber(QList { 0, 1, 2, 3, 4 }) << QStringLiteral("0.1.2.3.4") << QStringLiteral("0.1.2.3.4 alp ha") << 9 << false; + QTest::newRow("0.1.2.3.4alp ha") << QList { 0, 1, 2, 3, 4 } << QVersionNumber(QList { 0, 1, 2, 3, 4 }) << QStringLiteral("0.1.2.3.4") << QStringLiteral("0.1.2.3.4alp ha") << 9 << false; + QTest::newRow("0.1.2.3.4alpha ") << QList { 0, 1, 2, 3, 4 } << QVersionNumber(QList { 0, 1, 2, 3, 4 }) << QStringLiteral("0.1.2.3.4") << QStringLiteral("0.1.2.3.4alpha ") << 9 << false; + QTest::newRow("0.1.2.3.4.5alpha ") << QList { 0, 1, 2, 3, 4, 5 } << QVersionNumber(QList { 0, 1, 2, 3, 4, 5 }) << QStringLiteral("0.1.2.3.4.5") << QStringLiteral("0.1.2.3.4.5alpha ") << 11 << false; + QTest::newRow("0.1.2.3.4.5.6alpha ") << QList { 0, 1, 2, 3, 4, 5, 6 } << QVersionNumber(QList { 0, 1, 2, 3, 4, 5, 6 }) << QStringLiteral("0.1.2.3.4.5.6") << QStringLiteral("0.1.2.3.4.5.6alpha ") << 13 << false; + QTest::newRow("0.1.2.3.4.5.6.7alpha ") << QList { 0, 1, 2, 3, 4, 5, 6, 7 } << QVersionNumber(QList { 0, 1, 2, 3, 4, 5, 6, 7 }) << QStringLiteral("0.1.2.3.4.5.6.7") << QStringLiteral("0.1.2.3.4.5.6.7alpha ") << 15 << false; + QTest::newRow("0.1.2.3.4.5.6.7.8alpha ") << QList { 0, 1, 2, 3, 4, 5, 6, 7, 8 } << QVersionNumber(QList { 0, 1, 2, 3, 4, 5, 6, 7, 8 }) << QStringLiteral("0.1.2.3.4.5.6.7.8") << QStringLiteral("0.1.2.3.4.5.6.7.8alpha ") << 17 << false; + QTest::newRow("0.1.2.3.4.5.6.7.8.alpha") << QList { 0, 1, 2, 3, 4, 5, 6, 7, 8 } << QVersionNumber(QList { 0, 1, 2, 3, 4, 5, 6, 7, 8 }) << QStringLiteral("0.1.2.3.4.5.6.7.8") << QStringLiteral("0.1.2.3.4.5.6.7.8.alpha") << 17 << false; + QTest::newRow("0.1.2.3.4.5.6.7.8 alpha") << QList { 0, 1, 2, 3, 4, 5, 6, 7, 8 } << QVersionNumber(QList { 0, 1, 2, 3, 4, 5, 6, 7, 8 }) << QStringLiteral("0.1.2.3.4.5.6.7.8") << QStringLiteral("0.1.2.3.4.5.6.7.8 alpha") << 17 << false; + QTest::newRow("0.1.2.3.4.5.6.7.8 alp ha") << QList { 0, 1, 2, 3, 4, 5, 6, 7, 8 } << QVersionNumber(QList { 0, 1, 2, 3, 4, 5, 6, 7, 8 }) << QStringLiteral("0.1.2.3.4.5.6.7.8") << QStringLiteral("0.1.2.3.4.5.6.7.8 alp ha") << 17 << false; + QTest::newRow("0.1.2.3.4.5.6.7.8alp ha") << QList { 0, 1, 2, 3, 4, 5, 6, 7, 8 } << QVersionNumber(QList { 0, 1, 2, 3, 4, 5, 6, 7, 8 }) << QStringLiteral("0.1.2.3.4.5.6.7.8") << QStringLiteral("0.1.2.3.4.5.6.7.8alp ha") << 17 << false; + QTest::newRow("10.09") << QList { 10, 9 } << QVersionNumber(QList { 10, 9 }) << QStringLiteral("10.9") << QStringLiteral("10.09") << 5 << false; + QTest::newRow("10.0x") << QList { 10, 0 } << QVersionNumber(QList { 10, 0 }) << QStringLiteral("10.0") << QStringLiteral("10.0x") << 4 << false; + QTest::newRow("10.0xTest") << QList { 10, 0 } << QVersionNumber(QList { 10, 0 }) << QStringLiteral("10.0") << QStringLiteral("10.0xTest") << 4 << false; + QTest::newRow("127.09") << QList { 127, 9 } << QVersionNumber(QList { 127, 9 }) << QStringLiteral("127.9") << QStringLiteral("127.09") << 6 << false; + QTest::newRow("127.0x") << QList { 127, 0 } << QVersionNumber(QList { 127, 0 }) << QStringLiteral("127.0") << QStringLiteral("127.0x") << 5 << false; + QTest::newRow("127.0xTest") << QList { 127, 0 } << QVersionNumber(QList { 127, 0 }) << QStringLiteral("127.0") << QStringLiteral("127.0xTest") << 5 << false; + QTest::newRow("128.09") << QList { 128, 9 } << QVersionNumber(QList { 128, 9 }) << QStringLiteral("128.9") << QStringLiteral("128.09") << 6 << false; + QTest::newRow("128.0x") << QList { 128, 0 } << QVersionNumber(QList { 128, 0 }) << QStringLiteral("128.0") << QStringLiteral("128.0x") << 5 << false; + QTest::newRow("128.0xTest") << QList { 128, 0 } << QVersionNumber(QList { 128, 0 }) << QStringLiteral("128.0") << QStringLiteral("128.0xTest") << 5 << false; } namespace UglyOperator { // ugh, but the alternative (operator <<) is even worse... -static inline QVector operator+(QVector v, int i) { v.push_back(i); return v; } +static inline QList operator+(QList v, int i) { v.push_back(i); return v; } } void tst_QVersionNumber::comparisonData() @@ -200,7 +200,7 @@ void tst_QVersionNumber::comparisonData() QTest::newRow("0.-129, 0") << QVersionNumber(0, -129) << QVersionNumber(0) << false << true << true << true << false << false << -129 << false << QVersionNumber(0); QTest::newRow("0, 0.-129") << QVersionNumber(0) << QVersionNumber(0, -129) << false << true << false << false << true << true << 129 << true << QVersionNumber(0); - const QVector common = QVector() << 0 << 1 << 2 << 3 << 4 << 5 << 6; + const QList common = QList({ 0, 1, 2, 3, 4, 5, 6 }); using namespace UglyOperator; QTest::newRow("0.1.2.3.4.5.6.0.1.2, 0.1.2.3.4.5.6.0.1") << QVersionNumber(common + 0 + 1 + 2) << QVersionNumber(common + 0 + 1) << false << true << false << false << true << true << 2 << false << QVersionNumber(common + 0 + 1); QTest::newRow("0.1.2.3.4.5.6.0.1, 0.1.2.3.4.5.6.0.1.2") << QVersionNumber(common + 0 + 1) << QVersionNumber(common + 0 + 1 + 2) << false << true << true << true << false << false << -2 << true << QVersionNumber(common + 0 + 1); @@ -217,7 +217,7 @@ void tst_QVersionNumber::comparisonData() void tst_QVersionNumber::initTestCase() { - qRegisterMetaType >(); + qRegisterMetaType>(); } void tst_QVersionNumber::constructorDefault() @@ -227,7 +227,7 @@ void tst_QVersionNumber::constructorDefault() QCOMPARE(version.majorVersion(), 0); QCOMPARE(version.minorVersion(), 0); QCOMPARE(version.microVersion(), 0); - QCOMPARE(version.segments(), QVector()); + QCOMPARE(version.segments(), QList()); } void tst_QVersionNumber::constructorVersioned_data() @@ -237,7 +237,7 @@ void tst_QVersionNumber::constructorVersioned_data() void tst_QVersionNumber::constructorVersioned() { - QFETCH(QVector, segments); + QFETCH(QList, segments); QFETCH(QVersionNumber, expectedVersion); QVersionNumber version(segments); @@ -250,17 +250,17 @@ void tst_QVersionNumber::constructorVersioned() void tst_QVersionNumber::constructorExplicit() { QVersionNumber v1(1); - QVersionNumber v2(QVector() << 1); + QVersionNumber v2(QList({ 1 })); QCOMPARE(v1.segments(), v2.segments()); QVersionNumber v3(1, 2); - QVersionNumber v4(QVector() << 1 << 2); + QVersionNumber v4(QList({ 1, 2 })); QCOMPARE(v3.segments(), v4.segments()); QVersionNumber v5(1, 2, 3); - QVersionNumber v6(QVector() << 1 << 2 << 3); + QVersionNumber v6(QList({ 1, 2, 3 })); QCOMPARE(v5.segments(), v6.segments()); @@ -277,7 +277,7 @@ void tst_QVersionNumber::constructorCopy_data() void tst_QVersionNumber::constructorCopy() { - QFETCH(QVector, segments); + QFETCH(QList, segments); QFETCH(QVersionNumber, expectedVersion); QVersionNumber original(segments); @@ -422,14 +422,14 @@ void tst_QVersionNumber::normalized_data() QTest::addColumn("version"); QTest::addColumn("expected"); - QTest::newRow("0") << QVersionNumber(0) << QVersionNumber(); - QTest::newRow("1") << QVersionNumber(1) << QVersionNumber(1); - QTest::newRow("1.2") << QVersionNumber(1, 2) << QVersionNumber(1, 2); - QTest::newRow("1.0") << QVersionNumber(1, 0) << QVersionNumber(1); - QTest::newRow("1.0.0") << QVersionNumber(1, 0, 0) << QVersionNumber(1); - QTest::newRow("1.0.1") << QVersionNumber(1, 0, 1) << QVersionNumber(1, 0, 1); - QTest::newRow("1.0.1.0") << QVersionNumber(QVector() << 1 << 0 << 1 << 0) << QVersionNumber(1, 0, 1); - QTest::newRow("0.0.1.0") << QVersionNumber(QVector() << 0 << 0 << 1 << 0) << QVersionNumber(0, 0, 1); + QTest::newRow("0") << QVersionNumber(0) << QVersionNumber(); + QTest::newRow("1") << QVersionNumber(1) << QVersionNumber(1); + QTest::newRow("1.2") << QVersionNumber(1, 2) << QVersionNumber(1, 2); + QTest::newRow("1.0") << QVersionNumber(1, 0) << QVersionNumber(1); + QTest::newRow("1.0.0") << QVersionNumber(1, 0, 0) << QVersionNumber(1); + QTest::newRow("1.0.1") << QVersionNumber(1, 0, 1) << QVersionNumber(1, 0, 1); + QTest::newRow("1.0.1.0") << QVersionNumber(QList({ 1, 0, 1, 0 })) << QVersionNumber(1, 0, 1); + QTest::newRow("0.0.1.0") << QVersionNumber(QList({ 0, 0, 1, 0 })) << QVersionNumber(0, 0, 1); } void tst_QVersionNumber::normalized() @@ -446,13 +446,13 @@ void tst_QVersionNumber::isNormalized_data() QTest::addColumn("version"); QTest::addColumn("expected"); - QTest::newRow("null") << QVersionNumber() << true; - QTest::newRow("0") << QVersionNumber(0) << false; - QTest::newRow("1") << QVersionNumber(1) << true; - QTest::newRow("1.2") << QVersionNumber(1, 2) << true; - QTest::newRow("1.0") << QVersionNumber(1, 0) << false; - QTest::newRow("1.0.0") << QVersionNumber(1, 0, 0) << false; - QTest::newRow("1.0.1") << QVersionNumber(1, 0, 1) << true; + QTest::newRow("null") << QVersionNumber() << true; + QTest::newRow("0") << QVersionNumber(0) << false; + QTest::newRow("1") << QVersionNumber(1) << true; + QTest::newRow("1.2") << QVersionNumber(1, 2) << true; + QTest::newRow("1.0") << QVersionNumber(1, 0) << false; + QTest::newRow("1.0.0") << QVersionNumber(1, 0, 0) << false; + QTest::newRow("1.0.1") << QVersionNumber(1, 0, 1) << true; } void tst_QVersionNumber::isNormalized() @@ -470,7 +470,7 @@ void tst_QVersionNumber::assignment_data() void tst_QVersionNumber::assignment() { - QFETCH(QVector, segments); + QFETCH(QList, segments); QFETCH(QVersionNumber, expectedVersion); QVersionNumber original(segments); @@ -492,17 +492,17 @@ void tst_QVersionNumber::fromString_data() const QString largerThanIntCanHoldString1 = "0." + QString::number(largerThanIntCanHold); QTest::newRow(qPrintable(largerThanIntCanHoldString0)) - << QVector() << QVersionNumber() << QString() << largerThanIntCanHoldString0 << 0 << true; + << QList() << QVersionNumber() << QString() << largerThanIntCanHoldString0 << 0 << true; QTest::newRow(qPrintable(largerThanIntCanHoldString1)) - << QVector(0) << QVersionNumber(0) << QStringLiteral("0") << largerThanIntCanHoldString1 << 1 << true; + << QList(0) << QVersionNumber(0) << QStringLiteral("0") << largerThanIntCanHoldString1 << 1 << true; const QString largerThanULongLongCanHoldString0 = QString::number(std::numeric_limits::max()) + "0.0"; // 10x ULLONG_MAX const QString largerThanULongLongCanHoldString1 = "0." + QString::number(std::numeric_limits::max()) + '0'; // 10x ULLONG_MAX QTest::newRow(qPrintable(largerThanULongLongCanHoldString0)) - << QVector() << QVersionNumber() << QString() << largerThanULongLongCanHoldString0 << 0 << true; + << QList() << QVersionNumber() << QString() << largerThanULongLongCanHoldString0 << 0 << true; QTest::newRow(qPrintable(largerThanULongLongCanHoldString1)) - << QVector(0) << QVersionNumber(0) << QStringLiteral("0") << largerThanULongLongCanHoldString1 << 1 << true; + << QList(0) << QVersionNumber(0) << QStringLiteral("0") << largerThanULongLongCanHoldString1 << 1 << true; } void tst_QVersionNumber::fromString() @@ -529,10 +529,10 @@ void tst_QVersionNumber::toString_data() { singleInstanceData(); - // segments expectedVersion expectedString constructionString suffixIndex null - QTest::newRow("-1") << (QVector() << -1) << QVersionNumber(-1) << QString("-1") << QString() << 0 << true; - QTest::newRow("-1.0") << (QVector() << -1 << 0) << QVersionNumber(-1, 0) << QString("-1.0") << QString() << 0 << true; - QTest::newRow("1.-2") << (QVector() << 1 << -2) << QVersionNumber(1, -2) << QString("1.-2") << QString() << 0 << true; + // segments expectedVersion expectedString constructionString suffixIndex null + QTest::newRow("-1") << (QList({ -1 })) << QVersionNumber(-1) << QString("-1") << QString() << 0 << true; + QTest::newRow("-1.0") << (QList({ -1, 0 })) << QVersionNumber(-1, 0) << QString("-1.0") << QString() << 0 << true; + QTest::newRow("1.-2") << (QList({ 1, -2 })) << QVersionNumber(1, -2) << QString("1.-2") << QString() << 0 << true; } void tst_QVersionNumber::toString() @@ -550,7 +550,7 @@ void tst_QVersionNumber::isNull_data() void tst_QVersionNumber::isNull() { - QFETCH(QVector, segments); + QFETCH(QList, segments); QFETCH(bool, isNull); QVersionNumber version(segments); @@ -565,7 +565,7 @@ void tst_QVersionNumber::serialize_data() void tst_QVersionNumber::serialize() { - QFETCH(QVector, segments); + QFETCH(QList, segments); QVersionNumber original(segments); QVersionNumber version; @@ -601,9 +601,9 @@ void tst_QVersionNumber::moveSemantics() v2 = std::move(v1); QCOMPARE(v2, QVersionNumber(1, 2, 3)); } - // QVersionNumber(QVector &&) + // QVersionNumber(QList &&) { - QVector segments = QVector() << 1 << 2 << 3; + QList segments = QList({ 1, 2, 3}); QVersionNumber v1(segments); QVersionNumber v2(std::move(segments)); QVERIFY(!v1.isNull()); @@ -628,7 +628,7 @@ void tst_QVersionNumber::moveSemantics() { QVersionNumber v(1, 2, 3); QVERIFY(!v.isNull()); - QVector segments; + QList segments; segments = v.segments(); QVERIFY(!v.isNull()); QVERIFY(!segments.empty()); -- cgit v1.2.3