diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-21 08:35:11 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 08:35:11 +0200 |
commit | 0aaf8a5f8541960466d695729104d71c23998df9 (patch) | |
tree | d8d37fb42f923eaad78a85157d2f655e8a2c2d2e /tests/auto/network-settings.h | |
parent | a7c672c05a29ee6894197c77063a307ea022a97b (diff) | |
parent | 21cc71ced3565585f7a2f94875ed845355ab2064 (diff) | |
download | qtxmlpatterns-0aaf8a5f8541960466d695729104d71c23998df9.tar.gz |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: Ie4eaf067382d8ca5e139a994e045e83f3f90760c
Diffstat (limited to 'tests/auto/network-settings.h')
-rw-r--r-- | tests/auto/network-settings.h | 52 |
1 files changed, 28 insertions, 24 deletions
diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index f02ed86..569069a 100644 --- a/tests/auto/network-settings.h +++ b/tests/auto/network-settings.h @@ -65,21 +65,22 @@ public: static bool compareReplyIMAP(QByteArray const& actual) { - QList<QByteArray> expected; + const QByteArray expected[] = { - // Mandriva; old test server - expected << QByteArray( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] " ) + // Mandriva; old test server + QByteArray( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] " ) .append(QtNetworkSettings::serverName().toLatin1()) - .append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n"); + .append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n"), - // Ubuntu 10.04; new test server - expected << QByteArray( "* OK " ) + // Ubuntu 10.04; new test server + QByteArray( "* OK " ) .append(QtNetworkSettings::serverLocalName().toLatin1()) - .append(" Cyrus IMAP4 v2.2.13-Debian-2.2.13-19 server ready\r\n"); + .append(" Cyrus IMAP4 v2.2.13-Debian-2.2.13-19 server ready\r\n"), - // Feel free to add more as needed + // Feel free to add more as needed + }; - Q_FOREACH (QByteArray const& ba, expected) { + for (const QByteArray &ba : expected) { if (ba == actual) { return true; } @@ -90,21 +91,22 @@ public: static bool compareReplyIMAPSSL(QByteArray const& actual) { - QList<QByteArray> expected; + const QByteArray expected[] = { - // Mandriva; old test server - expected << QByteArray( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID AUTH=PLAIN SASL-IR] " ) + // Mandriva; old test server + QByteArray( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID AUTH=PLAIN SASL-IR] " ) .append(QtNetworkSettings::serverName().toLatin1()) - .append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n"); + .append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n"), - // Ubuntu 10.04; new test server - expected << QByteArray( "* OK " ) + // Ubuntu 10.04; new test server + QByteArray( "* OK " ) .append(QtNetworkSettings::serverLocalName().toLatin1()) - .append(" Cyrus IMAP4 v2.2.13-Debian-2.2.13-19 server ready\r\n"); + .append(" Cyrus IMAP4 v2.2.13-Debian-2.2.13-19 server ready\r\n"), - // Feel free to add more as needed + // Feel free to add more as needed + }; - Q_FOREACH (QByteArray const& ba, expected) { + for (const QByteArray &ba : expected) { if (ba == actual) { return true; } @@ -115,14 +117,16 @@ public: static bool compareReplyFtp(QByteArray const& actual) { - QList<QByteArray> expected; + const QByteArray expected[] = { - // A few different vsFTPd versions. - // Feel free to add more as needed - expected << QByteArray( "220 (vsFTPd 2.0.5)\r\n221 Goodbye.\r\n" ); - expected << QByteArray( "220 (vsFTPd 2.2.2)\r\n221 Goodbye.\r\n" ); + // A few different vsFTPd versions. + // Feel free to add more as needed + QByteArray( "220 (vsFTPd 2.0.5)\r\n221 Goodbye.\r\n" ), + QByteArray( "220 (vsFTPd 2.2.2)\r\n221 Goodbye.\r\n" ), - Q_FOREACH (QByteArray const& ba, expected) { + }; + + for (const QByteArray &ba : expected) { if (ba == actual) { return true; } |