1 files changed, 92 insertions, 19 deletions

diff --git a/tests/auto/corelib/tools/qvector/tst_qvector.cpp b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
index c9545c8eb4..f85d2dee0c 100644
--- a/tests/auto/corelib/tools/qvector/tst_qvector.cpp
+++ b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
@@ -225,7 +225,9 @@ private slots:
     void fromListCustom() const;
     void fromStdVector() const;
     void indexOf() const;
-    void insert() const;
+    void insertInt() const;
+    void insertMovable() const;
+    void insertCustom() const;
     void isEmpty() const;
     void last() const;
     void lastIndexOf() const;
@@ -293,6 +295,7 @@ private:
     template<typename T> void eraseReserved() const;
     template<typename T> void fill() const;
     template<typename T> void fromList() const;
+    template<typename T> void insert() const;
     template<typename T> void prepend() const;
     template<typename T> void remove() const;
     template<typename T> void size() const;
@@ -1210,32 +1213,87 @@ void tst_QVector::indexOf() const
     QVERIFY(myvec.indexOf("A", 4) == -1);
 }
 
+template <typename T>
 void tst_QVector::insert() const
 {
-    QVector<QString> myvec;
-    myvec << "A" << "B" << "C";
+    QVector<T> myvec;
+    const T
+        tA = SimpleValue<T>::at(0),
+        tB = SimpleValue<T>::at(1),
+        tC = SimpleValue<T>::at(2),
+        tX = SimpleValue<T>::at(3),
+        tZ = SimpleValue<T>::at(4),
+        tT = SimpleValue<T>::at(5),
+        ti = SimpleValue<T>::at(6);
+    myvec << tA << tB << tC;
+    QVector<T> myvec2 = myvec;
 
     // first position
-    QCOMPARE(myvec.at(0), QLatin1String("A"));
-    myvec.insert(0, QLatin1String("X"));
-    QCOMPARE(myvec.at(0), QLatin1String("X"));
-    QCOMPARE(myvec.at(1), QLatin1String("A"));
+    QCOMPARE(myvec.at(0), tA);
+    myvec.insert(0, tX);
+    QCOMPARE(myvec.at(0), tX);
+    QCOMPARE(myvec.at(1), tA);
+
+    QCOMPARE(myvec2.at(0), tA);
+    myvec2.insert(myvec2.begin(), tX);
+    QCOMPARE(myvec2.at(0), tX);
+    QCOMPARE(myvec2.at(1), tA);
 
     // middle
-    myvec.insert(1, QLatin1String("Z"));
-    QCOMPARE(myvec.at(0), QLatin1String("X"));
-    QCOMPARE(myvec.at(1), QLatin1String("Z"));
-    QCOMPARE(myvec.at(2), QLatin1String("A"));
+    myvec.insert(1, tZ);
+    QCOMPARE(myvec.at(0), tX);
+    QCOMPARE(myvec.at(1), tZ);
+    QCOMPARE(myvec.at(2), tA);
+
+    myvec2.insert(myvec2.begin() + 1, tZ);
+    QCOMPARE(myvec2.at(0), tX);
+    QCOMPARE(myvec2.at(1), tZ);
+    QCOMPARE(myvec2.at(2), tA);
 
     // end
-    myvec.insert(5, QLatin1String("T"));
-    QCOMPARE(myvec.at(5), QLatin1String("T"));
-    QCOMPARE(myvec.at(4), QLatin1String("C"));
+    myvec.insert(5, tT);
+    QCOMPARE(myvec.at(5), tT);
+    QCOMPARE(myvec.at(4), tC);
+
+    myvec2.insert(myvec2.end(), tT);
+    QCOMPARE(myvec2.at(5), tT);
+    QCOMPARE(myvec2.at(4), tC);
 
     // insert a lot of garbage in the middle
-    myvec.insert(2, 2, QLatin1String("infinity"));
-    QCOMPARE(myvec, QVector<QString>() << "X" << "Z" << "infinity" << "infinity"
-             << "A" << "B" << "C" << "T");
+    myvec.insert(2, 2, ti);
+    QCOMPARE(myvec, QVector<T>() << tX << tZ << ti << ti
+             << tA << tB << tC << tT);
+
+    myvec2.insert(myvec2.begin() + 2, 2, ti);
+    QCOMPARE(myvec2, myvec);
+
+    // insert from references to the same container:
+    myvec.insert(0, 1, myvec[5]);   // inserts tB
+    myvec2.insert(0, 1, myvec2[5]); // inserts tB
+    QCOMPARE(myvec, QVector<T>() << tB << tX << tZ << ti << ti
+             << tA << tB << tC << tT);
+    QCOMPARE(myvec2, myvec);
+
+    myvec.insert(0, 1, const_cast<const QVector<T>&>(myvec)[0]);   // inserts tB
+    myvec2.insert(0, 1, const_cast<const QVector<T>&>(myvec2)[0]); // inserts tB
+    QCOMPARE(myvec, QVector<T>() << tB << tB << tX << tZ << ti << ti
+             << tA << tB << tC << tT);
+    QCOMPARE(myvec2, myvec);
+}
+
+void tst_QVector::insertInt() const
+{
+    insert<int>();
+}
+
+void tst_QVector::insertMovable() const
+{
+    insert<Movable>();
+}
+
+void tst_QVector::insertCustom() const
+{
+    insert<Custom>();
 }
 
 void tst_QVector::isEmpty() const
@@ -1365,13 +1423,28 @@ void tst_QVector::remove() const
     T val1 = SimpleValue<T>::at(1);
     T val2 = SimpleValue<T>::at(2);
     T val3 = SimpleValue<T>::at(3);
+    T val4 = SimpleValue<T>::at(4);
+    myvec << val1 << val2 << val3;
+    myvec << val1 << val2 << val3;
     myvec << val1 << val2 << val3;
     // remove middle
     myvec.remove(1);
-    QCOMPARE(myvec, QVector<T>() << val1 << val3);
+    QCOMPARE(myvec, QVector<T>() << val1 << val3  << val1 << val2 << val3  << val1 << val2 << val3);
+
+    // removeOne()
+    QVERIFY(!myvec.removeOne(val4));
+    QVERIFY(myvec.removeOne(val2));
+    QCOMPARE(myvec, QVector<T>() << val1 << val3  << val1 << val3  << val1 << val2 << val3);
+
+    // removeAll()
+    QCOMPARE(myvec.removeAll(val4), 0);
+    QCOMPARE(myvec.removeAll(val1), 3);
+    QCOMPARE(myvec, QVector<T>() << val3  << val3  << val2 << val3);
+    QCOMPARE(myvec.removeAll(val2), 1);
+    QCOMPARE(myvec, QVector<T>() << val3  << val3  << val3);
 
     // remove rest
-    myvec.remove(0, 2);
+    myvec.remove(0, 3);
     QCOMPARE(myvec, QVector<T>());
 }