From 8020a5279359097fe7d61fcc26ef89db4079aea0 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Sat, 25 Jan 2020 22:27:16 +0100
Subject: [PATCH] Adjust QVariant autotest to prepare for upcoming QHash
 changes

QHash won't contain an insertMulti() method anymore.

Change-Id: I507e76d496c3a33a6e88d15aa30df06c07eeba9f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 .../corelib/kernel/qvariant/tst_qvariant.cpp  | 28 +++----------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index 9f022b3b14..91733bea90 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -2279,16 +2279,6 @@ void tst_QVariant::variantMap()
     QCOMPARE(qvariant_cast<QVariantMap>(v3).value("test").toInt(), 42);
 
     QCOMPARE(v, QVariant(v.toHash()));
-
-    // multi-keys
-    map.insertMulti("test", 47);
-    v = map;
-    map2 = qvariant_cast<QVariantMap>(v);
-    QCOMPARE(map2, map);
-    map2 = v.toMap();
-    QCOMPARE(map2, map);
-
-    QCOMPARE(v, QVariant(v.toHash()));
 }
 
 void tst_QVariant::variantHash()
@@ -2312,16 +2302,6 @@ void tst_QVariant::variantHash()
     QCOMPARE(qvariant_cast<QVariantHash>(v3).value("test").toInt(), 42);
 
     QCOMPARE(v, QVariant(v.toMap()));
-
-    // multi-keys
-    hash.insertMulti("test", 47);
-    v = hash;
-    hash2 = qvariant_cast<QVariantHash>(v);
-    QCOMPARE(hash2, hash);
-    hash2 = v.toHash();
-    QCOMPARE(hash2, hash);
-
-    QCOMPARE(v, QVariant(v.toMap()));
 }
 
 class CustomQObject : public QObject {
@@ -3063,7 +3043,7 @@ void tst_QVariant::convertIterables() const
         QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().count(), map.count());
         QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().count(), map.count());
 
-        map.insertMulti("3", 5);
+        map.insert("4", 5);
         QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().count(), map.count());
         QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().count(), map.count());
     }
@@ -3073,7 +3053,7 @@ void tst_QVariant::convertIterables() const
         QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().count(), map.count());
         QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().count(), map.count());
 
-        map.insertMulti("3", 5);
+        map.insert("4", 5);
         QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().count(), map.count());
         QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().count(), map.count());
     }
@@ -3083,7 +3063,7 @@ void tst_QVariant::convertIterables() const
         QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().count(), hash.count());
         QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().count(), hash.count());
 
-        hash.insertMulti("3", 5);
+        hash.insert("4", 5);
         QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().count(), hash.count());
         QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().count(), hash.count());
     }
@@ -3093,7 +3073,7 @@ void tst_QVariant::convertIterables() const
         QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().count(), hash.count());
         QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().count(), hash.count());
 
-        hash.insertMulti("3", 5);
+        hash.insert("4", 5);
         QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().count(), hash.count());
         QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().count(), hash.count());
     }