Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-28 08:49:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Test Content-Type extraction.

Browse Source
This commit is contained in:
Patrick Sean Klein 2023-05-10 21:30:42 +01:00
parent 1888d776ae
commit 7a015f0666
No known key found for this signature in database
GPG Key ID: B6D50F39A56F6906
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/NetworkRequest.cpp
View File

@ -27,7 +27,7 @@ namespace
contentType = tokens[0].trimmed(); contentType = tokens[0].trimmed();
for (int i = 1; i < tokens.size(); ++i) { for (int i = 1; i < tokens.size(); ++i) {
auto parameterTokens = tokens[i].split("="); auto parameterTokens = tokens[i].split("=");
contentTypeParameters[parameterTokens[0]] = parameterTokens[1]; contentTypeParameters[parameterTokens[0].trimmed()] = parameterTokens[1].trimmed();
} }
return {contentType, contentTypeParameters}; return {contentType, contentTypeParameters};
} }

32
tests/TestNetworkRequest.cpp
View File

@ -7,10 +7,16 @@
QTEST_GUILESS_MAIN(TestNetworkRequest) QTEST_GUILESS_MAIN(TestNetworkRequest)
using ContentTypeParameters_t = QHash<QString, QString>;
Q_DECLARE_METATYPE(ContentTypeParameters_t);
void TestNetworkRequest::testNetworkRequest() void TestNetworkRequest::testNetworkRequest()
{ {
QFETCH(QUrl, requestedURL); QFETCH(QUrl, requestedURL);
QFETCH(QByteArray, expectedContent); QFETCH(QByteArray, expectedContent);
QFETCH(QString, responseContentType);
QFETCH(QString, expectedContentType);
QFETCH(ContentTypeParameters_t, expectedContentTypeParameters);
QFETCH(QString, expectedUserAgent); QFETCH(QString, expectedUserAgent);
QFETCH(bool, expectError); QFETCH(bool, expectError);
QFETCH(QNetworkReply::NetworkError, error); QFETCH(QNetworkReply::NetworkError, error);
@ -26,7 +32,7 @@ void TestNetworkRequest::testNetworkRequest()
QRegularExpression(expectedUserAgent))) QRegularExpression(expectedUserAgent)))
.reply(); .reply();
if (!expectError) { if (!expectError) {
reply.withBody(expectedContent); reply.withBody(expectedContent).withHeader(QNetworkRequest::ContentTypeHeader, responseContentType);
} else { } else {
reply.withError(error); reply.withError(error);
} }
@ -55,8 +61,11 @@ void TestNetworkRequest::testNetworkRequest()
QCOMPARE(request.URL(), requestedURL); QCOMPARE(request.URL(), requestedURL);
if(!expectError) { if(!expectError) {
QCOMPARE(actualContent, expectedContent); QCOMPARE(actualContent, expectedContent);
QCOMPARE(request.ContentType(), expectedContentType);
QCOMPARE(request.ContentTypeParameters(), expectedContentTypeParameters);
QCOMPARE(didSucceed, true); QCOMPARE(didSucceed, true);
QCOMPARE(didError, false); QCOMPARE(didError, false);
QCOMPARE(request.Reply()->isFinished(), true);
} else { } else {
QCOMPARE(didSucceed, false); QCOMPARE(didSucceed, false);
QCOMPARE(didError, true); QCOMPARE(didError, true);
@ -66,6 +75,9 @@ void TestNetworkRequest::testNetworkRequest_data()
{ {
QTest::addColumn<QUrl>("requestedURL"); QTest::addColumn<QUrl>("requestedURL");
QTest::addColumn<QByteArray>("expectedContent"); QTest::addColumn<QByteArray>("expectedContent");
QTest::addColumn<QString>("responseContentType");
QTest::addColumn<QString>("expectedContentType");
QTest::addColumn<ContentTypeParameters_t>("expectedContentTypeParameters");
QTest::addColumn<QString>("expectedUserAgent"); QTest::addColumn<QString>("expectedUserAgent");
QTest::addColumn<bool>("expectError"); QTest::addColumn<bool>("expectError");
QTest::addColumn<QNetworkReply::NetworkError>("error"); QTest::addColumn<QNetworkReply::NetworkError>("error");
@ -75,15 +87,29 @@ void TestNetworkRequest::testNetworkRequest_data()
const QUrl& exampleURL = QUrl{"https://example.com"}; const QUrl& exampleURL = QUrl{"https://example.com"};
const QByteArray& exampleContent = QString{"test-content"}.toUtf8(); const QByteArray& exampleContent = QString{"test-content"}.toUtf8();
QTest::newRow("successful request") << exampleURL << exampleContent << defaultUserAgent QTest::newRow("successful request") << exampleURL << exampleContent << "text/plain"
<< false << QNetworkReply::NetworkError::NoError; << "text/plain" << ContentTypeParameters_t{}
<< defaultUserAgent << false << QNetworkReply::NetworkError::NoError;
QTest::newRow("content type") << exampleURL << exampleContent << "application/test-content-type"
<< "application/test-content-type" << ContentTypeParameters_t{}
<< defaultUserAgent << false << QNetworkReply::NetworkError::NoError;
QTest::newRow("content type parameters") << exampleURL << exampleContent << "application/test-content-type;test-param=test-value"
<< "application/test-content-type" << ContentTypeParameters_t {{"test-param", "test-value"}}
<< defaultUserAgent << false << QNetworkReply::NetworkError::NoError;
QTest::newRow("content type parameters trimmed") << exampleURL << exampleContent << "application/test-content-type; test-param = test-value"
<< "application/test-content-type" << ContentTypeParameters_t {{"test-param", "test-value"}}
<< defaultUserAgent << false << QNetworkReply::NetworkError::NoError;
} }
void TestNetworkRequest::testNetworkRequestTimeout() void TestNetworkRequest::testNetworkRequestTimeout()
{ {
// Timeout should work for single request
// Timeout should capture entire duration, including redirects
// TODO // TODO
} }
void TestNetworkRequest::testNetworkRequestRedirects() void TestNetworkRequest::testNetworkRequestRedirects()
{ {
// Should respect max number of redirects
// Headers, Reply, etc. should reflect final request
// TODO // TODO
} }