From fc88dd52a42da682cbd360916be7c9f94a69b72c Mon Sep 17 00:00:00 2001
From: David Faure <david.faure@kdab.com>
Date: Thu, 25 Oct 2018 11:07:58 +0200
Subject: QByteArrayList: add indexOf(const char*) overload

This avoids memory allocation and data copying in e.g.
QObject::property().

Detected by heaptrack's "Temporary allocations" counter in an
application using the breeze widget style (many animations).

Change-Id: Iabdb58a3e504cb121cce906ef707b0722de89df6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 .../tools/qbytearraylist/tst_qbytearraylist.cpp    | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'tests/auto')

diff --git a/tests/auto/corelib/tools/qbytearraylist/tst_qbytearraylist.cpp b/tests/auto/corelib/tools/qbytearraylist/tst_qbytearraylist.cpp
index 85b4c4bfb7..2d2c536453 100644
--- a/tests/auto/corelib/tools/qbytearraylist/tst_qbytearraylist.cpp
+++ b/tests/auto/corelib/tools/qbytearraylist/tst_qbytearraylist.cpp
@@ -49,6 +49,9 @@ private slots:
     void operator_plus() const;
     void operator_plus_data() const;
 
+    void indexOf_data() const;
+    void indexOf() const;
+
     void initializerList() const;
 };
 
@@ -259,6 +262,29 @@ void tst_QByteArrayList::operator_plus_data() const
                             << ( QByteArrayList() << "a" << "" << "c" );
 }
 
+void tst_QByteArrayList::indexOf_data() const
+{
+    QTest::addColumn<QByteArrayList>("list");
+    QTest::addColumn<QByteArray>("item");
+    QTest::addColumn<int>("expectedResult");
+
+    QTest::newRow("empty") << QByteArrayList() << QByteArray("a") << -1;
+    QTest::newRow("found_1") << ( QByteArrayList() << "a" ) << QByteArray("a") << 0;
+    QTest::newRow("not_found_1") << ( QByteArrayList() << "a" ) << QByteArray("b") << -1;
+    QTest::newRow("found_2") << ( QByteArrayList() << "hello" << "world" ) << QByteArray("world") << 1;
+    QTest::newRow("returns_first") << ( QByteArrayList() << "hello" << "world" << "hello" << "again" ) << QByteArray("hello") << 0;
+}
+
+void tst_QByteArrayList::indexOf() const
+{
+    QFETCH(QByteArrayList, list);
+    QFETCH(QByteArray, item);
+    QFETCH(int, expectedResult);
+
+    QCOMPARE(list.indexOf(item), expectedResult);
+    QCOMPARE(list.indexOf(item.constData()), expectedResult);
+}
+
 void tst_QByteArrayList::initializerList() const
 {
 #ifdef Q_COMPILER_INITIALIZER_LISTS
-- 
cgit v1.2.3