summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/network/kernel')
-rw-r--r--tests/auto/network/kernel/CMakeLists.txt1
-rw-r--r--tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp49
-rw-r--r--tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp22
-rw-r--r--tests/auto/network/kernel/qnetworkinformation_appless/CMakeLists.txt6
-rw-r--r--tests/auto/network/kernel/qnetworkinformation_appless/tst_qnetworkinformation_appless.cpp67
-rw-r--r--tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp4
6 files changed, 136 insertions, 13 deletions
diff --git a/tests/auto/network/kernel/CMakeLists.txt b/tests/auto/network/kernel/CMakeLists.txt
index 89526fa14c..11b859011e 100644
--- a/tests/auto/network/kernel/CMakeLists.txt
+++ b/tests/auto/network/kernel/CMakeLists.txt
@@ -14,4 +14,5 @@ endif()
if(QT_FEATURE_private_tests)
add_subdirectory(qauthenticator)
add_subdirectory(qnetworkinformation)
+ add_subdirectory(qnetworkinformation_appless)
endif()
diff --git a/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp b/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp
index 23afb2219c..f462330fdf 100644
--- a/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp
+++ b/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp
@@ -29,6 +29,8 @@
#include <QTest>
+#include <QSignalSpy>
+
#include <QtNetwork/QDnsLookup>
#include <QtNetwork/QHostAddress>
@@ -49,6 +51,7 @@ private slots:
void lookup();
void lookupReuse();
void lookupAbortRetry();
+ void bindingsAndProperties();
};
void tst_QDnsLookup::initTestCase()
@@ -375,5 +378,51 @@ void tst_QDnsLookup::lookupAbortRetry()
QCOMPARE(lookup.hostAddressRecords().first().value(), QHostAddress("2001:db8::1"));
}
+void tst_QDnsLookup::bindingsAndProperties()
+{
+ QFETCH_GLOBAL(const QString, tld);
+ if (tld == QStringLiteral("idn"))
+ return;
+
+ QDnsLookup lookup;
+
+ lookup.setType(QDnsLookup::A);
+ QProperty<QDnsLookup::Type> dnsTypeProp;
+ lookup.bindableType().setBinding(Qt::makePropertyBinding(dnsTypeProp));
+ const QSignalSpy typeChangeSpy(&lookup, &QDnsLookup::typeChanged);
+
+ dnsTypeProp = QDnsLookup::AAAA;
+ QCOMPARE(typeChangeSpy.count(), 1);
+ QCOMPARE(lookup.type(), QDnsLookup::AAAA);
+
+ dnsTypeProp.setBinding(lookup.bindableType().makeBinding());
+ lookup.setType(QDnsLookup::A);
+ QCOMPARE(dnsTypeProp.value(), QDnsLookup::A);
+
+ QProperty<QString> nameProp;
+ lookup.bindableName().setBinding(Qt::makePropertyBinding(nameProp));
+ const QSignalSpy nameChangeSpy(&lookup, &QDnsLookup::nameChanged);
+
+ nameProp = QStringLiteral("a-plus-aaaa");
+ QCOMPARE(nameChangeSpy.count(), 1);
+ QCOMPARE(lookup.name(), QStringLiteral("a-plus-aaaa"));
+
+ nameProp.setBinding(lookup.bindableName().makeBinding());
+ lookup.setName(QStringLiteral("a-single"));
+ QCOMPARE(nameProp.value(), QStringLiteral("a-single"));
+
+ QProperty<QHostAddress> nameserverProp;
+ lookup.bindableNameserver().setBinding(Qt::makePropertyBinding(nameserverProp));
+ const QSignalSpy nameserverChangeSpy(&lookup, &QDnsLookup::nameserverChanged);
+
+ nameserverProp = QHostAddress::LocalHost;
+ QCOMPARE(nameserverChangeSpy.count(), 1);
+ QCOMPARE(lookup.nameserver(), QHostAddress::LocalHost);
+
+ nameserverProp.setBinding(lookup.bindableNameserver().makeBinding());
+ lookup.setNameserver(QHostAddress::Any);
+ QCOMPARE(nameserverProp.value(), QHostAddress::Any);
+}
+
QTEST_MAIN(tst_QDnsLookup)
#include "tst_qdnslookup.moc"
diff --git a/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
index 569782180c..78f072fb54 100644
--- a/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
+++ b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
@@ -110,14 +110,14 @@ void tst_QHostAddress::constructor_QString()
QTEST(hostAddr.toString(), "resAddr");
if ( protocol == 4 ) {
- QVERIFY( hostAddr.protocol() == QAbstractSocket::IPv4Protocol || hostAddr.protocol() == QAbstractSocket::UnknownNetworkLayerProtocol );
- QVERIFY( hostAddr.protocol() != QAbstractSocket::IPv6Protocol );
+ QVERIFY( hostAddr.protocol() == QHostAddress::IPv4Protocol || hostAddr.protocol() == QHostAddress::UnknownNetworkLayerProtocol );
+ QVERIFY( hostAddr.protocol() != QHostAddress::IPv6Protocol );
} else if ( protocol == 6 ) {
- QVERIFY( hostAddr.protocol() != QAbstractSocket::IPv4Protocol && hostAddr.protocol() != QAbstractSocket::UnknownNetworkLayerProtocol );
- QVERIFY( hostAddr.protocol() == QAbstractSocket::IPv6Protocol );
+ QVERIFY( hostAddr.protocol() != QHostAddress::IPv4Protocol && hostAddr.protocol() != QHostAddress::UnknownNetworkLayerProtocol );
+ QVERIFY( hostAddr.protocol() == QHostAddress::IPv6Protocol );
} else {
QVERIFY( hostAddr.isNull() );
- QVERIFY( hostAddr.protocol() == QAbstractSocket::UnknownNetworkLayerProtocol );
+ QVERIFY( hostAddr.protocol() == QHostAddress::UnknownNetworkLayerProtocol );
}
}
@@ -217,14 +217,14 @@ void tst_QHostAddress::setAddress_QString()
QTEST(hostAddr.toString(), "resAddr");
if ( protocol == 4 ) {
- QVERIFY( hostAddr.protocol() == QAbstractSocket::IPv4Protocol || hostAddr.protocol() == QAbstractSocket::UnknownNetworkLayerProtocol );
- QVERIFY( hostAddr.protocol() != QAbstractSocket::IPv6Protocol );
+ QVERIFY( hostAddr.protocol() == QHostAddress::IPv4Protocol || hostAddr.protocol() == QHostAddress::UnknownNetworkLayerProtocol );
+ QVERIFY( hostAddr.protocol() != QHostAddress::IPv6Protocol );
} else if ( protocol == 6 ) {
- QVERIFY( hostAddr.protocol() != QAbstractSocket::IPv4Protocol && hostAddr.protocol() != QAbstractSocket::UnknownNetworkLayerProtocol );
- QVERIFY( hostAddr.protocol() == QAbstractSocket::IPv6Protocol );
+ QVERIFY( hostAddr.protocol() != QHostAddress::IPv4Protocol && hostAddr.protocol() != QHostAddress::UnknownNetworkLayerProtocol );
+ QVERIFY( hostAddr.protocol() == QHostAddress::IPv6Protocol );
} else {
QVERIFY( hostAddr.isNull() );
- QVERIFY( hostAddr.protocol() == QAbstractSocket::UnknownNetworkLayerProtocol );
+ QVERIFY( hostAddr.protocol() == QHostAddress::UnknownNetworkLayerProtocol );
}
}
@@ -770,7 +770,7 @@ void tst_QHostAddress::convertv4v6()
if (protocol == 4) {
bool ok;
quint32 v4 = source.toIPv4Address(&ok);
- QCOMPARE(ok, result.protocol() == QAbstractSocket::IPv4Protocol);
+ QCOMPARE(ok, result.protocol() == QHostAddress::IPv4Protocol);
if (ok)
QCOMPARE(QHostAddress(v4), result);
} else if (protocol == 6) {
diff --git a/tests/auto/network/kernel/qnetworkinformation_appless/CMakeLists.txt b/tests/auto/network/kernel/qnetworkinformation_appless/CMakeLists.txt
new file mode 100644
index 0000000000..76cbf594c3
--- /dev/null
+++ b/tests/auto/network/kernel/qnetworkinformation_appless/CMakeLists.txt
@@ -0,0 +1,6 @@
+qt_internal_add_test(tst_qnetworkinformation_appless
+ SOURCES
+ tst_qnetworkinformation_appless.cpp
+ PUBLIC_LIBRARIES
+ Qt::Network
+)
diff --git a/tests/auto/network/kernel/qnetworkinformation_appless/tst_qnetworkinformation_appless.cpp b/tests/auto/network/kernel/qnetworkinformation_appless/tst_qnetworkinformation_appless.cpp
new file mode 100644
index 0000000000..ff058e8a9b
--- /dev/null
+++ b/tests/auto/network/kernel/qnetworkinformation_appless/tst_qnetworkinformation_appless.cpp
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/qcoreapplication.h>
+#include <QtNetwork/qnetworkinformation.h>
+#include <QtTest/qtest.h>
+
+class tst_QNetworkInformation_appless : public QObject
+{
+ Q_OBJECT
+private slots:
+ void reinit();
+};
+
+void tst_QNetworkInformation_appless::reinit()
+{
+ int argc = 1;
+ char name[] = "./test";
+ char *argv[] = { name, nullptr };
+
+ {
+ QCoreApplication app(argc, argv);
+ if (QNetworkInformation::availableBackends().isEmpty())
+ QSKIP("No backends available!");
+
+ QVERIFY(QNetworkInformation::load(QNetworkInformation::Feature::Reachability));
+ auto info = QNetworkInformation::instance();
+ QVERIFY(info);
+ }
+
+ QVERIFY(!QNetworkInformation::instance());
+
+ {
+ QCoreApplication app(argc, argv);
+ QVERIFY(QNetworkInformation::load(QNetworkInformation::Feature::Reachability));
+ auto info = QNetworkInformation::instance();
+ QVERIFY(info);
+ }
+}
+
+QTEST_APPLESS_MAIN(tst_QNetworkInformation_appless);
+#include "tst_qnetworkinformation_appless.moc"
diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
index c84120a6e5..8b64788a73 100644
--- a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
+++ b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
@@ -53,7 +53,7 @@ public:
class QDebugProxyFactory : public QNetworkProxyFactory
{
public:
- virtual QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query = QNetworkProxyQuery())
+ QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query = QNetworkProxyQuery()) override
{
returnedList = QNetworkProxyFactory::systemProxyForQuery(query);
requestCounter++;
@@ -294,7 +294,7 @@ void tst_QNetworkProxyFactory::genericSystemProxy_data()
class QSPFQThread : public QThread
{
protected:
- virtual void run()
+ void run() override
{
proxies = QNetworkProxyFactory::systemProxyForQuery(query);
}