Initial import from the monolithic Qt.

This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:

http://qt.gitorious.org/qt/pages/GitIntroductionWithQt

If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.

Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12

3 files changed, 241 insertions, 0 deletions

diff --git a/tests/auto/qmutexlocker/.gitignore b/tests/auto/qmutexlocker/.gitignore
new file mode 100644
index 0000000000..7c75c1c2f4
--- /dev/null
+++ b/tests/auto/qmutexlocker/.gitignore
@@ -0,0 +1 @@
+tst_qmutexlocker
diff --git a/tests/auto/qmutexlocker/qmutexlocker.pro b/tests/auto/qmutexlocker/qmutexlocker.pro
new file mode 100644
index 0000000000..01c369101b
--- /dev/null
+++ b/tests/auto/qmutexlocker/qmutexlocker.pro
@@ -0,0 +1,4 @@
+load(qttest_p4)
+SOURCES += tst_qmutexlocker.cpp
+QT = core
+CONFIG += parallel_test
diff --git a/tests/auto/qmutexlocker/tst_qmutexlocker.cpp b/tests/auto/qmutexlocker/tst_qmutexlocker.cpp
new file mode 100644
index 0000000000..6eff01a302
--- /dev/null
+++ b/tests/auto/qmutexlocker/tst_qmutexlocker.cpp
@@ -0,0 +1,236 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtTest/QtTest>
+
+#include <QCoreApplication>
+#include <QMutexLocker>
+#include <QSemaphore>
+#include <QThread>
+
+//TESTED_CLASS=
+//TESTED_FILES=
+
+class tst_QMutexLockerThread : public QThread
+{
+public:
+    QMutex mutex;
+    QSemaphore semaphore, testSemaphore;
+
+    void waitForTest()
+    {
+        semaphore.release();
+        testSemaphore.acquire();
+    }
+
+    tst_QMutexLockerThread()
+        : mutex(QMutex::Recursive)
+    {
+    }
+};
+
+class tst_QMutexLocker : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QMutexLocker();
+    ~tst_QMutexLocker();
+
+    tst_QMutexLockerThread *thread;
+
+    void waitForThread()
+    {
+        thread->semaphore.acquire();
+    }
+    void releaseThread()
+    {
+        thread->testSemaphore.release();
+    }
+
+private slots:
+    void scopeTest();
+    void unlockAndRelockTest();
+    void lockerStateTest();
+};
+
+tst_QMutexLocker::tst_QMutexLocker()
+{
+}
+
+tst_QMutexLocker::~tst_QMutexLocker()
+{
+}
+
+void tst_QMutexLocker::scopeTest()
+{
+    class ScopeTestThread : public tst_QMutexLockerThread
+    {
+    public:
+        void run()
+        {
+            waitForTest();
+
+            {
+                QMutexLocker locker(&mutex);
+                waitForTest();
+            }
+
+            waitForTest();
+        }
+    };
+
+    thread = new ScopeTestThread;
+    thread->start();
+
+    waitForThread();
+    // mutex should be unlocked before entering the scope that creates the QMutexLocker
+    QVERIFY(thread->mutex.tryLock());
+    thread->mutex.unlock();
+    releaseThread();
+
+    waitForThread();
+    // mutex should be locked by the QMutexLocker
+    QVERIFY(!thread->mutex.tryLock());
+    releaseThread();
+
+    waitForThread();
+    // mutex should be unlocked when the QMutexLocker goes out of scope
+    QVERIFY(thread->mutex.tryLock());
+    thread->mutex.unlock();
+    releaseThread();
+
+    QVERIFY(thread->wait());
+
+    delete thread;
+    thread = 0;
+}
+
+
+void tst_QMutexLocker::unlockAndRelockTest()
+{
+    class UnlockAndRelockThread : public tst_QMutexLockerThread
+    {
+    public:
+        void run()
+        {
+            QMutexLocker locker(&mutex);
+
+            waitForTest();
+
+            locker.unlock();
+
+            waitForTest();
+
+            locker.relock();
+
+            waitForTest();
+        }
+    };
+
+    thread = new UnlockAndRelockThread;
+    thread->start();
+
+    waitForThread();
+    // mutex should be locked by the QMutexLocker
+    QVERIFY(!thread->mutex.tryLock());
+    releaseThread();
+
+    waitForThread();
+    // mutex has been explicitly unlocked via QMutexLocker
+    QVERIFY(thread->mutex.tryLock());
+    thread->mutex.unlock();
+    releaseThread();
+
+    waitForThread();
+    // mutex has been explicity relocked via QMutexLocker
+    QVERIFY(!thread->mutex.tryLock());
+    releaseThread();
+
+    QVERIFY(thread->wait());
+
+    delete thread;
+    thread = 0;
+}
+
+void tst_QMutexLocker::lockerStateTest()
+{
+    class LockerStateThread : public tst_QMutexLockerThread
+    {
+    public:
+        void run()
+        {
+            {
+                QMutexLocker locker(&mutex);
+                locker.relock();
+                locker.unlock();
+
+                waitForTest();
+            }
+
+            waitForTest();
+        }
+    };
+
+    thread = new LockerStateThread;
+    thread->start();
+
+    waitForThread();
+    // even though we relock() after creating the QMutexLocker, it shouldn't lock the mutex more than once
+    QVERIFY(thread->mutex.tryLock());
+    thread->mutex.unlock();
+    releaseThread();
+
+    waitForThread();
+    // if we call QMutexLocker::unlock(), its destructor should do nothing
+    QVERIFY(thread->mutex.tryLock());
+    thread->mutex.unlock();
+    releaseThread();
+
+    QVERIFY(thread->wait());
+
+    delete thread;
+    thread = 0;
+}
+
+QTEST_MAIN(tst_QMutexLocker)
+#include "tst_qmutexlocker.moc"