whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use QList instead of QVector in network tests 

Task-number: QTBUG-84469
Change-Id: Ic96dc8d29b5d720810ca636284f5fd37e4307acd
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
bb10
Jarek Kobus 2020-06-22 15:29:16 +02:00
parent 273fcd0c05
commit d13b6bd496
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/network/access/http2/tst_http2.cpp
View File

@ -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");

2
tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
View File

@ -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());

2
tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
View File

@ -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;
};

6
tests/auto/network/ssl/qdtls/tst_qdtls.cpp
View File

@ -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();

2
tests/auto/network/ssl/qocsp/tst_qocsp.cpp
View File

@ -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)

2
tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
View File

@ -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)