Change QRestReply json return type to QJsonDocument

The json return type and function naming has gone back
and forth. Let's go with QJsonDocument after all, and add new
overloads in future if necessary.

Pick-to: 6.7
Task-number: QTBUG-119002
Change-Id: I3f9de0e6cba7d5c52d016d252d65b81f345af050
Reviewed-by: Marc Mutz <marc.mutz@qt.io>

1 files changed, 15 insertions, 10 deletions

diff --git a/tests/auto/network/access/qrestaccessmanager/tst_qrestaccessmanager.cpp b/tests/auto/network/access/qrestaccessmanager/tst_qrestaccessmanager.cpp
index 89c5c09659..f46cb6fc11 100644
--- a/tests/auto/network/access/qrestaccessmanager/tst_qrestaccessmanager.cpp
+++ b/tests/auto/network/access/qrestaccessmanager/tst_qrestaccessmanager.cpp
@@ -739,8 +739,7 @@ void tst_QRestAccessManager::json()
     QTRY_VERIFY(server.isListening());
     QNetworkRequest request(server.url());
     QRestReply *replyFromServer = nullptr;
-    QJsonObject responseJsonObject;
-    QJsonArray responseJsonArray;
+    QJsonDocument responseJsonDocument;
 
     HttpData serverSideRequest;  // The request data the server received
     HttpData serverSideResponse; // The response data the server responds with
@@ -754,9 +753,12 @@ void tst_QRestAccessManager::json()
     serverSideResponse.body = "{\"key1\":\"value1\",""\"key2\":\"value2\"}\n"_ba;
     manager.get(request, this, [&](QRestReply *reply) { replyFromServer = reply; });
     QTRY_VERIFY(replyFromServer);
-    responseJsonObject = *replyFromServer->json();
-    QCOMPARE(responseJsonObject["key1"], "value1");
-    QCOMPARE(responseJsonObject["key2"], "value2");
+    std::optional json = replyFromServer->json();
+    QVERIFY(json);
+    responseJsonDocument = *json;
+    QVERIFY(responseJsonDocument.isObject());
+    QCOMPARE(responseJsonDocument["key1"], "value1");
+    QCOMPARE(responseJsonDocument["key2"], "value2");
     replyFromServer->deleteLater();
     replyFromServer = nullptr;
 
@@ -772,10 +774,13 @@ void tst_QRestAccessManager::json()
     serverSideResponse.body = "[\"foo\", \"bar\"]\n"_ba;
     manager.get(request, this, [&](QRestReply *reply) { replyFromServer = reply; });
     QTRY_VERIFY(replyFromServer);
-    responseJsonArray = *replyFromServer->jsonArray();
-    QCOMPARE(responseJsonArray.size(), 2);
-    QCOMPARE(responseJsonArray[0].toString(), "foo"_L1);
-    QCOMPARE(responseJsonArray[1].toString(), "bar"_L1);
+    json = replyFromServer->json();
+    QVERIFY(json);
+    responseJsonDocument = *json;
+    QVERIFY(responseJsonDocument.isArray());
+    QCOMPARE(responseJsonDocument.array().size(), 2);
+    QCOMPARE(responseJsonDocument[0].toString(), "foo"_L1);
+    QCOMPARE(responseJsonDocument[1].toString(), "bar"_L1);
     replyFromServer->deleteLater();
     replyFromServer = nullptr;
 
@@ -783,7 +788,7 @@ void tst_QRestAccessManager::json()
     serverSideResponse.body = "foobar"_ba;
     manager.get(request, this, [&](QRestReply *reply) { replyFromServer = reply; });
     QTRY_VERIFY(replyFromServer);
-    QVERIFY(!replyFromServer->jsonArray().has_value()); // std::nullopt returned
+    QVERIFY(!replyFromServer->json().has_value()); // std::nullopt returned
     replyFromServer->deleteLater();
     replyFromServer = nullptr;
 }