From d13b6bd496ea3c23f8787c544d60ac4124b55245 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 22 Jun 2020 15:29:16 +0200 Subject: Use QList instead of QVector in network tests Task-number: QTBUG-84469 Change-Id: Ic96dc8d29b5d720810ca636284f5fd37e4307acd Reviewed-by: Lars Knoll --- tests/auto/network/ssl/qdtls/tst_qdtls.cpp | 6 +++--- tests/auto/network/ssl/qocsp/tst_qocsp.cpp | 2 +- tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/auto/network/ssl') diff --git a/tests/auto/network/ssl/qdtls/tst_qdtls.cpp b/tests/auto/network/ssl/qdtls/tst_qdtls.cpp index 3bbde484ce..9faa17e929 100644 --- a/tests/auto/network/ssl/qdtls/tst_qdtls.cpp +++ b/tests/auto/network/ssl/qdtls/tst_qdtls.cpp @@ -699,10 +699,10 @@ void tst_QDtls::verificationErrors() void tst_QDtls::presetExpectedErrors_data() { - QTest::addColumn>("expectedTlsErrors"); + QTest::addColumn>("expectedTlsErrors"); QTest::addColumn("works"); - QVector expectedErrors{{QSslError::HostNameMismatch, selfSignedCert}}; + QList expectedErrors { { QSslError::HostNameMismatch, selfSignedCert } }; QTest::addRow("unexpected-self-signed") << expectedErrors << false; expectedErrors.push_back({QSslError::SelfSignedCertificate, selfSignedCert}); QTest::addRow("all-errors-ignored") << expectedErrors << true; @@ -710,7 +710,7 @@ void tst_QDtls::presetExpectedErrors_data() void tst_QDtls::presetExpectedErrors() { - QFETCH(const QVector, expectedTlsErrors); + QFETCH(const QList, expectedTlsErrors); QFETCH(const bool, works); connectHandshakeReadingSlots(); diff --git a/tests/auto/network/ssl/qocsp/tst_qocsp.cpp b/tests/auto/network/ssl/qocsp/tst_qocsp.cpp index 519ae5c720..365a08683e 100644 --- a/tests/auto/network/ssl/qocsp/tst_qocsp.cpp +++ b/tests/auto/network/ssl/qocsp/tst_qocsp.cpp @@ -56,7 +56,7 @@ // so in general it's our peer's certificate we are asking about. using SslError = QT_PREPEND_NAMESPACE(QSslError); -using VectorOfErrors = QT_PREPEND_NAMESPACE(QVector); +using VectorOfErrors = QT_PREPEND_NAMESPACE(QList); using Latin1String = QT_PREPEND_NAMESPACE(QLatin1String); Q_DECLARE_METATYPE(SslError) diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index ded9c722d3..e6db3a734e 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -59,7 +59,7 @@ #include "private/qsslconfiguration_p.h" Q_DECLARE_METATYPE(QSslSocket::SslMode) -typedef QVector SslErrorList; +typedef QList SslErrorList; Q_DECLARE_METATYPE(SslErrorList) Q_DECLARE_METATYPE(QSslError) Q_DECLARE_METATYPE(QSslKey) -- cgit v1.2.3