AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

De-parameterise tst_QNetworkReply::ignoreSslErrorsList()'s url

Browse Source 
It was the same in all test rows, so move it from the _data() to a
fixed value in the test.  Also, don't implicitly coerce C-string
literals to QString.

Change-Id: Ieee4c7ffbf251c4b69b5acd79125dfa93eb51d6e
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Edward Welbourne 2018-03-23 15:40:00 +01:00 committed by Timur Pocheptsov
parent eaa3417901
commit 4b944f7bc7
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
View File

@ -6145,7 +6145,6 @@ void tst_QNetworkReply::httpRecursiveCreation()
#ifndef QT_NO_SSL #ifndef QT_NO_SSL
void tst_QNetworkReply::ignoreSslErrorsList_data() void tst_QNetworkReply::ignoreSslErrorsList_data()
{ {
QTest::addColumn<QString>("url");
QTest::addColumn<QList<QSslError> >("expectedSslErrors"); QTest::addColumn<QList<QSslError> >("expectedSslErrors");
QTest::addColumn<QNetworkReply::NetworkError>("expectedNetworkError"); QTest::addColumn<QNetworkReply::NetworkError>("expectedNetworkError");
@ -6154,20 +6153,20 @@ void tst_QNetworkReply::ignoreSslErrorsList_data()
QSslError rightError(FLUKE_CERTIFICATE_ERROR, certs.at(0)); QSslError rightError(FLUKE_CERTIFICATE_ERROR, certs.at(0));
QSslError wrongError(FLUKE_CERTIFICATE_ERROR); QSslError wrongError(FLUKE_CERTIFICATE_ERROR);
QTest::newRow("SSL-failure-empty-list") << "https://" + QtNetworkSettings::serverName() + "/index.html" << expectedSslErrors << QNetworkReply::SslHandshakeFailedError; QTest::newRow("SSL-failure-empty-list") << expectedSslErrors << QNetworkReply::SslHandshakeFailedError;
expectedSslErrors.append(wrongError); expectedSslErrors.append(wrongError);
QTest::newRow("SSL-failure-wrong-error") << "https://" + QtNetworkSettings::serverName() + "/index.html" << expectedSslErrors << QNetworkReply::SslHandshakeFailedError; QTest::newRow("SSL-failure-wrong-error") << expectedSslErrors << QNetworkReply::SslHandshakeFailedError;
expectedSslErrors.append(rightError); expectedSslErrors.append(rightError);
QTest::newRow("allErrorsInExpectedList1") << "https://" + QtNetworkSettings::serverName() + "/index.html" << expectedSslErrors << QNetworkReply::NoError; QTest::newRow("allErrorsInExpectedList1") << expectedSslErrors << QNetworkReply::NoError;
expectedSslErrors.removeAll(wrongError); expectedSslErrors.removeAll(wrongError);
QTest::newRow("allErrorsInExpectedList2") << "https://" + QtNetworkSettings::serverName() + "/index.html" << expectedSslErrors << QNetworkReply::NoError; QTest::newRow("allErrorsInExpectedList2") << expectedSslErrors << QNetworkReply::NoError;
expectedSslErrors.removeAll(rightError); expectedSslErrors.removeAll(rightError);
QTest::newRow("SSL-failure-empty-list-again") << "https://" + QtNetworkSettings::serverName() + "/index.html" << expectedSslErrors << QNetworkReply::SslHandshakeFailedError; QTest::newRow("SSL-failure-empty-list-again") << expectedSslErrors << QNetworkReply::SslHandshakeFailedError;
} }
void tst_QNetworkReply::ignoreSslErrorsList() void tst_QNetworkReply::ignoreSslErrorsList()
{ {
QFETCH(QString, url); QString url(QLatin1String("https://") + QtNetworkSettings::serverName() + QLatin1String("/index.html"));
QNetworkRequest request(url); QNetworkRequest request(url);
QNetworkReplyPtr reply(manager.get(request)); QNetworkReplyPtr reply(manager.get(request));
@ -6194,7 +6193,7 @@ void tst_QNetworkReply::ignoreSslErrorListSlot(QNetworkReply *reply, const QList
// do the same as in ignoreSslErrorsList, but ignore the errors in the slot // do the same as in ignoreSslErrorsList, but ignore the errors in the slot
void tst_QNetworkReply::ignoreSslErrorsListWithSlot() void tst_QNetworkReply::ignoreSslErrorsListWithSlot()
{ {
QFETCH(QString, url); QString url(QLatin1String("https://") + QtNetworkSettings::serverName() + QLatin1String("/index.html"));
QNetworkRequest request(url); QNetworkRequest request(url);
QNetworkReplyPtr reply(manager.get(request)); QNetworkReplyPtr reply(manager.get(request));