From 9228b527f2fa95aad7f34cbc44905fb8b371bbf7 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Fri, 28 May 2010 15:43:28 +0200
Subject: test QMultiMap::operator+= and QMultiHash::operator+=

---
 tests/auto/qhash/tst_qhash.cpp | 20 ++++++++++++++++++++
 tests/auto/qmap/tst_qmap.cpp   | 20 ++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/tests/auto/qhash/tst_qhash.cpp b/tests/auto/qhash/tst_qhash.cpp
index 59576d9470..3a7b54acce 100644
--- a/tests/auto/qhash/tst_qhash.cpp
+++ b/tests/auto/qhash/tst_qhash.cpp
@@ -1154,6 +1154,26 @@ void tst_QHash::qmultihash_specific()
     QVERIFY(i.key() == 9);
     QVERIFY(i.value() == 98);
     }
+
+    {
+    QMultiHash<int, int> map1;
+    map1.insert(42, 1);
+    map1.insert(10, 2);
+    map1.insert(48, 3);
+    QMultiHash<int, int> map2;
+    map2.insert(8, 4);
+    map2.insert(42, 5);
+    map2.insert(95, 12);
+
+    map1+=map2;
+    map2.insert(42, 1);
+    map2.insert(10, 2);
+    map2.insert(48, 3);
+    QCOMPARE(map1.count(), map2.count());
+    QVERIFY(map1.remove(42,5));
+    QVERIFY(map2.remove(42,5));
+    QVERIFY(map1 == map2);
+    }
 }
 
 template <typename T>
diff --git a/tests/auto/qmap/tst_qmap.cpp b/tests/auto/qmap/tst_qmap.cpp
index d3ed76dcd4..a1b8de72fd 100644
--- a/tests/auto/qmap/tst_qmap.cpp
+++ b/tests/auto/qmap/tst_qmap.cpp
@@ -837,6 +837,26 @@ void tst_QMap::qmultimap_specific()
     QVERIFY(i.key() == 9);
     QVERIFY(i.value() == 98);
     }
+
+    {
+    QMultiMap<int, int> map1;
+    map1.insert(42, 1);
+    map1.insert(10, 2);
+    map1.insert(48, 3);
+    QMultiMap<int, int> map2;
+    map2.insert(8, 4);
+    map2.insert(42, 5);
+    map2.insert(95, 12);
+
+    map1+=map2;
+    map2.insert(42, 1);
+    map2.insert(10, 2);
+    map2.insert(48, 3);
+    QCOMPARE(map1.count(), map2.count());
+    QVERIFY(map1.remove(42,5));
+    QVERIFY(map2.remove(42,5));
+    QVERIFY(map1 == map2);
+    }
 }
 
 QTEST_APPLESS_MAIN(tst_QMap)
-- 
cgit v1.2.3