From fe5b04346c08eea42b5acd502cb01d2e6a4062d1 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 22 Jun 2020 15:48:18 +0200 Subject: Use QList instead of QVector in testlib tests Task-number: QTBUG-84469 Change-Id: I36a69021c8d3491a4fd622f3ecb218e1be8a77bc Reviewed-by: Lars Knoll --- tests/auto/testlib/selftests/badxml/tst_badxml.cpp | 2 +- .../auto/testlib/selftests/cmptest/tst_cmptest.cpp | 2 +- .../selftests/expected_signaldumper.junitxml | 24 +++++++++++----------- .../selftests/expected_signaldumper.lightxml | 12 +++++------ .../testlib/selftests/expected_signaldumper.tap | 12 +++++------ .../selftests/expected_signaldumper.teamcity | 2 +- .../testlib/selftests/expected_signaldumper.txt | 12 +++++------ .../testlib/selftests/expected_signaldumper.xml | 12 +++++------ .../testlib/selftests/keyboard/tst_keyboard.cpp | 2 +- .../selftests/signaldumper/tst_signaldumper.cpp | 14 ++++++------- tests/auto/testlib/selftests/tst_selftests.cpp | 2 +- 11 files changed, 48 insertions(+), 48 deletions(-) (limited to 'tests/auto/testlib') diff --git a/tests/auto/testlib/selftests/badxml/tst_badxml.cpp b/tests/auto/testlib/selftests/badxml/tst_badxml.cpp index d82765311b..bdf48a2f21 100644 --- a/tests/auto/testlib/selftests/badxml/tst_badxml.cpp +++ b/tests/auto/testlib/selftests/badxml/tst_badxml.cpp @@ -178,7 +178,7 @@ int main(int argc, char** argv) name. */ int badstring = -1; - QVector args; + QList args; for (int i = 0; i < argc; ++i) { if (!strcmp(argv[i], "-badstring")) { bool ok = false; diff --git a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp index fb01b19d16..ff6375292f 100644 --- a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp +++ b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp @@ -523,7 +523,7 @@ void tst_Cmptest::compareQRegion_data() const QRect rect1(QPoint(10, 10), QSize(200, 50)); const QRegion region1(rect1); QRegion listRegion2; - const QVector list2 = QVector() << QRect(QPoint(100, 200), QSize(50, 200)) << rect1; + const QList list2 = QList() << QRect(QPoint(100, 200), QSize(50, 200)) << rect1; listRegion2.setRects(list2.constData(), list2.size()); QTest::newRow("equal-empty") << QRegion() << QRegion(); QTest::newRow("1-empty") << region1 << QRegion(); diff --git a/tests/auto/testlib/selftests/expected_signaldumper.junitxml b/tests/auto/testlib/selftests/expected_signaldumper.junitxml index 0c03988879..90940e061f 100644 --- a/tests/auto/testlib/selftests/expected_signaldumper.junitxml +++ b/tests/auto/testlib/selftests/expected_signaldumper.junitxml @@ -142,12 +142,12 @@ - - - - - - + + + + + + @@ -274,12 +274,12 @@ -())]]> -())]]> -&)@_POINTER_)]]> -())]]> -*)_POINTER_)]]> -*)_POINTER_)]]> +())]]> +())]]> +&)@_POINTER_)]]> +())]]> +*)_POINTER_)]]> +*)_POINTER_)]]> diff --git a/tests/auto/testlib/selftests/expected_signaldumper.lightxml b/tests/auto/testlib/selftests/expected_signaldumper.lightxml index d29319841c..2d5e6e695a 100644 --- a/tests/auto/testlib/selftests/expected_signaldumper.lightxml +++ b/tests/auto/testlib/selftests/expected_signaldumper.lightxml @@ -542,22 +542,22 @@ - ())]]> + ())]]> - ())]]> + ())]]> - &)@_POINTER_)]]> + &)@_POINTER_)]]> - ())]]> + ())]]> - *)_POINTER_)]]> + *)_POINTER_)]]> - *)_POINTER_)]]> + *)_POINTER_)]]> diff --git a/tests/auto/testlib/selftests/expected_signaldumper.tap b/tests/auto/testlib/selftests/expected_signaldumper.tap index bbaaa025c3..8e7b2c5744 100644 --- a/tests/auto/testlib/selftests/expected_signaldumper.tap +++ b/tests/auto/testlib/selftests/expected_signaldumper.tap @@ -134,12 +134,12 @@ ok 18 - slotEmittingSignalOldSyntax(queued) # Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_) # Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string)) # Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray)) -# Signal: SignalSlotClass(_POINTER_) qListSignal (QVector()) -# Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector()) -# Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector&)@_POINTER_) -# Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector()) -# Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QVector*)_POINTER_) -# Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ((QVector*)_POINTER_) +# Signal: SignalSlotClass(_POINTER_) qListSignal (QList()) +# Signal: SignalSlotClass(_POINTER_) qVectorSignal (QList()) +# Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QList&)@_POINTER_) +# Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QList()) +# Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QList*)_POINTER_) +# Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ((QList*)_POINTER_) # Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant()) # Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant()) ok 19 - variousTypes() diff --git a/tests/auto/testlib/selftests/expected_signaldumper.teamcity b/tests/auto/testlib/selftests/expected_signaldumper.teamcity index dee5aa70ef..f450cdc047 100644 --- a/tests/auto/testlib/selftests/expected_signaldumper.teamcity +++ b/tests/auto/testlib/selftests/expected_signaldumper.teamcity @@ -54,7 +54,7 @@ ##teamcity[testStdOut name='slotEmittingSignalOldSyntax(queued)' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) nestedSignal ()' flowId='tst_Signaldumper'] ##teamcity[testFinished name='slotEmittingSignalOldSyntax(queued)' flowId='tst_Signaldumper'] ##teamcity[testStarted name='variousTypes()' flowId='tst_Signaldumper'] -##teamcity[testStdOut name='variousTypes()' out='INFO: Signal: SignalSlotClass(_POINTER_) qStringSignal (QString(Test string))|nINFO: Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))|nINFO: Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))|nINFO: Signal: SignalSlotClass(_POINTER_) qListSignal (QVector())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector&)@_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QVector*)_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ((QVector*)_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())|nINFO: Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())' flowId='tst_Signaldumper'] +##teamcity[testStdOut name='variousTypes()' out='INFO: Signal: SignalSlotClass(_POINTER_) qStringSignal (QString(Test string))|nINFO: Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))|nINFO: Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))|nINFO: Signal: SignalSlotClass(_POINTER_) qListSignal (QList())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorSignal (QList())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QList&)@_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QList())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QList*)_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ((QList*)_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())|nINFO: Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())' flowId='tst_Signaldumper'] ##teamcity[testFinished name='variousTypes()' flowId='tst_Signaldumper'] ##teamcity[testStarted name='deletingSender()' flowId='tst_Signaldumper'] ##teamcity[testStdOut name='deletingSender()' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()' flowId='tst_Signaldumper'] diff --git a/tests/auto/testlib/selftests/expected_signaldumper.txt b/tests/auto/testlib/selftests/expected_signaldumper.txt index 86d817cd5f..ac4a2aed44 100644 --- a/tests/auto/testlib/selftests/expected_signaldumper.txt +++ b/tests/auto/testlib/selftests/expected_signaldumper.txt @@ -134,12 +134,12 @@ INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qSt INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_) INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string)) INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray)) -INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qListSignal (QVector()) -INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector()) -INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector&)@_POINTER_) -INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector()) -INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QVector*)_POINTER_) -INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ((QVector*)_POINTER_) +INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qListSignal (QList()) +INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorSignal (QList()) +INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QList&)@_POINTER_) +INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QList()) +INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QList*)_POINTER_) +INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ((QList*)_POINTER_) INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant()) INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant()) PASS : tst_Signaldumper::variousTypes() diff --git a/tests/auto/testlib/selftests/expected_signaldumper.xml b/tests/auto/testlib/selftests/expected_signaldumper.xml index c61832ec4a..37e7b3de92 100644 --- a/tests/auto/testlib/selftests/expected_signaldumper.xml +++ b/tests/auto/testlib/selftests/expected_signaldumper.xml @@ -544,22 +544,22 @@ - ())]]> + ())]]> - ())]]> + ())]]> - &)@_POINTER_)]]> + &)@_POINTER_)]]> - ())]]> + ())]]> - *)_POINTER_)]]> + *)_POINTER_)]]> - *)_POINTER_)]]> + *)_POINTER_)]]> diff --git a/tests/auto/testlib/selftests/keyboard/tst_keyboard.cpp b/tests/auto/testlib/selftests/keyboard/tst_keyboard.cpp index e185be8532..0f0e90e2cb 100644 --- a/tests/auto/testlib/selftests/keyboard/tst_keyboard.cpp +++ b/tests/auto/testlib/selftests/keyboard/tst_keyboard.cpp @@ -54,7 +54,7 @@ public: mEventOrder.append(copiedEvent); } - QVector> mEventOrder; + QList> mEventOrder; }; void tst_Keyboard::keyPressAndRelease() diff --git a/tests/auto/testlib/selftests/signaldumper/tst_signaldumper.cpp b/tests/auto/testlib/selftests/signaldumper/tst_signaldumper.cpp index c60260f109..c90fc28bcb 100644 --- a/tests/auto/testlib/selftests/signaldumper/tst_signaldumper.cpp +++ b/tests/auto/testlib/selftests/signaldumper/tst_signaldumper.cpp @@ -95,18 +95,18 @@ signals: void qStringConstRefSignal(const QString &string); void qByteArraySignal(QByteArray byteArray); void qListSignal(QList list); - void qVectorSignal(QVector vector); - void qVectorRefSignal(QVector &vector); - void qVectorConstRefSignal(const QVector &vector); - void qVectorConstPointerSignal(const QVector *vector); - void qVectorPointerConstSignal(QVector *const vector); + void qVectorSignal(QList vector); + void qVectorRefSignal(QList &vector); + void qVectorConstRefSignal(const QList &vector); + void qVectorConstPointerSignal(const QList *vector); + void qVectorPointerConstSignal(QList *const vector); void qVariantSignal(QVariant variant); }; SignalSlotClass::SignalSlotClass() { // For printing signal argument in "variousTypes" test - qRegisterMetaType>(); + qRegisterMetaType>(); qRegisterMetaType>(); } @@ -402,7 +402,7 @@ void tst_Signaldumper::variousTypes() QList list{1, 2, 3, 242}; emit signalSlotOwner.qListSignal(list); - QVector vector{1, 2, 3, 242}; + QList vector { 1, 2, 3, 242 }; emit signalSlotOwner.qVectorSignal(vector); emit signalSlotOwner.qVectorRefSignal(vector); emit signalSlotOwner.qVectorConstRefSignal(vector); diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index 6659525fec..293f8e5333 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -743,7 +743,7 @@ bool TestLogger::shouldIgnoreTest(const QString &test) const return false; } -using TestLoggers = QVector; +using TestLoggers = QList; // ----------------------- Output checking ----------------------- -- cgit v1.2.3