diff options
Diffstat (limited to 'tests/auto/corelib/thread')
5 files changed, 52 insertions, 34 deletions
diff --git a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp index c9a41b29f8..c86befdf1b 100644 --- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp +++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp @@ -243,13 +243,13 @@ void tst_QFuture::resultStore() store.addResult(2, &int2); // add result at index 2 QCOMPARE(store.contains(2), false); // but 1 is missing, so this 2 won't be reported yet. - store.addResult(1, &int1); + store.addResult(1, &int1); QCOMPARE(store.contains(1), true); QCOMPARE(store.contains(2), true); // 2 should be visible now. - store.addResult(4, &int0); - store.addResult(5, &int0); - store.addResult(7, &int0); + store.addResult(4, &int0); + store.addResult(5, &int0); + store.addResult(7, &int0); QCOMPARE(store.contains(4), false); QCOMPARE(store.contains(5), false); QCOMPARE(store.contains(7), false); @@ -273,9 +273,9 @@ void tst_QFuture::resultStore() store.addResult(0, &int0); QCOMPARE(store.contains(0), true); - + store.addResult(2, &int0); - QCOMPARE(store.contains(2), false); + QCOMPARE(store.contains(2), false); store.addCanceledResult(1); // report no result at 1 @@ -289,7 +289,7 @@ void tst_QFuture::resultStore() store.addResult(6, &int0); store.addResult(7, &int0); QCOMPARE(store.contains(3), false); - + store.addCanceledResult(4); store.addCanceledResult(5); @@ -311,10 +311,10 @@ void tst_QFuture::resultStore() store.addResult(0, &int0); QCOMPARE(store.count(), 1); // result 0 becomes available QCOMPARE(store.contains(0), true); - + store.addResult(2, &int0); QCOMPARE(store.count(), 1); - QCOMPARE(store.contains(2), false); + QCOMPARE(store.contains(2), false); store.addCanceledResult(1); QCOMPARE(store.count(), 2); // result 2 is renamed to 1 and becomes available @@ -332,7 +332,7 @@ void tst_QFuture::resultStore() store.addResult(7, &int0); QCOMPARE(store.count(), 3); QCOMPARE(store.contains(3), false); - + store.addCanceledResult(4); store.addCanceledResult(5); QCOMPARE(store.count(), 5); // 6 and 7 is renamed to 3 and 4 and becomes available @@ -347,13 +347,13 @@ void tst_QFuture::resultStore() QCOMPARE(store.contains(6), false); QCOMPARE(store.contains(7), false); } - + { // test resultCount in non-filtered mode. It should always be possible // to iterate through the results 0 to resultCount. QtPrivate::ResultStore<int> store; store.addResult(0, &int0); - + QCOMPARE(store.count(), 1); store.addResult(2, &int0); @@ -440,7 +440,7 @@ void tst_QFuture::resultStore() store.addCanceledResults(0, 3); QCOMPARE(store.count(), 2); // results at 3 and 4 become available at index 0, 1 - store.addResult(5, &int0); + store.addResult(5, &int0); QCOMPARE(store.count(), 3);// result 5 becomes available at index 2 } @@ -1112,9 +1112,9 @@ void tst_QFuture::iterators() for (int i = 0; i < resultCount; ++i) { e.reportResult(i); } - + e.reportFinished(); - + { QFutureIterator<int> it(f); QFutureIterator<int> it2(it); @@ -1122,7 +1122,7 @@ void tst_QFuture::iterators() { QFutureIterator<int> it(f); - + for (int i = 0; i < resultCount - 1; ++i) { QVERIFY(it.hasNext()); QCOMPARE(it.peekNext(), i); diff --git a/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp b/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp index 467dd4b348..b2b0eace34 100644 --- a/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp +++ b/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp @@ -797,7 +797,7 @@ public: ResultReadyTester(QFutureWatcher<int> *watcher) :m_watcher(watcher), filter(false), ok(true), count(0) { - + } public slots: void resultReadyAt(int index) @@ -834,7 +834,7 @@ void tst_QFutureWatcher::incrementalMapResults() connect(&watcher, SIGNAL(resultReadyAt(int)), &resultReadyTester, SLOT(resultReadyAt(int))); const int count = 10000; - QList<int> ints; + QList<int> ints; for (int i = 0; i < count; ++i) ints << i; @@ -846,7 +846,7 @@ void tst_QFutureWatcher::incrementalMapResults() QCOMPARE(resultReadyTester.count, count); QVERIFY(resultReadyTester.ok); QVERIFY(watcher.isFinished()); - future.waitForFinished(); + future.waitForFinished(); } bool filterer(int i) @@ -873,7 +873,7 @@ void tst_QFutureWatcher::incrementalFilterResults() connect(&watcher, SIGNAL(resultReadyAt(int)), &resultReadyTester, SLOT(resultReadyAt(int))); const int count = 10000; - QList<int> ints; + QList<int> ints; for (int i = 0; i < count; ++i) ints << i; @@ -885,12 +885,12 @@ void tst_QFutureWatcher::incrementalFilterResults() QCOMPARE(resultReadyTester.count, count / 2); QVERIFY(resultReadyTester.ok); QVERIFY(watcher.isFinished()); - future.waitForFinished(); + future.waitForFinished(); } void tst_QFutureWatcher::qfutureSynchronizer() { - int taskCount = 1000; + int taskCount = 1000; QTime t; t.start(); diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp index e6d824be96..7fbb5e9f5f 100644 --- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp +++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp @@ -1026,7 +1026,7 @@ void tst_QThread::exitAndExec() thread.sem2.acquire(); int v = thread.value; QCOMPARE(v, 556); - + //test that the thread is running by executing queued connected signal there Syncronizer sync1; sync1.moveToThread(&thread); diff --git a/tests/auto/corelib/thread/qthreadonce/qthreadonce.h b/tests/auto/corelib/thread/qthreadonce/qthreadonce.h index eff7924410..5e04a16bb9 100644 --- a/tests/auto/corelib/thread/qthreadonce/qthreadonce.h +++ b/tests/auto/corelib/thread/qthreadonce/qthreadonce.h @@ -46,8 +46,6 @@ #include <QtCore/qglobal.h> #include <QtCore/qatomic.h> -QT_BEGIN_HEADER - #ifndef QT_NO_THREAD @@ -108,6 +106,4 @@ public: #endif // QT_NO_THREAD -QT_END_HEADER - #endif diff --git a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp index a586f81ccc..a93a94a470 100644 --- a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp +++ b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp @@ -64,6 +64,12 @@ QRunnable *createTask(FunctionPointer pointer) class tst_QThreadPool : public QObject { Q_OBJECT +public: + tst_QThreadPool(); + ~tst_QThreadPool(); + + static QMutex *functionTestMutex; + private slots: void runFunction(); void createThreadRunFunction(); @@ -92,8 +98,24 @@ private slots: void waitForDoneTimeout(); void destroyingWaitsForTasksToFinish(); void stressTest(); + +private: + QMutex m_functionTestMutex; }; + +QMutex *tst_QThreadPool::functionTestMutex = 0; + +tst_QThreadPool::tst_QThreadPool() +{ + tst_QThreadPool::functionTestMutex = &m_functionTestMutex; +} + +tst_QThreadPool::~tst_QThreadPool() +{ + tst_QThreadPool::functionTestMutex = 0; +} + int testFunctionCount; void sleepTestFunction() @@ -114,19 +136,19 @@ void noSleepTestFunction() void sleepTestFunctionMutex() { - static QMutex testMutex; + Q_ASSERT(tst_QThreadPool::functionTestMutex); QTest::qSleep(1000); - testMutex.lock(); + tst_QThreadPool::functionTestMutex->lock(); ++testFunctionCount; - testMutex.unlock(); + tst_QThreadPool::functionTestMutex->unlock(); } void noSleepTestFunctionMutex() { - static QMutex testMutex; - testMutex.lock(); + Q_ASSERT(tst_QThreadPool::functionTestMutex); + tst_QThreadPool::functionTestMutex->lock(); ++testFunctionCount; - testMutex.unlock(); + tst_QThreadPool::functionTestMutex->unlock(); } void tst_QThreadPool::runFunction() @@ -761,7 +783,7 @@ void tst_QThreadPool::waitForDoneTimeout() public: QMutex mutex; BlockedTask() { setAutoDelete(false); } - + void run() { mutex.lock(); |