1 files changed, 65 insertions, 7 deletions
diff --git a/tests/benchmarks/corelib/tools/qstring/main.cpp b/tests/benchmarks/corelib/tools/qstring/main.cpp
index 64dfad82c9..9b40d5c676 100644
--- a/tests/benchmarks/corelib/tools/qstring/main.cpp
+++ b/tests/benchmarks/corelib/tools/qstring/main.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** 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 Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -40,18 +40,76 @@ class tst_QString: public QObject
 public:
     tst_QString();
 private slots:
+    void section_regexp_data() { section_data_impl(); }
+    void section_regexp() { section_impl<QRegExp>(); }
+    void section_regularexpression_data() { section_data_impl(); }
+    void section_regularexpression() { section_impl<QRegularExpression>(); }
+    void section_string_data() { section_data_impl(false); }
+    void section_string() { section_impl<QString>(); }
+
     void toUpper_data();
     void toUpper();
     void toLower_data();
     void toLower();
     void toCaseFolded_data();
     void toCaseFolded();
+
+private:
+    void section_data_impl(bool includeRegExOnly = true);
+    template <typename RX> void section_impl();
 };
 
 tst_QString::tst_QString()
 {
 }
 
+void tst_QString::section_data_impl(bool includeRegExOnly)
+{
+    QTest::addColumn<QString>("s");
+    QTest::addColumn<QString>("sep");
+    QTest::addColumn<bool>("isRegExp");
+
+    QTest::newRow("IPv4") << QStringLiteral("192.168.0.1") << QStringLiteral(".") << false;
+    QTest::newRow("IPv6") << QStringLiteral("2001:0db8:85a3:0000:0000:8a2e:0370:7334") << QStringLiteral(":") << false;
+    if (includeRegExOnly) {
+        QTest::newRow("IPv6-reversed-roles") << QStringLiteral("2001:0db8:85a3:0000:0000:8a2e:0370:7334") << QStringLiteral("\\d+") << true;
+        QTest::newRow("IPv6-complex") << QStringLiteral("2001:0db8:85a3:0000:0000:8a2e:0370:7334") << QStringLiteral("(\\d+):\\1") << true;
+    }
+}
+
+template <typename RX>
+inline QString escape(const QString &s)
+{ return RX::escape(s); }
+
+template <>
+inline QString escape<QString>(const QString &s)
+{ return s; }
+
+template <typename RX>
+inline void optimize(RX &) {}
+
+template <>
+inline void optimize(QRegularExpression &rx)
+{ rx.optimize(); }
+
+template <typename RX>
+void tst_QString::section_impl()
+{
+    QFETCH(QString, s);
+    QFETCH(QString, sep);
+    QFETCH(bool, isRegExp);
+
+    RX rx(isRegExp ? sep : escape<RX>(sep));
+    optimize(rx);
+    for (int i = 0; i < 20; ++i)
+        (void) s.count(rx); // make (s, rx) hot
+
+    QBENCHMARK {
+        const QString result = s.section(rx, 0, 16);
+        Q_UNUSED(result);
+    }
+}
+
 void tst_QString::toUpper_data()
 {
     QTest::addColumn<QString>("s");