diff options
Diffstat (limited to 'tests/auto/concurrent')
4 files changed, 21 insertions, 24 deletions
diff --git a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp index 69d1535ccf..4ce11f208f 100644 --- a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp +++ b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp @@ -100,7 +100,6 @@ void tst_QtConcurrentFilter::filter() QCOMPARE(vector, QVector<int>() << 2 << 4); } - // function { QList<int> list; @@ -554,7 +553,6 @@ void tst_QtConcurrentFilter::filteredReduced() int sum = QtConcurrent::filteredReduced<int>(vector, KeepEvenIntegers(), IntSumReduce()); QCOMPARE(sum, 6); } - { int sum = QtConcurrent::filteredReduced<int>(list.begin(), list.end(), @@ -1396,43 +1394,42 @@ void tst_QtConcurrentFilter::filteredReduced() // ### the same as above, with an initial result value } -bool filterfn(int i) -{ +bool filterfn(int i) +{ return (i % 2); -} +} void tst_QtConcurrentFilter::resultAt() { - QList<int> ints; + QList<int> ints; for (int i=0; i < 1000; ++i) ints << i; QFuture<int> future = QtConcurrent::filtered(ints, filterfn); - future.waitForFinished(); + future.waitForFinished(); - for (int i = 0; i < future.resultCount(); ++i) { QCOMPARE(future.resultAt(i), ints.at(i * 2 + 1)); } } -bool waitFilterfn(const int &i) -{ +bool waitFilterfn(const int &i) +{ QTest::qWait(1); return (i % 2); -} +} void tst_QtConcurrentFilter::incrementalResults() { const int count = 200; - QList<int> ints; + QList<int> ints; for (int i=0; i < count; ++i) ints << i; QFuture<int> future = QtConcurrent::filtered(ints, waitFilterfn); - + QList<int> results; while (future.isFinished() == false) { diff --git a/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp b/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp index 3613e8df60..33133e876f 100644 --- a/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp +++ b/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp @@ -112,7 +112,7 @@ public: return false; } bool runIteration(TestIterator it, int index , void *result) - { + { return runIterations(it, index, index + 1, result); } @@ -132,7 +132,7 @@ public: return false; } bool runIteration(TestIterator it, int index , void *result) - { + { return runIterations(it, index, index + 1, result); } }; @@ -166,7 +166,7 @@ public: return false; } bool runIteration(TestIterator it, int index , void *result) - { + { return runIterations(it, index, index + 1, result); } }; @@ -217,13 +217,13 @@ public: if (100 >= begin && 100 < end) { throttling = true; } - + QTest::qWait(1); return false; } bool runIteration(TestIterator it, int index , void *result) - { + { return runIterations(it, index, index + 1, result); } diff --git a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp index eeacf2ccbb..1743ec3459 100644 --- a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp +++ b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp @@ -2226,12 +2226,12 @@ int mapper(const int &i) void tst_QtConcurrentMap::incrementalResults() { const int count = 200; - QList<int> ints; + QList<int> ints; for (int i=0; i < count; ++i) ints << i; QFuture<int> future = QtConcurrent::mapped(ints, mapper); - + QList<int> results; while (future.isFinished() == false) { @@ -2311,7 +2311,7 @@ void tst_QtConcurrentMap::stlContainers() QCOMPARE(list2.size(), (std::vector<int>::size_type)(2)); QtConcurrent::mapped(list, mapper).waitForFinished(); - + QtConcurrent::blockingMap(list, multiplyBy2Immutable); } diff --git a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp index ab1b0e9d06..8a289ff4e1 100644 --- a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp +++ b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp @@ -137,10 +137,10 @@ public: void tst_QtConcurrentRun::returnValue() { QFuture<int> f; - + f = run(returnInt0); QCOMPARE(f.result(), 10); - + A a; f = run(&a, &A::member0); QCOMPARE(f.result(), 10); @@ -214,7 +214,7 @@ void tst_QtConcurrentRun::functionObject() { QFuture<void> f; TestClass c; - + f = run(c); f = run(&c); f = run(c, 10); |