From 4b944f7bc77be10de61ca54256781de3efe1e1fa Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 23 Mar 2018 15:40:00 +0100 Subject: De-parameterise tst_QNetworkReply::ignoreSslErrorsList()'s url 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 --- .../network/access/qnetworkreply/tst_qnetworkreply.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp') diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index 0ef3dc0b61..ebb9fb6192 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -6145,7 +6145,6 @@ void tst_QNetworkReply::httpRecursiveCreation() #ifndef QT_NO_SSL void tst_QNetworkReply::ignoreSslErrorsList_data() { - QTest::addColumn("url"); QTest::addColumn >("expectedSslErrors"); QTest::addColumn("expectedNetworkError"); @@ -6154,20 +6153,20 @@ void tst_QNetworkReply::ignoreSslErrorsList_data() QSslError rightError(FLUKE_CERTIFICATE_ERROR, certs.at(0)); 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); - 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); - QTest::newRow("allErrorsInExpectedList1") << "https://" + QtNetworkSettings::serverName() + "/index.html" << expectedSslErrors << QNetworkReply::NoError; + QTest::newRow("allErrorsInExpectedList1") << expectedSslErrors << QNetworkReply::NoError; expectedSslErrors.removeAll(wrongError); - QTest::newRow("allErrorsInExpectedList2") << "https://" + QtNetworkSettings::serverName() + "/index.html" << expectedSslErrors << QNetworkReply::NoError; + QTest::newRow("allErrorsInExpectedList2") << expectedSslErrors << QNetworkReply::NoError; 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() { - QFETCH(QString, url); + QString url(QLatin1String("https://") + QtNetworkSettings::serverName() + QLatin1String("/index.html")); QNetworkRequest request(url); 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 void tst_QNetworkReply::ignoreSslErrorsListWithSlot() { - QFETCH(QString, url); + QString url(QLatin1String("https://") + QtNetworkSettings::serverName() + QLatin1String("/index.html")); QNetworkRequest request(url); QNetworkReplyPtr reply(manager.get(request)); -- cgit v1.2.3