1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add autotest support for QRestReply json parsing errors

Browse Source 
Change-Id: Iffabdcafa49f16e24f182991c527b3d3217ca955
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit 2d9afc8501879a0ef39bc169cdf8d0b7fa9616f8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Juha Vuolle 2024-01-10 10:33:37 +02:00 committed by Qt Cherry-pick Bot
parent a915e2b211
commit 0fa4721dfa
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/auto/network/access/qrestaccessmanager/tst_qrestaccessmanager.cpp
View File

@ -740,6 +740,7 @@ void tst_QRestAccessManager::json()
QNetworkRequest request(server.url()); QNetworkRequest request(server.url());
QRestReply *replyFromServer = nullptr; QRestReply *replyFromServer = nullptr;
QJsonDocument responseJsonDocument; QJsonDocument responseJsonDocument;
QJsonParseError parseError;
HttpData serverSideRequest; // The request data the server received HttpData serverSideRequest; // The request data the server received
HttpData serverSideResponse; // The response data the server responds with HttpData serverSideResponse; // The response data the server responds with
@ -751,10 +752,19 @@ void tst_QRestAccessManager::json()
// Test receiving valid json object // Test receiving valid json object
serverSideResponse.body = "{\"key1\":\"value1\",""\"key2\":\"value2\"}\n"_ba; serverSideResponse.body = "{\"key1\":\"value1\",""\"key2\":\"value2\"}\n"_ba;
manager.get(request, this, [&](QRestReply *reply) { replyFromServer = reply; }); replyFromServer = manager.get(request);
QTRY_VERIFY(replyFromServer); // Read unfinished reply
std::optional json = replyFromServer->json(); QVERIFY(!replyFromServer->isFinished());
QTest::ignoreMessage(QtWarningMsg, "Attempt to read json() of an unfinished reply, ignoring.");
parseError.error = QJsonParseError::ParseError::DocumentTooLarge; // Reset to impossible value
QVERIFY(!replyFromServer->json(&parseError));
QCOMPARE(parseError.error, QJsonParseError::ParseError::NoError);
// Read finished reply
QTRY_VERIFY(replyFromServer->isFinished());
parseError.error = QJsonParseError::ParseError::DocumentTooLarge;
std::optional json = replyFromServer->json(&parseError);
QVERIFY(json); QVERIFY(json);
QCOMPARE(parseError.error, QJsonParseError::ParseError::NoError);
responseJsonDocument = *json; responseJsonDocument = *json;
QVERIFY(responseJsonDocument.isObject()); QVERIFY(responseJsonDocument.isObject());
QCOMPARE(responseJsonDocument["key1"], "value1"); QCOMPARE(responseJsonDocument["key1"], "value1");
@ -766,7 +776,11 @@ void tst_QRestAccessManager::json()
serverSideResponse.body = "foobar"_ba; serverSideResponse.body = "foobar"_ba;
manager.get(request, this, [&](QRestReply *reply) { replyFromServer = reply; }); manager.get(request, this, [&](QRestReply *reply) { replyFromServer = reply; });
QTRY_VERIFY(replyFromServer); QTRY_VERIFY(replyFromServer);
QVERIFY(!replyFromServer->json().has_value()); // std::nullopt returned parseError.error = QJsonParseError::ParseError::DocumentTooLarge;
QVERIFY(!replyFromServer->json(&parseError).has_value()); // std::nullopt returned
QCOMPARE_NE(parseError.error, QJsonParseError::ParseError::NoError);
QCOMPARE_NE(parseError.error, QJsonParseError::ParseError::DocumentTooLarge);
QCOMPARE_GT(parseError.offset, 0);
replyFromServer->deleteLater(); replyFromServer->deleteLater();
replyFromServer = nullptr; replyFromServer = nullptr;
@ -774,7 +788,9 @@ void tst_QRestAccessManager::json()
serverSideResponse.body = "[\"foo\", \"bar\"]\n"_ba; serverSideResponse.body = "[\"foo\", \"bar\"]\n"_ba;
manager.get(request, this, [&](QRestReply *reply) { replyFromServer = reply; }); manager.get(request, this, [&](QRestReply *reply) { replyFromServer = reply; });
QTRY_VERIFY(replyFromServer); QTRY_VERIFY(replyFromServer);
json = replyFromServer->json(); parseError.error = QJsonParseError::ParseError::DocumentTooLarge;
json = replyFromServer->json(&parseError);
QCOMPARE(parseError.error, QJsonParseError::ParseError::NoError);
QVERIFY(json); QVERIFY(json);
responseJsonDocument = *json; responseJsonDocument = *json;
QVERIFY(responseJsonDocument.isArray()); QVERIFY(responseJsonDocument.isArray());
@ -788,7 +804,11 @@ void tst_QRestAccessManager::json()
serverSideResponse.body = "foobar"_ba; serverSideResponse.body = "foobar"_ba;
manager.get(request, this, [&](QRestReply *reply) { replyFromServer = reply; }); manager.get(request, this, [&](QRestReply *reply) { replyFromServer = reply; });
QTRY_VERIFY(replyFromServer); QTRY_VERIFY(replyFromServer);
QVERIFY(!replyFromServer->json().has_value()); // std::nullopt returned parseError.error = QJsonParseError::ParseError::DocumentTooLarge;
QVERIFY(!replyFromServer->json(&parseError).has_value()); // std::nullopt returned
QCOMPARE_NE(parseError.error, QJsonParseError::ParseError::NoError);
QCOMPARE_NE(parseError.error, QJsonParseError::ParseError::DocumentTooLarge);
QCOMPARE_GT(parseError.offset, 0);
replyFromServer->deleteLater(); replyFromServer->deleteLater();
replyFromServer = nullptr; replyFromServer = nullptr;
} }