diff options
Diffstat (limited to 'tests/auto/network/kernel')
11 files changed, 13 insertions, 54 deletions
diff --git a/tests/auto/network/kernel/qdnslookup/qdnslookup.pro b/tests/auto/network/kernel/qdnslookup/qdnslookup.pro index 3727736fad..f14ffd003e 100644 --- a/tests/auto/network/kernel/qdnslookup/qdnslookup.pro +++ b/tests/auto/network/kernel/qdnslookup/qdnslookup.pro @@ -1,5 +1,4 @@ CONFIG += testcase -CONFIG += parallel_test TARGET = tst_qdnslookup diff --git a/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp b/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp index 301a915dd6..976b895b53 100644 --- a/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp +++ b/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp @@ -275,7 +275,7 @@ void tst_QDnsLookup::lookup() QStringList mailExchanges; foreach (const QDnsMailExchangeRecord &record, lookup.mailExchangeRecords()) { QCOMPARE(record.name(), domain); - mailExchanges << QString("%1 %2").arg(QString::number(record.preference()), record.exchange()); + mailExchanges << QString::number(record.preference()) + QLatin1Char(' ') + record.exchange(); } QVERIFY2(mx_alternatives.contains(mailExchanges.join(';')), qPrintable("Actual: " + mailExchanges.join(';') + "\nExpected one of:\n" + mx_alternatives.join('\n'))); @@ -304,11 +304,9 @@ void tst_QDnsLookup::lookup() QStringList services; foreach (const QDnsServiceRecord &record, lookup.serviceRecords()) { QCOMPARE(record.name(), domain); - services << QString("%1 %2 %3 %4").arg( - QString::number(record.priority()), - QString::number(record.weight()), - QString::number(record.port()), - record.target()); + services << (QString::number(record.priority()) + QLatin1Char(' ') + + QString::number(record.weight()) + QLatin1Char(' ') + + QString::number(record.port()) + QLatin1Char(' ') + record.target()); } QVERIFY2(srv_alternatives.contains(services.join(';')), qPrintable("Actual: " + services.join(';') + "\nExpected one of:\n" + srv_alternatives.join('\n'))); diff --git a/tests/auto/network/kernel/qdnslookup_appless/qdnslookup_appless.pro b/tests/auto/network/kernel/qdnslookup_appless/qdnslookup_appless.pro index 0515bbad3b..25d76b5739 100644 --- a/tests/auto/network/kernel/qdnslookup_appless/qdnslookup_appless.pro +++ b/tests/auto/network/kernel/qdnslookup_appless/qdnslookup_appless.pro @@ -1,5 +1,4 @@ CONFIG += testcase -CONFIG += parallel_test TARGET = tst_qdnslookup_appless diff --git a/tests/auto/network/kernel/qhostaddress/qhostaddress.pro b/tests/auto/network/kernel/qhostaddress/qhostaddress.pro index f349cab976..19d74dfd9b 100644 --- a/tests/auto/network/kernel/qhostaddress/qhostaddress.pro +++ b/tests/auto/network/kernel/qhostaddress/qhostaddress.pro @@ -1,5 +1,4 @@ CONFIG += testcase -CONFIG += parallel_test TARGET = tst_qhostaddress SOURCES += tst_qhostaddress.cpp diff --git a/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp index 8069865d93..808cc3ef34 100644 --- a/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp +++ b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp @@ -57,12 +57,7 @@ class tst_QHostAddress : public QObject public: tst_QHostAddress(); - virtual ~tst_QHostAddress(); - -public slots: - void init(); - void cleanup(); private slots: void constructor_QString_data(); void constructor_QString(); @@ -89,26 +84,13 @@ private slots: void convertv4v6(); }; -tst_QHostAddress::tst_QHostAddress() -{ -} - -tst_QHostAddress::~tst_QHostAddress() -{ -} - Q_DECLARE_METATYPE(QHostAddress) -void tst_QHostAddress::init() +tst_QHostAddress::tst_QHostAddress() { qRegisterMetaType<QHostAddress>("QHostAddress"); } -void tst_QHostAddress::cleanup() -{ - // No cleanup is required. -} - void tst_QHostAddress::constructor_QString_data() { setAddress_QString_data(); diff --git a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp index 5f0addba98..a38b8d0873 100644 --- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp @@ -92,17 +92,9 @@ class tst_QHostInfo : public QObject { Q_OBJECT -public: - tst_QHostInfo(); - virtual ~tst_QHostInfo(); - - -public slots: +private slots: void init(); - void cleanup(); void initTestCase(); - -private slots: void getSetCheck(); void staticInformation(); void lookupIPv4_data(); @@ -169,14 +161,6 @@ void tst_QHostInfo::staticInformation() qDebug() << "Domain name:" << QHostInfo::localDomainName(); } -tst_QHostInfo::tst_QHostInfo() -{ -} - -tst_QHostInfo::~tst_QHostInfo() -{ -} - void tst_QHostInfo::initTestCase() { QVERIFY(QtNetworkSettings::verifyTestNetworkSettings()); @@ -237,10 +221,6 @@ void tst_QHostInfo::init() qt_qhostinfo_enable_cache(cache); } -void tst_QHostInfo::cleanup() -{ -} - void tst_QHostInfo::lookupIPv4_data() { QTest::addColumn<QString>("hostname"); diff --git a/tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro b/tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro index ae207e9c79..427f2e0f19 100644 --- a/tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro +++ b/tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro @@ -1,5 +1,4 @@ CONFIG += testcase -CONFIG += parallel_test TARGET = tst_qnetworkaddressentry SOURCES += tst_qnetworkaddressentry.cpp diff --git a/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro b/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro index 79279514d1..694dec2ed7 100644 --- a/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro +++ b/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro @@ -1,5 +1,4 @@ CONFIG += testcase -CONFIG += parallel_test TARGET = tst_qnetworkinterface SOURCES += tst_qnetworkinterface.cpp diff --git a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp index 519ee0dc84..cc3b99ff76 100644 --- a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp +++ b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp @@ -142,7 +142,7 @@ void tst_QNetworkInterface::dump() s.nospace() << ": " << qPrintable(e.ip().toString()); if (!e.netmask().isNull()) s.nospace() << '/' << e.prefixLength() - << " (" << qPrintable(e.netmask().toString()) << ")"; + << " (" << qPrintable(e.netmask().toString()) << ')'; if (!e.broadcast().isNull()) s.nospace() << " broadcast " << qPrintable(e.broadcast().toString()); } @@ -222,6 +222,11 @@ void tst_QNetworkInterface::interfaceFromXXX() QFETCH(QNetworkInterface, iface); QVERIFY(QNetworkInterface::interfaceFromName(iface.name()).isValid()); + if (int idx = iface.index()) { + QVERIFY(QNetworkInterface::interfaceFromIndex(idx).isValid()); + QCOMPARE(QNetworkInterface::interfaceNameFromIndex(idx), iface.name()); + QCOMPARE(QNetworkInterface::interfaceIndexFromName(iface.name()), idx); + } foreach (QNetworkAddressEntry entry, iface.addressEntries()) { QVERIFY(!entry.ip().isNull()); diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro b/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro index c63c7742a1..ed73e3e10e 100644 --- a/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro +++ b/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro @@ -3,7 +3,6 @@ ############################################################ CONFIG += testcase -CONFIG += parallel_test TARGET = tst_qnetworkproxyfactory QT = core network testlib diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp index d67813b954..457ddfa1a0 100644 --- a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp +++ b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp @@ -372,7 +372,7 @@ void tst_QNetworkProxyFactory::genericSystemProxy() QFETCH(int, port); // The generic system proxy is only available on the following platforms -#if (!defined Q_OS_BLACKBERRY) && (!defined Q_OS_WIN) && (!defined Q_OS_OSX) +#if (!defined Q_OS_WIN) && (!defined Q_OS_OSX) qputenv(envVar, url); const QList<QNetworkProxy> systemProxy = QNetworkProxyFactory::systemProxyForQuery(); QCOMPARE(systemProxy.size(), 1); |