1 files changed, 81 insertions, 28 deletions
diff --git a/tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp b/tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp
index d873291fd6..6ccab04c27 100644
--- a/tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp
+++ b/tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QTest>
 
@@ -67,6 +42,7 @@ private slots:
     void scopeTest();
     void unlockAndRelockTest();
     void lockerStateTest();
+    void moveSemantics();
 };
 
 void tst_QMutexLocker::scopeTest()
@@ -80,6 +56,7 @@ void tst_QMutexLocker::scopeTest()
 
             {
                 QMutexLocker locker(&mutex);
+                QVERIFY(locker.isLocked());
                 waitForTest();
             }
 
@@ -122,16 +99,23 @@ void tst_QMutexLocker::unlockAndRelockTest()
         void run() override
         {
             QMutexLocker locker(&mutex);
+            QVERIFY(locker.isLocked());
 
             waitForTest();
 
+            QVERIFY(locker.isLocked());
             locker.unlock();
+            QVERIFY(!locker.isLocked());
 
             waitForTest();
 
+            QVERIFY(!locker.isLocked());
             locker.relock();
+            QVERIFY(locker.isLocked());
 
             waitForTest();
+
+            QVERIFY(locker.isLocked());
         }
     };
 
@@ -169,10 +153,13 @@ void tst_QMutexLocker::lockerStateTest()
         {
             {
                 QMutexLocker locker(&mutex);
-                locker.relock();
+                QVERIFY(locker.isLocked());
+
                 locker.unlock();
+                QVERIFY(!locker.isLocked());
 
                 waitForTest();
+                QVERIFY(!locker.isLocked());
             }
 
             waitForTest();
@@ -200,5 +187,71 @@ void tst_QMutexLocker::lockerStateTest()
     thread = nullptr;
 }
 
+void tst_QMutexLocker::moveSemantics()
+{
+    {
+        QMutexLocker<QMutex> locker(nullptr);
+        QVERIFY(!locker.isLocked());
+        QCOMPARE(locker.mutex(), nullptr);
+
+        QMutexLocker locker2(std::move(locker));
+        QVERIFY(!locker.isLocked());
+        QVERIFY(!locker2.isLocked());
+        QCOMPARE(locker.mutex(), nullptr);
+        QCOMPARE(locker2.mutex(), nullptr);
+    }
+
+    QMutex mutex;
+
+    {
+        QMutexLocker locker(&mutex);
+        QVERIFY(locker.isLocked());
+        QCOMPARE(locker.mutex(), &mutex);
+        QVERIFY(!mutex.tryLock());
+
+        QMutexLocker locker2(std::move(locker));
+        QVERIFY(!locker.isLocked());
+        QVERIFY(locker2.isLocked());
+        QCOMPARE(locker.mutex(), nullptr);
+        QCOMPARE(locker2.mutex(), &mutex);
+        QVERIFY(!mutex.tryLock());
+    }
+
+    QVERIFY(mutex.tryLock());
+    mutex.unlock();
+
+    {
+        QMutex mutex;
+        QMutexLocker locker(&mutex);
+        QVERIFY(locker.isLocked());
+        QCOMPARE(locker.mutex(), &mutex);
+        QVERIFY(!mutex.tryLock());
+
+        locker.unlock();
+        QVERIFY(!locker.isLocked());
+        QCOMPARE(locker.mutex(), &mutex);
+        QVERIFY(mutex.tryLock());
+        mutex.unlock();
+
+        QMutexLocker locker2(std::move(locker));
+        QVERIFY(!locker.isLocked());
+        QVERIFY(!locker2.isLocked());
+        QCOMPARE(locker.mutex(), nullptr);
+        QCOMPARE(locker2.mutex(), &mutex);
+        QVERIFY(mutex.tryLock());
+        mutex.unlock();
+
+        locker2.relock();
+        QVERIFY(!locker.isLocked());
+        QVERIFY(locker2.isLocked());
+        QCOMPARE(locker.mutex(), nullptr);
+        QCOMPARE(locker2.mutex(), &mutex);
+        QVERIFY(!mutex.tryLock());
+    }
+
+    QVERIFY(mutex.tryLock());
+    mutex.unlock();
+}
+
 QTEST_MAIN(tst_QMutexLocker)
 #include "tst_qmutexlocker.moc"