1 files changed, 22 insertions, 37 deletions

diff --git a/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp b/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
index 574c82b78e..27113ad8b7 100644
--- a/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
+++ b/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
@@ -1,31 +1,7 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 #include <QThread>
+#include <QSet>
 
 struct TestIterator
 {
@@ -67,7 +43,7 @@ int distance(TestIterator &a, TestIterator &b)
 }
 
 #include <qtconcurrentiteratekernel.h>
-#include <QtTest/QtTest>
+#include <QTest>
 
 using namespace QtConcurrent;
 
@@ -126,7 +102,8 @@ public:
 
 void tst_QtConcurrentIterateKernel::instantiate()
 {
-    startThreadEngine(new PrintFor(0, 40)).startBlocking();
+    auto future = startThreadEngine(new PrintFor(0, 40)).startAsynchronously();
+    future.waitForFinished();
     QCOMPARE(iterations.loadRelaxed(), 40);
 }
 
@@ -165,8 +142,10 @@ void tst_QtConcurrentIterateKernel::stresstest()
     const int times = 50;
     for (int i = 0; i < times; ++i) {
         counter.storeRelaxed(0);
-        CountFor f(0, iterations);
-        f.startBlocking();
+        // ThreadEngine will delete f when it finishes
+        auto f = new CountFor(0, iterations);
+        auto future = f->startAsynchronously();
+        future.waitForFinished();
         QCOMPARE(counter.loadRelaxed(), iterations);
     }
 }
@@ -174,8 +153,12 @@ void tst_QtConcurrentIterateKernel::stresstest()
 void tst_QtConcurrentIterateKernel::noIterations()
 {
     const int times = 20000;
-    for (int i = 0; i < times; ++i)
-        startThreadEngine(new IterateKernel<TestIterator, void>(QThreadPool::globalInstance(), 0, 0)).startBlocking();
+    for (int i = 0; i < times; ++i) {
+        auto future = startThreadEngine(new IterateKernel<TestIterator, void>(
+                                                QThreadPool::globalInstance(), 0, 0))
+                              .startAsynchronously();
+        future.waitForFinished();
+    }
 }
 
 QMutex threadsMutex;
@@ -230,13 +213,15 @@ void tst_QtConcurrentIterateKernel::throttling()
 
     threads.clear();
 
-    ThrottleFor f(0, totalIterations);
-    f.startBlocking();
+    // ThreadEngine will delete f when it finishes
+    auto f = new ThrottleFor(0, totalIterations);
+    auto future = f->startAsynchronously();
+    future.waitForFinished();
 
     QCOMPARE(iterations.loadRelaxed(), totalIterations);
 
 
-    QCOMPARE(threads.count(), 1);
+    QCOMPARE(threads.size(), 1);
 }
 
 class MultipleResultsFor : public IterateKernel<TestIterator, int>
@@ -254,7 +239,7 @@ public:
 void tst_QtConcurrentIterateKernel::multipleResults()
 {
     QFuture<int> f = startThreadEngine(new MultipleResultsFor(0, 10)).startAsynchronously();
-    QCOMPARE(f.results().count() , 10);
+    QCOMPARE(f.results().size() , 10);
     QCOMPARE(f.resultAt(0), 0);
     QCOMPARE(f.resultAt(5), 5);
     QCOMPARE(f.resultAt(9), 9);