AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_QMimeDatabase: use QFutureSynchronizer

Browse Source 
Replace a list of QFuture<void>s and a loop that calls waitForFinished()
on each of them with a QFutureSynchronizer<void>, which does exactly that.

Change-Id: I1f2e90169a5b2949bd8cb9d1009a5a7af1500139
Reviewed-by: David Faure <faure@kde.org>
This commit is contained in:
Marc Mutz 2012-07-11 10:41:59 +02:00 committed by Qt by Nokia
parent c4cef6fae9
commit ea6946318f
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
View File

@ -46,8 +46,8 @@
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtCore/QTextStream>
#include <QFutureSynchronizer>
#include <QtConcurrent/QtConcurrentRun>
#include <QtConcurrent/QFuture>
#include <QtTest/QtTest>
@ -752,17 +752,16 @@ void tst_QMimeDatabase::fromThreads()
{
QThreadPool::globalInstance()->setMaxThreadCount(20);
// Note that data-based tests cannot be used here (QTest::fetchData asserts).
QList<QFuture<void> > futures;
futures << QtConcurrent::run(this, &tst_QMimeDatabase::mimeTypeForName);
futures << QtConcurrent::run(this, &tst_QMimeDatabase::aliases);
futures << QtConcurrent::run(this, &tst_QMimeDatabase::allMimeTypes);
futures << QtConcurrent::run(this, &tst_QMimeDatabase::icons);
futures << QtConcurrent::run(this, &tst_QMimeDatabase::inheritance);
futures << QtConcurrent::run(this, &tst_QMimeDatabase::knownSuffix);
futures << QtConcurrent::run(this, &tst_QMimeDatabase::mimeTypeForFileWithContent);
futures << QtConcurrent::run(this, &tst_QMimeDatabase::allMimeTypes); // a second time
Q_FOREACH (QFuture<void> f, futures)
f.waitForFinished();
QFutureSynchronizer<void> sync;
sync.addFuture(QtConcurrent::run(this, &tst_QMimeDatabase::mimeTypeForName));
sync.addFuture(QtConcurrent::run(this, &tst_QMimeDatabase::aliases));
sync.addFuture(QtConcurrent::run(this, &tst_QMimeDatabase::allMimeTypes));
sync.addFuture(QtConcurrent::run(this, &tst_QMimeDatabase::icons));
sync.addFuture(QtConcurrent::run(this, &tst_QMimeDatabase::inheritance));
sync.addFuture(QtConcurrent::run(this, &tst_QMimeDatabase::knownSuffix));
sync.addFuture(QtConcurrent::run(this, &tst_QMimeDatabase::mimeTypeForFileWithContent));
sync.addFuture(QtConcurrent::run(this, &tst_QMimeDatabase::allMimeTypes)); // a second time
// sync dtor blocks waiting for finished
}
static bool runUpdateMimeDatabase(const QString &path) // TODO make it a QMimeDatabase method?