diff options
author | Juha Vuolle <juha.vuolle@qt.io> | 2024-01-11 08:42:00 +0200 |
---|---|---|
committer | Juha Vuolle <juha.vuolle@qt.io> | 2024-01-15 09:43:38 +0200 |
commit | 819a8f30f4cf2efe3b8e1f3f6356ff0afed0ae65 (patch) | |
tree | e88111834c6c344238eab4cbd285f6056dd4693c /tests/auto/network | |
parent | 80df23bc7b966c0c0f984ff20d5d0dc1e0b2e025 (diff) |
Rename QNetworkRequestFactory header functions to commonHeaders
Resulted from API-review
Pick-to: 6.7
Change-Id: Iae712e67839d27064a0155830fd201ab15693091
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'tests/auto/network')
-rw-r--r-- | tests/auto/network/access/qnetworkrequestfactory/tst_qnetworkrequestfactory.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/tests/auto/network/access/qnetworkrequestfactory/tst_qnetworkrequestfactory.cpp b/tests/auto/network/access/qnetworkrequestfactory/tst_qnetworkrequestfactory.cpp index c2610132d0..7ea0e854ba 100644 --- a/tests/auto/network/access/qnetworkrequestfactory/tst_qnetworkrequestfactory.cpp +++ b/tests/auto/network/access/qnetworkrequestfactory/tst_qnetworkrequestfactory.cpp @@ -192,29 +192,29 @@ void tst_QNetworkRequestFactory::headers() QNetworkRequestFactory factory{url1}; // Initial state when no headers are set - QVERIFY(factory.headers().isEmpty()); - QVERIFY(factory.headers().values(name1).isEmpty()); - QVERIFY(!factory.headers().contains(name1)); + QVERIFY(factory.commonHeaders().isEmpty()); + QVERIFY(factory.commonHeaders().values(name1).isEmpty()); + QVERIFY(!factory.commonHeaders().contains(name1)); // Set headers QHttpHeaders h1; h1.append(name1, value1); - factory.setHeaders(h1); - QVERIFY(factory.headers().contains(name1)); - QCOMPARE(factory.headers().combinedValue(name1), value1); - QCOMPARE(factory.headers().size(), 1); - QVERIFY(factory.headers().values("nonexistent").isEmpty()); + factory.setCommonHeaders(h1); + QVERIFY(factory.commonHeaders().contains(name1)); + QCOMPARE(factory.commonHeaders().combinedValue(name1), value1); + QCOMPARE(factory.commonHeaders().size(), 1); + QVERIFY(factory.commonHeaders().values("nonexistent").isEmpty()); QNetworkRequest request = factory.createRequest(); QVERIFY(request.hasRawHeader(name1)); QCOMPARE(request.rawHeader(name1), value1); // Check that empty header does not match - QVERIFY(!factory.headers().contains(""_ba)); - QVERIFY(factory.headers().values(""_ba).isEmpty()); + QVERIFY(!factory.commonHeaders().contains(""_ba)); + QVERIFY(factory.commonHeaders().values(""_ba).isEmpty()); // Clear headers - factory.clearHeaders(); - QVERIFY(factory.headers().isEmpty()); + factory.clearCommonHeaders(); + QVERIFY(factory.commonHeaders().isEmpty()); request = factory.createRequest(); QVERIFY(!request.hasRawHeader(name1)); @@ -222,12 +222,12 @@ void tst_QNetworkRequestFactory::headers() h1.clear(); h1.append(name1, value1); h1.append(name2, value2); - factory.setHeaders(h1); - QVERIFY(factory.headers().contains(name1)); - QVERIFY(factory.headers().contains(name2)); - QCOMPARE(factory.headers().combinedValue(name1), value1); - QCOMPARE(factory.headers().combinedValue(name2), value2); - QCOMPARE(factory.headers().size(), 2); + factory.setCommonHeaders(h1); + QVERIFY(factory.commonHeaders().contains(name1)); + QVERIFY(factory.commonHeaders().contains(name2)); + QCOMPARE(factory.commonHeaders().combinedValue(name1), value1); + QCOMPARE(factory.commonHeaders().combinedValue(name2), value2); + QCOMPARE(factory.commonHeaders().size(), 2); request = factory.createRequest(); QVERIFY(request.hasRawHeader(name1)); QVERIFY(request.hasRawHeader(name2)); @@ -238,9 +238,9 @@ void tst_QNetworkRequestFactory::headers() h1.append(name1, value1); h1.append(name1, value2); h1.append(name1, value3); - factory.setHeaders(h1); - QVERIFY(factory.headers().contains(name1)); - QCOMPARE(factory.headers().combinedValue(name1), value1 + ',' + value2 + ',' + value3); + factory.setCommonHeaders(h1); + QVERIFY(factory.commonHeaders().contains(name1)); + QCOMPARE(factory.commonHeaders().combinedValue(name1), value1 + ',' + value2 + ',' + value3); request = factory.createRequest(); QVERIFY(request.hasRawHeader(name1)); QCOMPARE(request.rawHeader(name1), value1 + ',' + value2 + ',' + value3); @@ -275,7 +275,7 @@ void tst_QNetworkRequestFactory::bearerToken() const auto value = "headervalue"_ba; QHttpHeaders h1; h1.append(authHeader, value); - factory.setHeaders(h1); + factory.setCommonHeaders(h1); request = factory.createRequest(); QVERIFY(request.hasRawHeader(authHeader)); // bearerToken has precedence over manually set header |