From 95a5cd71b626b24556116f8539bf79bcf8baf4cd Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 22 Jun 2020 15:07:48 +0200 Subject: [PATCH] Use QList instead of QVector in concurrent tests Task-number: QTBUG-84469 Change-Id: Ia8113ef044a918e46176bfa3f4b34781dc69dd03 Reviewed-by: Sona Kurazyan Reviewed-by: Andrei Golubev --- .../tst_qtconcurrentfilter.cpp | 8 +++---- .../qtconcurrentmap/tst_qtconcurrentmap.cpp | 23 ++++++++++--------- .../qtconcurrenttask/tst_qtconcurrenttask.cpp | 12 +++++----- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp index ac8aec4dcdc..945f286c9d1 100644 --- a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp +++ b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp @@ -356,8 +356,8 @@ void tst_QtConcurrentFilter::filteredReduced() const int intSum = 6; // sum of even values const Number numberSum = 6; // sum of even values - void (QVector::*pushBackInt)(const int &) = &QVector::push_back; - void (QVector::*pushBackNumber)(const Number &) = &QVector::push_back; + void (QList::*pushBackInt)(const int &) = &QList::push_back; + void (QList::*pushBackNumber)(const Number &) = &QList::push_back; auto lambdaIsEven = [](const int &x) { return (x & 1) == 0; @@ -612,8 +612,8 @@ void tst_QtConcurrentFilter::filteredReducedInitialValue() const int intSum = 16; // sum of even values and initial value const Number numberSum = 16; // sum of even values and initial value - void (QVector::*pushBackInt)(const int &) = &QVector::push_back; - void (QVector::*pushBackNumber)(const Number &) = &QVector::push_back; + void (QList::*pushBackInt)(const int &) = &QList::push_back; + void (QList::*pushBackNumber)(const Number &) = &QList::push_back; auto lambdaIsEven = [](const int &x) { return (x & 1) == 0; diff --git a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp index fefa7676abb..39af0acd064 100644 --- a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp +++ b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp @@ -609,7 +609,7 @@ void tst_QtConcurrentMap::mappedReduced() const int sum = 6; const int sumOfSquares = 14; - void (QVector::*push_back)(const int &) = &QVector::push_back; + void (QList::*push_back)(const int &) = &QList::push_back; auto lambdaSquare = [](int x) { return x * x; @@ -857,7 +857,7 @@ void tst_QtConcurrentMap::mappedReducedInitialValue() const int sumOfSquares = 24; const int intInitial = 10; - void (QVector::*push_back)(const int &) = &QVector::push_back; + void (QList::*push_back)(const int &) = &QList::push_back; auto lambdaSquare = [](int x) { return x * x; @@ -1161,7 +1161,7 @@ public: } }; -Q_DECLARE_METATYPE(QVector); +Q_DECLARE_METATYPE(QList); void tst_QtConcurrentMap::functionOverloads() { @@ -1175,10 +1175,10 @@ void tst_QtConcurrentMap::functionOverloads() QtConcurrent::mapped(classList, &MemFnTester::fnConst); QtConcurrent::mapped(constMemFnTesterList, &MemFnTester::fnConst); - QtConcurrent::blockingMapped >(intList, fnConst); - QtConcurrent::blockingMapped >(constIntList, fnConst); - QtConcurrent::blockingMapped >(classList, &MemFnTester::fnConst); - QtConcurrent::blockingMapped >(constMemFnTesterList, &MemFnTester::fnConst); + QtConcurrent::blockingMapped>(intList, fnConst); + QtConcurrent::blockingMapped>(constIntList, fnConst); + QtConcurrent::blockingMapped>(classList, &MemFnTester::fnConst); + QtConcurrent::blockingMapped>(constMemFnTesterList, &MemFnTester::fnConst); QtConcurrent::blockingMapped >(intList, changeTypeConst); QtConcurrent::blockingMapped >(constIntList, changeTypeConst); @@ -1198,10 +1198,11 @@ void tst_QtConcurrentMap::noExceptFunctionOverloads() QtConcurrent::mapped(classList, &MemFnTester::fnConstNoExcept); QtConcurrent::mapped(constMemFnTesterList, &MemFnTester::fnConstNoExcept); - QtConcurrent::blockingMapped >(intList, fnConstNoExcept); - QtConcurrent::blockingMapped >(constIntList, fnConstNoExcept); - QtConcurrent::blockingMapped >(classList, &MemFnTester::fnConstNoExcept); - QtConcurrent::blockingMapped >(constMemFnTesterList, &MemFnTester::fnConstNoExcept); + QtConcurrent::blockingMapped>(intList, fnConstNoExcept); + QtConcurrent::blockingMapped>(constIntList, fnConstNoExcept); + QtConcurrent::blockingMapped>(classList, &MemFnTester::fnConstNoExcept); + QtConcurrent::blockingMapped>(constMemFnTesterList, + &MemFnTester::fnConstNoExcept); QtConcurrent::blockingMapped >(intList, changeTypeConstNoExcept); QtConcurrent::blockingMapped >(constIntList, changeTypeConstNoExcept); diff --git a/tests/auto/concurrent/qtconcurrenttask/tst_qtconcurrenttask.cpp b/tests/auto/concurrent/qtconcurrenttask/tst_qtconcurrenttask.cpp index b8a82dfa146..f4e6f996604 100644 --- a/tests/auto/concurrent/qtconcurrenttask/tst_qtconcurrenttask.cpp +++ b/tests/auto/concurrent/qtconcurrenttask/tst_qtconcurrenttask.cpp @@ -107,18 +107,18 @@ void tst_QtConcurrentTask::setPriority() QSemaphore sem; - QVector> futureResults; + QList> futureResults; futureResults << task([&]{ sem.acquire(); }) .onThreadPool(pool) .spawn(); const int tasksCount = 10; - QVector priorities(tasksCount); + QList priorities(tasksCount); std::iota(priorities.begin(), priorities.end(), 1); auto seed = std::chrono::system_clock::now().time_since_epoch().count(); std::shuffle(priorities.begin(), priorities.end(), std::default_random_engine(seed)); - QVector actual; + QList actual; for (int priority : priorities) futureResults << task([priority, &actual] { actual << priority; }) .onThreadPool(pool) @@ -131,7 +131,7 @@ void tst_QtConcurrentTask::setPriority() for (const auto &f : futureResults) QVERIFY(f.isFinished()); - QVector expected(priorities); + QList expected(priorities); std::sort(expected.begin(), expected.end(), std::greater<>()); QCOMPARE(actual, expected); @@ -144,7 +144,7 @@ void tst_QtConcurrentTask::adjustAllSettings() const int priority = 10; - QVector result; + QList result; auto append = [&](auto &&...args){ (result << ... << args); }; task(std::move(append)) @@ -154,7 +154,7 @@ void tst_QtConcurrentTask::adjustAllSettings() .spawn() .waitForFinished(); - QCOMPARE(result, QVector({1, 2, 3})); + QCOMPARE(result, QList({ 1, 2, 3 })); } void tst_QtConcurrentTask::ignoreFutureResult() {