diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 15:07:48 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 16:46:01 +0200 |
| commit | 95a5cd71b626b24556116f8539bf79bcf8baf4cd (patch) | |
| tree | e8dad245be4cf9d49e943041e5e08b3505e66107 /tests/auto/concurrent/qtconcurrenttask/tst_qtconcurrenttask.cpp | |
| parent | b0792f391d9937cabb6f42109310b2c7ffaf8b78 (diff) | |
Use QList instead of QVector in concurrent tests
Task-number: QTBUG-84469
Change-Id: Ia8113ef044a918e46176bfa3f4b34781dc69dd03
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'tests/auto/concurrent/qtconcurrenttask/tst_qtconcurrenttask.cpp')
| -rw-r--r-- | tests/auto/concurrent/qtconcurrenttask/tst_qtconcurrenttask.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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<QFuture<void>> futureResults; + QList<QFuture<void>> futureResults; futureResults << task([&]{ sem.acquire(); }) .onThreadPool(pool) .spawn(); const int tasksCount = 10; - QVector<int> priorities(tasksCount); + QList<int> 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<int> actual; + QList<int> 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<int> expected(priorities); + QList<int> 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<int> result; + QList<int> result; auto append = [&](auto &&...args){ (result << ... << args); }; task(std::move(append)) @@ -154,7 +154,7 @@ void tst_QtConcurrentTask::adjustAllSettings() .spawn() .waitForFinished(); - QCOMPARE(result, QVector<int>({1, 2, 3})); + QCOMPARE(result, QList<int>({ 1, 2, 3 })); } void tst_QtConcurrentTask::ignoreFutureResult() { |