summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/thread
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-11-07 19:19:27 +1000
committerQt by Nokia <qt-info@nokia.com>2011-11-10 04:42:45 +0100
commit8e11f7c93a1f7df0d10e2f851283c825ca39b75b (patch)
tree6f02b39217acd9fb9c033fbe908b8ebb1859896a /tests/auto/corelib/thread
parent2cd47107155fc251747028b9b0ae6d2c9e69e06c (diff)
Cleanup corelib autotests
Remove literal tabs. Change-Id: I210a0259773cceb20d35ebc80b889e3ebb88b540 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/corelib/thread')
-rw-r--r--tests/auto/corelib/thread/qmutex/tst_qmutex.cpp128
-rw-r--r--tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp16
2 files changed, 72 insertions, 72 deletions
diff --git a/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp
index 08a203bcfa..cc2fe653b7 100644
--- a/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp
+++ b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp
@@ -314,16 +314,16 @@ public:
void run()
{
- test_mutex.lock();
+ test_mutex.lock();
- mutex.lock();
- for (int i = 0; i < iterations; ++i) {
- cond.wakeOne();
- cond.wait(&mutex);
- }
- mutex.unlock();
+ mutex.lock();
+ for (int i = 0; i < iterations; ++i) {
+ cond.wakeOne();
+ cond.wait(&mutex);
+ }
+ mutex.unlock();
- test_mutex.unlock();
+ test_mutex.unlock();
}
};
@@ -339,22 +339,22 @@ public:
void run()
{
- test_mutex.lock();
- test_mutex.lock();
- test_mutex.lock();
- test_mutex.lock();
-
- mutex.lock();
- for (int i = 0; i < iterations; ++i) {
- cond.wakeOne();
- cond.wait(&mutex);
- }
- mutex.unlock();
-
- test_mutex.unlock();
- test_mutex.unlock();
- test_mutex.unlock();
- test_mutex.unlock();
+ test_mutex.lock();
+ test_mutex.lock();
+ test_mutex.lock();
+ test_mutex.lock();
+
+ mutex.lock();
+ for (int i = 0; i < iterations; ++i) {
+ cond.wakeOne();
+ cond.wait(&mutex);
+ }
+ mutex.unlock();
+
+ test_mutex.unlock();
+ test_mutex.unlock();
+ test_mutex.unlock();
+ test_mutex.unlock();
}
};
@@ -368,60 +368,60 @@ void tst_QMutex::lock_unlock_locked_tryLock()
rmutex_Thread rthread(rmutex);
for (int i = 0; i < iterations; ++i) {
- // normal mutex
- QVERIFY(mutex.tryLock());
- mutex.unlock();
+ // normal mutex
+ QVERIFY(mutex.tryLock());
+ mutex.unlock();
- thread.mutex.lock();
- thread.start();
+ thread.mutex.lock();
+ thread.start();
- for (int j = 0; j < iterations; ++j) {
- QVERIFY(thread.cond.wait(&thread.mutex, 10000));
- QVERIFY(!mutex.tryLock());
+ for (int j = 0; j < iterations; ++j) {
+ QVERIFY(thread.cond.wait(&thread.mutex, 10000));
+ QVERIFY(!mutex.tryLock());
- thread.cond.wakeOne();
- }
+ thread.cond.wakeOne();
+ }
- thread.mutex.unlock();
+ thread.mutex.unlock();
- QVERIFY(thread.wait(10000));
- QVERIFY(mutex.tryLock());
+ QVERIFY(thread.wait(10000));
+ QVERIFY(mutex.tryLock());
- mutex.unlock();
+ mutex.unlock();
- // recursive mutex
- QVERIFY(rmutex.tryLock());
- QVERIFY(rmutex.tryLock());
- QVERIFY(rmutex.tryLock());
- QVERIFY(rmutex.tryLock());
+ // recursive mutex
+ QVERIFY(rmutex.tryLock());
+ QVERIFY(rmutex.tryLock());
+ QVERIFY(rmutex.tryLock());
+ QVERIFY(rmutex.tryLock());
- rmutex.unlock();
- rmutex.unlock();
- rmutex.unlock();
- rmutex.unlock();
+ rmutex.unlock();
+ rmutex.unlock();
+ rmutex.unlock();
+ rmutex.unlock();
- rthread.mutex.lock();
- rthread.start();
+ rthread.mutex.lock();
+ rthread.start();
- for (int k = 0; k < iterations; ++k) {
- QVERIFY(rthread.cond.wait(&rthread.mutex, 10000));
- QVERIFY(!rmutex.tryLock());
+ for (int k = 0; k < iterations; ++k) {
+ QVERIFY(rthread.cond.wait(&rthread.mutex, 10000));
+ QVERIFY(!rmutex.tryLock());
- rthread.cond.wakeOne();
- }
+ rthread.cond.wakeOne();
+ }
- rthread.mutex.unlock();
+ rthread.mutex.unlock();
- QVERIFY(rthread.wait(10000));
- QVERIFY(rmutex.tryLock());
- QVERIFY(rmutex.tryLock());
- QVERIFY(rmutex.tryLock());
- QVERIFY(rmutex.tryLock());
+ QVERIFY(rthread.wait(10000));
+ QVERIFY(rmutex.tryLock());
+ QVERIFY(rmutex.tryLock());
+ QVERIFY(rmutex.tryLock());
+ QVERIFY(rmutex.tryLock());
- rmutex.unlock();
- rmutex.unlock();
- rmutex.unlock();
- rmutex.unlock();
+ rmutex.unlock();
+ rmutex.unlock();
+ rmutex.unlock();
+ rmutex.unlock();
}
}
diff --git a/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp b/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp
index 9643ee448a..b9ee0e2f18 100644
--- a/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp
+++ b/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp
@@ -70,12 +70,12 @@ public:
protected:
void run()
{
- int i = 0;
- while ( i < 100 ) {
+ int i = 0;
+ while ( i < 100 ) {
semaphore->acquire();
- i++;
+ i++;
semaphore->release();
- }
+ }
}
};
@@ -89,12 +89,12 @@ public:
protected:
void run()
{
- int i = 0;
- while ( i < 100 ) {
+ int i = 0;
+ while ( i < 100 ) {
semaphore->acquire(N);
- i++;
+ i++;
semaphore->release(N);
- }
+ }
}
};