1 files changed, 79 insertions, 36 deletions

diff --git a/tests/auto/corelib/tools/qduplicatetracker/tst_qduplicatetracker.cpp b/tests/auto/corelib/tools/qduplicatetracker/tst_qduplicatetracker.cpp
index f4f038ca94..ad0b6abbc7 100644
--- a/tests/auto/corelib/tools/qduplicatetracker/tst_qduplicatetracker.cpp
+++ b/tests/auto/corelib/tools/qduplicatetracker/tst_qduplicatetracker.cpp
@@ -1,36 +1,13 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 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) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QtTest/QtTest>
 
 #include <QtCore/private/qduplicatetracker_p.h>
 
 #include <QObject>
+
+#include <string>
 #include <utility>
 
 class tst_QDuplicateTracker : public QObject
@@ -38,6 +15,7 @@ class tst_QDuplicateTracker : public QObject
     Q_OBJECT
 private slots:
     void hasSeen();
+    void clear();
     void appendTo();
     void appendTo_special();
 };
@@ -74,6 +52,42 @@ void tst_QDuplicateTracker::hasSeen()
         QVERIFY(!tracker.hasSeen(string3));
         QVERIFY(tracker.hasSeen(string3));
     }
+
+    {
+        QDuplicateTracker<std::string, 2> tracker;
+        std::string string1("string1");
+        std::string string2("string2");
+        std::string string2_2("string2");
+        std::string string3("string3");
+
+        // Move when seen
+        QVERIFY(!tracker.hasSeen(string1));
+        QVERIFY(tracker.hasSeen(std::move(string1)));
+
+        // Move when unseen
+        QVERIFY(!tracker.hasSeen(std::move(string2)));
+        QVERIFY(tracker.hasSeen(string2_2));
+
+        // Past the prealloc amount
+        QVERIFY(!tracker.hasSeen(string3));
+        QVERIFY(tracker.hasSeen(string3));
+    }
+
+}
+
+void tst_QDuplicateTracker::clear()
+{
+    QDuplicateTracker<int, 2> tracker;
+    QVERIFY(!tracker.hasSeen(0));
+    QVERIFY(tracker.hasSeen(0));
+    QVERIFY(!tracker.hasSeen(1));
+    QVERIFY(tracker.hasSeen(1));
+
+    tracker.clear();
+    QVERIFY(!tracker.hasSeen(0));
+    QVERIFY(tracker.hasSeen(0));
+    QVERIFY(!tracker.hasSeen(1));
+    QVERIFY(tracker.hasSeen(1));
 }
 
 void tst_QDuplicateTracker::appendTo()
@@ -94,9 +108,15 @@ void tst_QDuplicateTracker::appendTo()
 
     QVERIFY(!tracker.hasSeen(2));
     QList<int> c;
-    tracker.appendTo(c);
+    std::move(tracker).appendTo(c);
     std::sort(c.begin(), c.end());
     QCOMPARE(c, QList<int>({ 0, 1, 2 }));
+    if (QDuplicateTracker<int, 2>::uses_pmr) {
+        // the following is only true if we use the std container
+        QVERIFY(!tracker.hasSeen(0));
+        QVERIFY(!tracker.hasSeen(1));
+        QVERIFY(!tracker.hasSeen(2));
+    }
 }
 
 struct ConstructionCounted
@@ -168,17 +188,40 @@ size_t qHash(const ConstructionCounted &c, std::size_t seed = 0)
 
 void tst_QDuplicateTracker::appendTo_special()
 {
-    QDuplicateTracker<ConstructionCounted> tracker;
-    tracker.reserve(3);
+    QDuplicateTracker<ConstructionCounted> tracker(3);
     QVERIFY(!tracker.hasSeen(1));
     QVERIFY(!tracker.hasSeen(2));
     QVERIFY(!tracker.hasSeen(3));
-    QList<ConstructionCounted> a;
-    a.reserve(3);
-    tracker.appendTo(a);
-    for (const auto &counter : a) {
-        QCOMPARE(counter.moves, 1);
-        QCOMPARE(counter.copies, 1);
+
+    QVERIFY(tracker.hasSeen(1));
+    QVERIFY(tracker.hasSeen(2));
+    QVERIFY(tracker.hasSeen(3));
+    {
+        QList<ConstructionCounted> a;
+        a.reserve(3);
+        tracker.appendTo(a);
+        for (const auto &counter : a) {
+            QCOMPARE(counter.moves, 1);
+            QCOMPARE(counter.copies, 1);
+        }
+    }
+    QVERIFY(tracker.hasSeen(1));
+    QVERIFY(tracker.hasSeen(2));
+    QVERIFY(tracker.hasSeen(3));
+    {
+        QList<ConstructionCounted> a;
+        a.reserve(3);
+        std::move(tracker).appendTo(a);
+        if (QDuplicateTracker<ConstructionCounted>::uses_pmr) {
+            // the following is only true if we use the std container
+            for (const auto &counter : a) {
+                QCOMPARE(counter.moves, 2);
+                QCOMPARE(counter.copies, 0);
+            }
+            QVERIFY(!tracker.hasSeen(1));
+            QVERIFY(!tracker.hasSeen(2));
+            QVERIFY(!tracker.hasSeen(3));
+        }
     }
 }