1 files changed, 76 insertions, 27 deletions
diff --git a/tests/benchmarks/corelib/tools/qset/tst_bench_qset.cpp b/tests/benchmarks/corelib/tools/qset/tst_bench_qset.cpp
index 4d873f8e39..5bbec05aab 100644
--- a/tests/benchmarks/corelib/tools/qset/tst_bench_qset.cpp
+++ b/tests/benchmarks/corelib/tools/qset/tst_bench_qset.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 <QSet>
 #include <QTest>
@@ -34,12 +9,22 @@ class tst_QSet : public QObject
     Q_OBJECT
 
 private slots:
+    void initTestCase();
     void intersect_int_data();
     void intersect_int();
     void intersect_complexType_data();
     void intersect_complexType();
+    void unite_int_data();
+    void unite_int();
+    void contains_then_insert_int_data();
+    void contains_then_insert_int();
 };
 
+void tst_QSet::initTestCase()
+{
+    QHashSeed::setDeterministicGlobalSeed();
+}
+
 void tst_QSet::intersect_int_data()
 {
     QTest::addColumn<int>("lhsSize");
@@ -123,6 +108,70 @@ void tst_QSet::intersect_complexType()
     }
 }
 
+void tst_QSet::unite_int_data()
+{
+    QTest::addColumn<int>("lhsSize");
+    QTest::addColumn<int>("rhsSize");
+    QTest::addColumn<int>("overlap");
+
+    QTest::newRow("1000000.unite(1000) - 0 overlap") << 1000000 << 1000 << 0;
+    QTest::newRow("1000000.unite(1000) - 100 overlap") << 1000000 << 1000 << 100;
+    QTest::newRow("1000000.unite(1000) - 1000 overlap") << 1000000 << 1000 << 1000;
+    QTest::newRow("1000.unite(1000000) - 0 overlap") << 1000 << 1000000 << 0;
+    QTest::newRow("1000.unite(1000000) - 100 overlap") << 1000 << 1000000 << 100;
+    QTest::newRow("1000.unite(1000000) - 1000 overlap") << 1000 << 1000000 << 1000;
+}
+
+auto build_sets(int lhsSize, int rhsSize, int overlap)
+{
+    QSet<int> lhs;
+    for (int i = 0; i < lhsSize; ++i)
+        lhs.insert(i);
+
+    QSet<int> rhs;
+    for (int i = lhsSize - overlap; i < rhsSize + lhsSize - overlap; ++i)
+        rhs.insert(i);
+
+    return std::make_pair(lhs, rhs);
+}
+
+void tst_QSet::unite_int()
+{
+    QFETCH(int, lhsSize);
+    QFETCH(int, rhsSize);
+    QFETCH(int, overlap);
+
+    auto [lhs, rhs] = build_sets(lhsSize, rhsSize, overlap);
+
+    QBENCHMARK {
+        QSet united = QSet(lhs).unite(rhs);
+        QCOMPARE(united.size(), lhsSize + rhsSize - overlap);
+    }
+}
+
+void tst_QSet::contains_then_insert_int_data()
+{
+    unite_int_data();
+}
+
+void tst_QSet::contains_then_insert_int()
+{
+    QFETCH(int, lhsSize);
+    QFETCH(int, rhsSize);
+    QFETCH(int, overlap);
+
+    auto [lhs, rhs] = build_sets(lhsSize, rhsSize, overlap);
+
+    QBENCHMARK {
+        QSet copy(lhs);
+        for (auto i : rhs) {
+            if (!copy.contains(i))
+                copy.insert(i);
+        }
+        QCOMPARE(copy.size(), lhsSize + rhsSize - overlap);
+    }
+}
+
 QTEST_MAIN(tst_QSet)
 
 #include "tst_bench_qset.moc"