QVariantMap -> QMultiMap<QString, QVariant> in many cases

Following the separation of QMap and QMultiMap we can no longer create
a QMultiMap<QString, QVariant> from a QVariantMap so entries need to be
inserted through a raw loop.

QMap can also no longer hold multiple values per key and as such
parameters where this would be expected have changed to
QMultiMap<QString, QVariant> as well.

Task-number: QTBUG-85930
Change-Id: I5bdfe38c22ea0cdde5bd1336a0070514e8d6474f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

2 files changed, 22 insertions, 21 deletions

diff --git a/tests/auto/oauth1/tst_oauth1.cpp b/tests/auto/oauth1/tst_oauth1.cpp
index f44c89d..8e56439 100644
--- a/tests/auto/oauth1/tst_oauth1.cpp
+++ b/tests/auto/oauth1/tst_oauth1.cpp
@@ -121,10 +121,10 @@ public:
         }
     };
 
-    QVariantMap parseAuthorizationString(const QString &string)
+    QMultiMap<QString, QVariant> parseAuthorizationString(const QString &string)
     {
         const QString prefix = QStringLiteral("OAuth ");
-        QVariantMap ret;
+        QMultiMap<QString, QVariant> ret;
         Q_ASSERT(string.startsWith(prefix));
         QRegularExpression rx("(?<key>.[^=]*)=\"(?<value>.[^\"]*)\",?");
         auto globalMatch = rx.globalMatch(string, prefix.size());
@@ -427,7 +427,7 @@ void tst_OAuth1::getToken()
     StringPair tokenReceived;
     QNetworkAccessManager networkAccessManager;
     QNetworkReplyPtr reply;
-    QVariantMap oauthHeaders;
+    QMultiMap<QString, QVariant> oauthHeaders;
 
     WebServer webServer([&](const WebServer::HttpRequest &request, QTcpSocket *socket) {
         oauthHeaders = parseAuthorizationString(request.headers["Authorization"]);
@@ -464,12 +464,12 @@ void tst_OAuth1::getToken()
     });
     QVERIFY(waitForFinish(reply) == Success);
     QCOMPARE(tokenReceived, expectedToken);
-    QCOMPARE(oauthHeaders["oauth_consumer_key"], clientCredentials.first);
-    QCOMPARE(oauthHeaders["oauth_version"], "1.0");
+    QCOMPARE(oauthHeaders.value("oauth_consumer_key"), clientCredentials.first);
+    QCOMPARE(oauthHeaders.value("oauth_version"), "1.0");
     QString expectedSignature;
     {
-        QVariantMap modifiedHeaders = oauthHeaders;
-        modifiedHeaders.insert(parameters);
+        QMultiMap<QString, QVariant> modifiedHeaders = oauthHeaders;
+        modifiedHeaders.insert(QMultiMap<QString, QVariant>(parameters));
         modifiedHeaders.remove("oauth_signature");
         QOAuth1Signature signature(url,
                                    clientCredentials.second,
@@ -488,7 +488,7 @@ void tst_OAuth1::getToken()
             break;
         }
     }
-    QCOMPARE(oauthHeaders["oauth_signature"], expectedSignature);
+    QCOMPARE(oauthHeaders.value("oauth_signature"), expectedSignature);
 }
 
 void tst_OAuth1::prepareRequestSignature_data()
@@ -569,7 +569,7 @@ void tst_OAuth1::prepareRequestSignature()
     o1.prepareRequest(&request, operation, body);
 
     // extract oauth parameters from the headers
-    QVariantMap authArgs;
+    QMultiMap<QString, QVariant> authArgs;
     const auto authHeader = request.rawHeader("Authorization");
     QCOMPARE(authHeader.mid(0, 6), "OAuth ");
     const auto values = authHeader.mid(6).split(',');
@@ -594,7 +594,7 @@ void tst_OAuth1::prepareRequestSignature()
     const auto sigString = QUrl::fromPercentEncoding(authArgs.take(oauthSignature)
                                                      .toByteArray()).toUtf8();
 
-    authArgs.insert(extraParams);
+    authArgs.insert(QMultiMap<QString, QVariant>(extraParams));
     QOAuth1Signature signature(request.url(),
                                consumerSecret,
                                accessKeySecret,
diff --git a/tests/auto/oauth1signature/tst_oauth1signature.cpp b/tests/auto/oauth1signature/tst_oauth1signature.cpp
index 6f216ff..c359bf2 100644
--- a/tests/auto/oauth1signature/tst_oauth1signature.cpp
+++ b/tests/auto/oauth1signature/tst_oauth1signature.cpp
@@ -109,7 +109,7 @@ void tst_OAuth1Signature::signatures_data()
     QTest::addColumn<QString>("tokenSecret");
     QTest::addColumn<QString>("nonce");
     QTest::addColumn<QString>("timestamp");
-    QTest::addColumn<QVariantMap>("parameters");
+    QTest::addColumn<QMultiMap<QString, QVariant>>("parameters");
     QTest::addColumn<QString>("result");
 
     QTest::newRow("standard") << QUrl("http://example.net")
@@ -122,7 +122,7 @@ void tst_OAuth1Signature::signatures_data()
                               << "accesssecret"
                               << "468167367"
                               << "1494852816"
-                              << QVariantMap()
+                              << QMultiMap<QString, QVariant>()
                               << "mQaARxv7pqJyViuwNGtUfm6QSIQ=";
     QTest::newRow("post") << QUrl("http://example.net")
                           << QOAuth1Signature::HttpRequestMethod::Post
@@ -134,7 +134,7 @@ void tst_OAuth1Signature::signatures_data()
                           << "accesssecret"
                           << "468167367"
                           << "1494852816"
-                          << QVariantMap()
+                          << QMultiMap<QString, QVariant>()
                           << "L4blJKqYMTSNUEt32rCgDLhxQxM=";
     QTest::newRow("put") << QUrl("http://example.net")
                          << QOAuth1Signature::HttpRequestMethod::Put
@@ -146,7 +146,7 @@ void tst_OAuth1Signature::signatures_data()
                          << "accesssecret"
                          << "468167367"
                          << "1494852816"
-                         << QVariantMap()
+                         << QMultiMap<QString, QVariant>()
                          << "+eiZ+phNoYnETf6SqI+XSE43JSY=";
     QTest::newRow("delete") << QUrl("http://example.net")
                             << QOAuth1Signature::HttpRequestMethod::Delete
@@ -158,7 +158,7 @@ void tst_OAuth1Signature::signatures_data()
                             << "accesssecret"
                             << "468167367"
                             << "1494852816"
-                            << QVariantMap()
+                            << QMultiMap<QString, QVariant>()
                             << "enbOVNG7/vGliie2/L44NdccMaw=";
     QTest::newRow("head") << QUrl("http://example.net")
                           << QOAuth1Signature::HttpRequestMethod::Head
@@ -170,7 +170,7 @@ void tst_OAuth1Signature::signatures_data()
                           << "accesssecret"
                           << "468167367"
                           << "1494852816"
-                          << QVariantMap()
+                          << QMultiMap<QString, QVariant>()
                           << "6v74w0rRsVibJsJ796Nj8cJPqEU=";
     QTest::newRow("no-hmac-key") << QUrl("http://example.net")
                                  << QOAuth1Signature::HttpRequestMethod::Get
@@ -182,7 +182,7 @@ void tst_OAuth1Signature::signatures_data()
                                  << QString()
                                  << "468167367"
                                  << "1494852816"
-                                 << QVariantMap()
+                                 << QMultiMap<QString, QVariant>()
                                  << "N2qP+LJdLbjalZq71M7oxPdeUjc=";
     QTest::newRow("custom-values") << QUrl("http://example.net")
                                    << QOAuth1Signature::HttpRequestMethod::Get
@@ -194,7 +194,7 @@ void tst_OAuth1Signature::signatures_data()
                                    << "accesssecret"
                                    << "468167367"
                                    << "1494852816"
-                                   << QVariantMap {
+                                   << QMultiMap<QString, QVariant> {
                                         { "firstKey", "firstValue" },
                                         { "secondKey", "secondValue" }
                                     }
@@ -209,7 +209,7 @@ void tst_OAuth1Signature::signatures_data()
                                      << "accesssecret"
                                      << "468167367"
                                      << "1494852816"
-                                     << QVariantMap()
+                                     << QMultiMap<QString, QVariant>()
                                      << "mQaARxv7pqJyViuwNGtUfm6QSIQ=";
     QTest::newRow("custom-verb-patch") << QUrl("http://example.net")
                                        << QOAuth1Signature::HttpRequestMethod::Custom
@@ -221,7 +221,7 @@ void tst_OAuth1Signature::signatures_data()
                                        << "accesssecret"
                                        << "468167367"
                                        << "1494852816"
-                                       << QVariantMap()
+                                       << QMultiMap<QString, QVariant>()
                                        << "kcRO68D7IBQWlQvUR/jkhuF8AKM=";
 }
 
@@ -240,7 +240,8 @@ void tst_OAuth1Signature::signatures()
     QFETCH(QString, tokenSecret);
     QFETCH(QString, nonce);
     QFETCH(QString, timestamp);
-    QFETCH(QVariantMap, parameters);
+    using MultiMap = QMultiMap<QString, QVariant>;
+    QFETCH(MultiMap, parameters);
     QFETCH(QString, result);
 
     parameters.insert(oauthVersion, version);