From d13b6bd496ea3c23f8787c544d60ac4124b55245 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
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 <lars.knoll@qt.io>
---
 tests/auto/network/access/http2/tst_http2.cpp                       | 2 +-
 .../auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp | 2 +-
 tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp             | 2 +-
 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 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'tests/auto/network')

diff --git a/tests/auto/network/access/http2/tst_http2.cpp b/tests/auto/network/access/http2/tst_http2.cpp
index 5a250c6226..419d13e33c 100644
--- a/tests/auto/network/access/http2/tst_http2.cpp
+++ b/tests/auto/network/access/http2/tst_http2.cpp
@@ -789,7 +789,7 @@ void tst_Http2::contentEncoding_data()
         QByteArray expected;
     };
 
-    QVector<ContentEncodingData> contentEncodingData;
+    QList<ContentEncodingData> contentEncodingData;
     contentEncodingData.emplace_back(
             "gzip", QByteArray::fromBase64("H4sIAAAAAAAAA8tIzcnJVyjPL8pJAQCFEUoNCwAAAA=="),
             "hello world");
diff --git a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
index 47dd80a1c2..35d593ff9b 100644
--- a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
+++ b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
@@ -141,7 +141,7 @@ void tst_QNetworkInterface::consistencyCheck()
 {
     QList<QNetworkInterface> ifaces = QNetworkInterface::allInterfaces();
     QSet<QString> interfaceNames;
-    QVector<int> interfaceIndexes;
+    QList<int> interfaceIndexes;
 
     foreach (const QNetworkInterface &iface, ifaces) {
         QVERIFY(iface.isValid());
diff --git a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
index 425d61127a..fe7822718f 100644
--- a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
+++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
@@ -137,7 +137,7 @@ private:
     bool m_workaroundLinuxKernelBug;
     QList<QHostAddress> allAddresses;
     QHostAddress multicastGroup4, multicastGroup6;
-    QVector<QHostAddress> linklocalMulticastGroups;
+    QList<QHostAddress> linklocalMulticastGroups;
     QUdpSocket *m_asyncSender;
     QUdpSocket *m_asyncReceiver;
 };
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<QVector<QSslError>>("expectedTlsErrors");
+    QTest::addColumn<QList<QSslError>>("expectedTlsErrors");
     QTest::addColumn<bool>("works");
 
-    QVector<QSslError> expectedErrors{{QSslError::HostNameMismatch, selfSignedCert}};
+    QList<QSslError> 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<QSslError>, expectedTlsErrors);
+    QFETCH(const QList<QSslError>, 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<SslError>);
+using VectorOfErrors = QT_PREPEND_NAMESPACE(QList<SslError>);
 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<QSslError::SslError> SslErrorList;
+typedef QList<QSslError::SslError> SslErrorList;
 Q_DECLARE_METATYPE(SslErrorList)
 Q_DECLARE_METATYPE(QSslError)
 Q_DECLARE_METATYPE(QSslKey)
-- 
cgit v1.2.3