QtNetwork: Delete bearer management

All remaining pieces are gone, configuration included. Relevant CMakeLists and configure.cmake were regenerated. Fixes: QTBUG-76502 Change-Id: I667b5da7e3802830d236d50b5e9190c2ee9c19e2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
author: Mårten Nordheim <marten.nordheim@qt.io> 2020-03-04 16:33:51 +0100
committer: Lars Knoll <lars.knoll@qt.io> 2020-04-05 16:41:08 +0200
commit: d8b49e6b51007d6f0a9faec82a66b95dc7ccf541 (patch)
tree: a99632bb0a43abd29f824806fccf790b144c3d0e /tests/auto/network
parent: 430232e44d5e6c7d7fd7ca3ebebb06d74e21ce2f (diff)
29 files changed, 4 insertions, 2326 deletions
diff --git a/tests/auto/network/CMakeLists.txt b/tests/auto/network/CMakeLists.txt
index b7ba3de688..0e2415daac 100644
--- a/tests/auto/network/CMakeLists.txt
+++ b/tests/auto/network/CMakeLists.txt
@@ -15,7 +15,6 @@ endif()
 # special case end
 
 add_subdirectory(access)
-add_subdirectory(bearer)
 add_subdirectory(kernel)
 add_subdirectory(ssl)
 add_subdirectory(socket)
diff --git a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
index 182e3e9547..b6be01d900 100644
--- a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
+++ b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
@@ -31,12 +31,6 @@
 #include <QtNetwork/QtNetwork>
 #include "../../../network-settings.h"
 
-#ifndef QT_NO_BEARERMANAGEMENT
-#include <QtNetwork/qnetworkconfigmanager.h>
-#include <QtNetwork/qnetworkconfiguration.h>
-#include <QtNetwork/qnetworksession.h>
-#endif
-
 #include <algorithm>
 
 #define TESTFILE QLatin1String("http://") + QtNetworkSettings::httpServerName() + QLatin1String("/qtest/cgi-bin/")
@@ -77,11 +71,6 @@ private:
     void runTest();
     void checkSynchronous();
 
-#ifndef QT_NO_BEARERMANAGEMENT
-    QNetworkConfigurationManager *netConfMan;
-    QNetworkConfiguration networkConfiguration;
-    QScopedPointer<QNetworkSession> networkSession;
-#endif
 };
 
 class NetworkDiskCache : public QNetworkDiskCache
@@ -133,16 +122,6 @@ void tst_QAbstractNetworkCache::initTestCase()
     if (!QtNetworkSettings::verifyTestNetworkSettings())
         QSKIP("No network test server available");
 #endif
-
-#ifndef QT_NO_BEARERMANAGEMENT
-    netConfMan = new QNetworkConfigurationManager(this);
-    networkConfiguration = netConfMan->defaultConfiguration();
-    networkSession.reset(new QNetworkSession(networkConfiguration));
-    if (!networkSession->isOpen()) {
-        networkSession->open();
-        QVERIFY(networkSession->waitForOpened(30000));
-    }
-#endif
 }
 
 
diff --git a/tests/auto/network/access/qftp/tst_qftp.cpp b/tests/auto/network/access/qftp/tst_qftp.cpp
index 60acb70af4..886a589324 100644
--- a/tests/auto/network/access/qftp/tst_qftp.cpp
+++ b/tests/auto/network/access/qftp/tst_qftp.cpp
@@ -37,10 +37,6 @@
 #include <time.h>
 #include <stdlib.h>
 #include <QNetworkProxy>
-#include <QNetworkConfiguration>
-#include <qnetworkconfigmanager.h>
-#include <QNetworkSession>
-#include <QtNetwork/private/qnetworksession_p.h>
 #include <QTcpServer>
 #include <QHostInfo>
 #include <QElapsedTimer>
@@ -66,7 +62,6 @@ public:
 private slots:
     void initTestCase_data();
     void initTestCase();
-    void cleanupTestCase();
     void init();
     void cleanup();
     void connectToHost_data();
@@ -138,10 +133,6 @@ private:
     void renameCleanup( const QString &host, const QString &user, const QString &password, const QString &fileToDelete );
 
     QFtp *ftp;
-#ifndef QT_NO_BEARERMANAGEMENT
-    QSharedPointer<QNetworkSession> networkSessionExplicit;
-    QSharedPointer<QNetworkSession> networkSessionImplicit;
-#endif
 
     QList<int> ids; // helper to make sure that all expected signals are emitted
     int current_id;
@@ -190,21 +181,13 @@ void tst_QFtp::initTestCase_data()
 {
     QTest::addColumn<bool>("setProxy");
     QTest::addColumn<int>("proxyType");
-    QTest::addColumn<bool>("setSession");
 
-    QTest::newRow("WithoutProxy") << false << 0 << false;
+    QTest::newRow("WithoutProxy") << false << 0;
 #if QT_CONFIG(socks5)
-    QTest::newRow("WithSocks5Proxy") << true << int(QNetworkProxy::Socks5Proxy) << false;
+    QTest::newRow("WithSocks5Proxy") << true << int(QNetworkProxy::Socks5Proxy);
 #endif
     //### doesn't work well yet.
     //QTest::newRow("WithHttpProxy") << true << int(QNetworkProxy::HttpProxy);
-
-#ifndef QT_NO_BEARERMANAGEMENT
-    QTest::newRow("WithoutProxyWithSession") << false << 0 << true;
-#if QT_CONFIG(socks5)
-    QTest::newRow("WithSocks5ProxyAndSession") << true << int(QNetworkProxy::Socks5Proxy) << true;
-#endif
-#endif
 }
 
 void tst_QFtp::initTestCase()
@@ -218,29 +201,14 @@ void tst_QFtp::initTestCase()
     if (!QtNetworkSettings::verifyTestNetworkSettings())
         QSKIP("No network test server available");
 #endif
-#ifndef QT_NO_BEARERMANAGEMENT
-    QNetworkConfigurationManager manager;
-    networkSessionImplicit = QSharedPointer<QNetworkSession>::create(manager.defaultConfiguration());
-    networkSessionImplicit->open();
-    QVERIFY(networkSessionImplicit->waitForOpened(60000)); //there may be user prompt on 1st connect
-#endif
     rfc3252File = QFINDTESTDATA("rfc3252.txt");
     QVERIFY(!rfc3252File.isEmpty());
 }
 
-void tst_QFtp::cleanupTestCase()
-{
-#ifndef QT_NO_BEARERMANAGEMENT
-    networkSessionExplicit.clear();
-    networkSessionImplicit.clear();
-#endif
-}
-
 void tst_QFtp::init()
 {
     QFETCH_GLOBAL(bool, setProxy);
     QFETCH_GLOBAL(int, proxyType);
-    QFETCH_GLOBAL(bool, setSession);
     if (setProxy) {
 #ifndef QT_NO_NETWORKPROXY
         if (proxyType == QNetworkProxy::Socks5Proxy) {
@@ -253,19 +221,6 @@ void tst_QFtp::init()
         QSKIP("No proxy support");
 #endif // QT_NO_NETWORKPROXY
     }
-#ifndef QT_NO_BEARERMANAGEMENT
-    if (setSession) {
-        networkSessionExplicit = networkSessionImplicit;
-        if (!networkSessionExplicit->isOpen()) {
-            networkSessionExplicit->open();
-            QVERIFY(networkSessionExplicit->waitForOpened(30000));
-        }
-    } else {
-        networkSessionExplicit.clear();
-    }
-#else
-    Q_UNUSED(setSession);
-#endif
 
     delete ftp;
     ftp = 0;
@@ -314,9 +269,6 @@ void tst_QFtp::cleanup()
 
     delete ftp;
     ftp = 0;
-#ifndef QT_NO_BEARERMANAGEMENT
-    networkSessionExplicit.clear();
-#endif
 }
 
 void tst_QFtp::connectToHost_data()
@@ -1947,11 +1899,6 @@ void tst_QFtp::dataTransferProgress( qint64 done, qint64 total )
 QFtp *tst_QFtp::newFtp()
 {
     QFtp *nFtp = new QFtp( this );
-#ifndef QT_NO_BEARERMANAGEMENT
-    if (networkSessionExplicit) {
-        nFtp->setProperty("_q_networksession", QVariant::fromValue(networkSessionExplicit));
-    }
-#endif
     connect( nFtp, SIGNAL(commandStarted(int)),
              SLOT(commandStarted(int)) );
     connect( nFtp, SIGNAL(commandFinished(int,bool)),
diff --git a/tests/auto/network/bearer/CMakeLists.txt b/tests/auto/network/bearer/CMakeLists.txt
deleted file mode 100644
index 4b593aab0a..0000000000
--- a/tests/auto/network/bearer/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Generated from bearer.pro.
-
-add_subdirectory(qnetworkconfiguration)
-add_subdirectory(qnetworkconfigurationmanager)
-add_subdirectory(qnetworkconfigurationmanagerqappless)
-add_subdirectory(qnetworksession)
diff --git a/tests/auto/network/bearer/bearer.pro b/tests/auto/network/bearer/bearer.pro
deleted file mode 100644
index 6ce922eaf8..0000000000
--- a/tests/auto/network/bearer/bearer.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-TEMPLATE=subdirs
-SUBDIRS=\
-   qnetworkconfiguration \
-   qnetworkconfigurationmanager \
-   qnetworkconfigurationmanagerqappless \
-   qnetworksession \
-
diff --git a/tests/auto/network/bearer/qbearertestcommon.h b/tests/auto/network/bearer/qbearertestcommon.h
deleted file mode 100644
index 923f093402..0000000000
--- a/tests/auto/network/bearer/qbearertestcommon.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
-
-#ifndef QBEARERTESTCOMMON_H
-#define QBEARERTESTCOMMON_H
-
-#include <QtTest/qtestcase.h>
-
-enum { TestTimeOut = 90000 };
-
-// Wait for __expr to happen, while still allowing events to be processed.
-#define QTRY_NOOP(__expr) \
-    do { \
-        const int __step = 50; \
-        const int __timeout = 15000; \
-        if (!(__expr)) { \
-            QTest::qWait(0); \
-        } \
-        for (int __i = 0; __i < __timeout && !(__expr); __i+=__step) { \
-            QTest::qWait(__step); \
-        } \
-    } while(0)
-
-#endif
diff --git a/tests/auto/network/bearer/qnetworkconfiguration/CMakeLists.txt b/tests/auto/network/bearer/qnetworkconfiguration/CMakeLists.txt
deleted file mode 100644
index 1db8bb1e6b..0000000000
--- a/tests/auto/network/bearer/qnetworkconfiguration/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated from qnetworkconfiguration.pro.
-
-#####################################################################
-## tst_qnetworkconfiguration Test:
-#####################################################################
-
-add_qt_test(tst_qnetworkconfiguration
-    SOURCES
-        ../qbearertestcommon.h
-        tst_qnetworkconfiguration.cpp
-    PUBLIC_LIBRARIES
-        Qt::Network
-)
diff --git a/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro b/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro
deleted file mode 100644
index cde82a4fb2..0000000000
--- a/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qnetworkconfiguration
-SOURCES  += tst_qnetworkconfiguration.cpp
-HEADERS  += ../qbearertestcommon.h
-
-QT = core network testlib
diff --git a/tests/auto/network/bearer/qnetworkconfiguration/tst_qnetworkconfiguration.cpp b/tests/auto/network/bearer/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
deleted file mode 100644
index 9c49e0c173..0000000000
--- a/tests/auto/network/bearer/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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 <QtTest/QtTest>
-#include "../qbearertestcommon.h"
-
-#ifndef QT_NO_BEARERMANAGEMENT
-#include <QtNetwork/qnetworkconfiguration.h>
-#include <QtNetwork/qnetworkconfigmanager.h>
-#endif
-
-/*
-  Although this unit test doesn't use QNetworkAccessManager
-  this include is used to ensure that bearer continues to compile against
-  Qt 4.7+ which has a QNetworkConfiguration enabled QNetworkAccessManager
-*/
-#include <QNetworkAccessManager>
-
-QT_USE_NAMESPACE
-
-class tst_QNetworkConfiguration : public QObject
-{
-    Q_OBJECT
-
-private slots:
-#ifndef QT_NO_BEARERMANAGEMENT
-    void invalidPoint();
-    void comparison();
-    void children();
-    void isRoamingAvailable();
-    void connectTimeout();
-#endif
-};
-
-#ifndef QT_NO_BEARERMANAGEMENT
-void tst_QNetworkConfiguration::invalidPoint()
-{
-    QNetworkConfiguration pt;
-
-    QVERIFY(pt.name().isEmpty());
-    QVERIFY(!pt.isValid());
-    QCOMPARE(pt.type(), QNetworkConfiguration::Invalid);
-    QVERIFY(!(pt.state() & QNetworkConfiguration::Defined));
-    QVERIFY(!(pt.state() & QNetworkConfiguration::Discovered));
-    QVERIFY(!(pt.state() & QNetworkConfiguration::Active));
-    QVERIFY(!pt.isRoamingAvailable());
-
-    QNetworkConfiguration pt2(pt);
-    QVERIFY(pt2.name().isEmpty());
-    QVERIFY(!pt2.isValid());
-    QCOMPARE(pt2.type(), QNetworkConfiguration::Invalid);
-    QVERIFY(!(pt2.state() & QNetworkConfiguration::Defined));
-    QVERIFY(!(pt2.state() & QNetworkConfiguration::Discovered));
-    QVERIFY(!(pt2.state() & QNetworkConfiguration::Active));
-    QVERIFY(!pt2.isRoamingAvailable());
-
-}
-
-void tst_QNetworkConfiguration::comparison()
-{
-    //test copy constructor and assignment operator
-    //compare invalid connection points
-    QNetworkConfiguration pt1;
-    QVERIFY(!pt1.isValid());
-    QCOMPARE(pt1.type(), QNetworkConfiguration::Invalid);
-
-    QNetworkConfiguration pt2(pt1);
-    QVERIFY(pt1==pt2);
-    QVERIFY(!(pt1!=pt2));
-    QCOMPARE(pt1.name(), pt2.name());
-    QCOMPARE(pt1.isValid(), pt2.isValid());
-    QCOMPARE(pt1.type(), pt2.type());
-    QCOMPARE(pt1.state(), pt2.state());
-    QCOMPARE(pt1.purpose(), pt2.purpose());
-
-
-    QNetworkConfiguration pt3;
-    pt3 = pt1;
-    QVERIFY(pt1==pt3);
-    QVERIFY(!(pt1!=pt3));
-    QCOMPARE(pt1.name(), pt3.name());
-    QCOMPARE(pt1.isValid(), pt3.isValid());
-    QCOMPARE(pt1.type(), pt3.type());
-    QCOMPARE(pt1.state(), pt3.state());
-    QCOMPARE(pt1.purpose(), pt3.purpose());
-
-    //test case must run on machine that has valid connection points
-    QNetworkConfigurationManager manager;
-    QList<QNetworkConfiguration> preScanConfigs = manager.allConfigurations();
-
-    QSignalSpy spy(&manager, SIGNAL(updateCompleted()));
-    manager.updateConfigurations(); //initiate scans
-    QTRY_VERIFY_WITH_TIMEOUT(spy.count() >= 1, TestTimeOut); //wait for scan to complete
-
-    QList<QNetworkConfiguration> configs = manager.allConfigurations(QNetworkConfiguration::Discovered);
-    QVERIFY(configs.count());
-    QNetworkConfiguration defaultConfig = manager.defaultConfiguration();
-    QVERIFY(defaultConfig.isValid());
-    QVERIFY(defaultConfig.type() != QNetworkConfiguration::Invalid);
-    QVERIFY(!defaultConfig.name().isEmpty());
-
-    pt3 = defaultConfig;
-    QVERIFY(defaultConfig==pt3);
-    QVERIFY(!(defaultConfig!=pt3));
-    QCOMPARE(defaultConfig.name(), pt3.name());
-    QCOMPARE(defaultConfig.isValid(), pt3.isValid());
-    QCOMPARE(defaultConfig.type(), pt3.type());
-    QCOMPARE(defaultConfig.state(), pt3.state());
-    QCOMPARE(defaultConfig.purpose(), pt3.purpose());
-}
-
-void tst_QNetworkConfiguration::children()
-{
-    QNetworkConfigurationManager manager;
-    QList<QNetworkConfiguration> configs = manager.allConfigurations();
-
-    foreach(QNetworkConfiguration c, configs)
-    {
-        if ( c.type() == QNetworkConfiguration::ServiceNetwork ) {
-            qDebug() << "found service network" << c.name() << c.children().count();
-            QVERIFY(c.isValid());
-            QList<QNetworkConfiguration> members = c.children();
-            foreach(QNetworkConfiguration child, members) {
-                QVERIFY(child.isValid());
-                QVERIFY(configs.contains(child));
-                qDebug() << "\t" << child.name();
-            }
-        }
-    }
-}
-
-void tst_QNetworkConfiguration::isRoamingAvailable()
-{
-    QNetworkConfigurationManager manager;
-    QList<QNetworkConfiguration> configs = manager.allConfigurations();
-
-    //force update to get maximum list
-    QSignalSpy spy(&manager, SIGNAL(updateCompleted()));
-    manager.updateConfigurations(); //initiate scans
-    QTRY_VERIFY_WITH_TIMEOUT(spy.count() >= 1, TestTimeOut); //wait for scan to complete
-
-    foreach(QNetworkConfiguration c, configs)
-    {
-        QVERIFY(QNetworkConfiguration::UserChoice != c.type());
-        QVERIFY(QNetworkConfiguration::Invalid != c.type());
-        if ( c.type() == QNetworkConfiguration::ServiceNetwork ) {
-            //cannot test flag as some SNAPs may not support roaming anyway
-            //QVERIFY(c.roamingavailable())
-            if ( c.children().count() <= 1 )
-                QVERIFY(!c.isRoamingAvailable());
-            foreach(QNetworkConfiguration child, c.children()) {
-                QCOMPARE(QNetworkConfiguration::InternetAccessPoint, child.type());
-                QCOMPARE(child.children().count(), 0);
-            }
-        } else {
-            QVERIFY(!c.isRoamingAvailable());
-        }
-    }
-}
-
-void tst_QNetworkConfiguration::connectTimeout()
-{
-    QNetworkConfigurationManager manager;
-    QList<QNetworkConfiguration> configs = manager.allConfigurations();
-
-    foreach (QNetworkConfiguration networkConfiguration, configs) {
-        QCOMPARE(networkConfiguration.connectTimeout(), 30000);
-
-        bool result = networkConfiguration.setConnectTimeout(100);
-        QVERIFY(result);
-
-        QCOMPARE(networkConfiguration.connectTimeout(), 100);
-    }
-}
-#endif
-
-QTEST_MAIN(tst_QNetworkConfiguration)
-#include "tst_qnetworkconfiguration.moc"
diff --git a/tests/auto/network/bearer/qnetworkconfigurationmanager/CMakeLists.txt b/tests/auto/network/bearer/qnetworkconfigurationmanager/CMakeLists.txt
deleted file mode 100644
index 355bd4898a..0000000000
--- a/tests/auto/network/bearer/qnetworkconfigurationmanager/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated from qnetworkconfigurationmanager.pro.
-
-#####################################################################
-## tst_qnetworkconfigurationmanager Test:
-#####################################################################
-
-add_qt_test(tst_qnetworkconfigurationmanager
-    SOURCES
-        ../qbearertestcommon.h
-        tst_qnetworkconfigurationmanager.cpp
-    PUBLIC_LIBRARIES
-        Qt::Network
-)
diff --git a/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro b/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro
deleted file mode 100644
index 52cee1f64d..0000000000
--- a/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qnetworkconfigurationmanager
-SOURCES  += tst_qnetworkconfigurationmanager.cpp
-HEADERS  += ../qbearertestcommon.h
-
-QT = core network testlib
diff --git a/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp b/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
deleted file mode 100644
index b251a65420..0000000000
--- a/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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 <QtTest/QtTest>
-#include "../qbearertestcommon.h"
-
-#ifndef QT_NO_BEARERMANAGEMENT
-#include <QtNetwork/qnetworkconfiguration.h>
-#include <QtNetwork/qnetworkconfigmanager.h>
-#endif
-
-QT_USE_NAMESPACE
-class tst_QNetworkConfigurationManager : public QObject
-{
-    Q_OBJECT
-
-private slots:
-#ifndef QT_NO_BEARERMANAGEMENT
-    void usedInThread(); // this test must be first, or it will falsely pass
-    void allConfigurations();
-    void defaultConfiguration();
-    void configurationFromIdentifier();
-#endif
-};
-
-#ifndef QT_NO_BEARERMANAGEMENT
-void printConfigurationDetails(const QNetworkConfiguration& p)
-{
-    qDebug() << p.name() <<":  isvalid->" <<p.isValid() << " type->"<< p.type() <<
-                " roaming->" << p.isRoamingAvailable() << "identifier->" << p.identifier() <<
-                " purpose->" << p.purpose() << " state->" << p.state();
-}
-
-void tst_QNetworkConfigurationManager::allConfigurations()
-{
-    QNetworkConfigurationManager manager;
-    QList<QNetworkConfiguration> preScanConfigs = manager.allConfigurations();
-
-    foreach(QNetworkConfiguration c, preScanConfigs)
-    {
-        QVERIFY2(c.type()!=QNetworkConfiguration::UserChoice, "allConfiguration must not return UserChoice configs");
-    }
-
-    QSignalSpy spy(&manager, SIGNAL(updateCompleted()));
-    manager.updateConfigurations(); //initiate scans
-    QTRY_VERIFY_WITH_TIMEOUT(spy.count() >= 1, TestTimeOut); //wait for scan to complete
-
-    QList<QNetworkConfiguration> configs = manager.allConfigurations();
-
-    int all = configs.count();
-    qDebug() << "All configurations:" << all;
-    QVERIFY(all);
-    foreach(QNetworkConfiguration p, configs) {
-        QVERIFY(p.isValid());
-        printConfigurationDetails(p);
-        QVERIFY(p.type() != QNetworkConfiguration::Invalid);
-        QVERIFY(p.type() != QNetworkConfiguration::UserChoice);
-    }
-
-    configs = manager.allConfigurations(QNetworkConfiguration::Undefined);
-    int undefined = configs.count();
-    QVERIFY(undefined <= all);
-    qDebug() << "Undefined configurations:" << undefined;
-    foreach( const QNetworkConfiguration p, configs) {
-        printConfigurationDetails(p);
-        QVERIFY(p.state() & QNetworkConfiguration::Undefined);
-        QVERIFY(!(p.state() & QNetworkConfiguration::Defined));
-    }
-
-    //get defined configs only (same as all)
-    configs = manager.allConfigurations(QNetworkConfiguration::Defined);
-    int defined = configs.count();
-    qDebug() << "Defined configurations:" << defined;
-    QVERIFY(defined <= all);
-    foreach( const QNetworkConfiguration p, configs) {
-        printConfigurationDetails(p);
-        QVERIFY(p.state() & QNetworkConfiguration::Defined);
-        QVERIFY(!(p.state() & QNetworkConfiguration::Undefined));
-    }
-
-    //get discovered configurations only
-    configs = manager.allConfigurations(QNetworkConfiguration::Discovered);
-    int discovered = configs.count();
-    //QVERIFY(discovered);
-    qDebug() << "Discovered configurations:" << discovered;
-    foreach(const QNetworkConfiguration p, configs) {
-        printConfigurationDetails(p);
-        QVERIFY(p.isValid());
-        QVERIFY(!(p.state() & QNetworkConfiguration::Undefined));
-        QVERIFY(p.state() & QNetworkConfiguration::Defined);
-        QVERIFY(p.state() & QNetworkConfiguration::Discovered);
-    }
-
-    //getactive configurations only
-    configs = manager.allConfigurations(QNetworkConfiguration::Active);
-    int active = configs.count();
-    if (active)
-        QVERIFY(manager.isOnline());
-    else
-        QVERIFY(!manager.isOnline());
-
-    //QVERIFY(active);
-    qDebug() << "Active configurations:" << active;
-    foreach(const QNetworkConfiguration p, configs) {
-        printConfigurationDetails(p);
-        QVERIFY(p.isValid());
-        QVERIFY(!(p.state() & QNetworkConfiguration::Undefined));
-        QVERIFY(p.state() & QNetworkConfiguration::Active);
-        QVERIFY(p.state() & QNetworkConfiguration::Discovered);
-        QVERIFY(p.state() & QNetworkConfiguration::Defined);
-    }
-
-    QVERIFY(all >= discovered);
-    QVERIFY(discovered >= active);
-}
-
-
-void tst_QNetworkConfigurationManager::defaultConfiguration()
-{
-    QNetworkConfigurationManager manager;
-    QSignalSpy spy(&manager, SIGNAL(updateCompleted()));
-    manager.updateConfigurations(); //initiate scans
-    QTRY_VERIFY_WITH_TIMEOUT(spy.count() >= 1, TestTimeOut); //wait for scan to complete
-
-    QList<QNetworkConfiguration> configs = manager.allConfigurations();
-    QNetworkConfiguration defaultConfig = manager.defaultConfiguration();
-
-    bool confirm = configs.contains(defaultConfig);
-
-    if (defaultConfig.type() != QNetworkConfiguration::UserChoice) {
-        QVERIFY(confirm || !defaultConfig.isValid());
-        QVERIFY(!(confirm && !defaultConfig.isValid()));
-    } else {
-        QVERIFY(!confirm);  // user choice config is not part of allConfigurations()
-        QVERIFY(defaultConfig.isValid());
-        QCOMPARE(defaultConfig.name(), QString("UserChoice"));
-        QCOMPARE(defaultConfig.children().count(), 0);
-        QVERIFY(!defaultConfig.isRoamingAvailable());
-        QCOMPARE(defaultConfig.state(), QNetworkConfiguration::Discovered);
-        QNetworkConfiguration copy = manager.configurationFromIdentifier(defaultConfig.identifier());
-        QCOMPARE(copy, defaultConfig);
-    }
-}
-
-void tst_QNetworkConfigurationManager::configurationFromIdentifier()
-{
-    QNetworkConfigurationManager manager;
-    QSet<QString> allIdentifier;
-
-    //force an update to get maximum number of configs
-    QSignalSpy spy(&manager, SIGNAL(updateCompleted()));
-    manager.updateConfigurations(); //initiate scans
-    QTRY_VERIFY_WITH_TIMEOUT(spy.count() >= 1, TestTimeOut); //wait for scan to complete
-
-    QList<QNetworkConfiguration> configs = manager.allConfigurations();
-
-    foreach(QNetworkConfiguration c, configs) {
-        QVERIFY(!allIdentifier.contains(c.identifier()));
-        allIdentifier.insert(c.identifier());
-
-        QNetworkConfiguration direct = manager.configurationFromIdentifier(c.identifier());
-        QVERIFY(direct.isValid());
-        QCOMPARE(direct, c);
-    }
-
-    //assume that there is no item with identifier 'FooBar'
-    QVERIFY(!allIdentifier.contains("FooBar"));
-    QNetworkConfiguration invalid = manager.configurationFromIdentifier("FooBar");
-    QVERIFY(!invalid.isValid());
-}
-
-class QNCMTestThread : public QThread
-{
-protected:
-    virtual void run()
-    {
-        QNetworkConfigurationManager manager;
-        preScanConfigs = manager.allConfigurations();
-        QSignalSpy spy(&manager, SIGNAL(updateCompleted()));
-        manager.updateConfigurations(); //initiate scans
-        QTRY_VERIFY_WITH_TIMEOUT(spy.count() >= 1, TestTimeOut); //wait for scan to complete
-        configs = manager.allConfigurations();
-    }
-public:
-    QList<QNetworkConfiguration> configs;
-    QList<QNetworkConfiguration> preScanConfigs;
-};
-
-// regression test for QTBUG-18795
-void tst_QNetworkConfigurationManager::usedInThread()
-{
-#if defined Q_OS_MAC && !defined (QT_NO_COREWLAN)
-    QSKIP("QTBUG-19070 Mac CoreWlan plugin is broken");
-#else
-    QNCMTestThread thread;
-    connect(&thread, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
-    thread.start();
-    QTestEventLoop::instance().enterLoop(100); //QTRY_VERIFY_WITH_TIMEOUT could take ~90 seconds to time out in the thread
-    QVERIFY(!QTestEventLoop::instance().timeout());
-    qDebug() << "prescan:" << thread.preScanConfigs.count();
-    qDebug() << "postscan:" << thread.configs.count();
-
-    QNetworkConfigurationManager manager;
-    QList<QNetworkConfiguration> preScanConfigs = manager.allConfigurations();
-    QSignalSpy spy(&manager, SIGNAL(updateCompleted()));
-    manager.updateConfigurations(); //initiate scans
-    QTRY_VERIFY_WITH_TIMEOUT(spy.count() >= 1, TestTimeOut); //wait for scan to complete
-    QList<QNetworkConfiguration> configs = manager.allConfigurations();
-    QCOMPARE(thread.configs, configs);
-    //Don't compare pre scan configs, because these may be cached and therefore give different results
-    //which makes the test unstable.  The post scan results should have all configurations every time
-    //QCOMPARE(thread.preScanConfigs, preScanConfigs);
-#endif
-}
-#endif
-
-QTEST_MAIN(tst_QNetworkConfigurationManager)
-#include "tst_qnetworkconfigurationmanager.moc"
diff --git a/tests/auto/network/bearer/qnetworkconfigurationmanagerqappless/CMakeLists.txt b/tests/auto/network/bearer/qnetworkconfigurationmanagerqappless/CMakeLists.txt
deleted file mode 100644
index dcf18785bf..0000000000
--- a/tests/auto/network/bearer/qnetworkconfigurationmanagerqappless/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated from qnetworkconfigurationmanagerqappless.pro.
-
-#####################################################################
-## tst_qnetworkconfigurationmanagerqappless Test:
-#####################################################################
-
-add_qt_test(tst_qnetworkconfigurationmanagerqappless
-    SOURCES
-        ../qbearertestcommon.h
-        tst_qnetworkconfigurationmanagerqappless.cpp
-    PUBLIC_LIBRARIES
-        Qt::Network
-)
diff --git a/tests/auto/network/bearer/qnetworkconfigurationmanagerqappless/qnetworkconfigurationmanagerqappless.pro b/tests/auto/network/bearer/qnetworkconfigurationmanagerqappless/qnetworkconfigurationmanagerqappless.pro
deleted file mode 100644
index ad080910d7..0000000000
--- a/tests/auto/network/bearer/qnetworkconfigurationmanagerqappless/qnetworkconfigurationmanagerqappless.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qnetworkconfigurationmanagerqappless
-SOURCES  += tst_qnetworkconfigurationmanagerqappless.cpp
-HEADERS  += ../qbearertestcommon.h
-
-QT = core network testlib
diff --git a/tests/auto/network/bearer/qnetworkconfigurationmanagerqappless/tst_qnetworkconfigurationmanagerqappless.cpp b/tests/auto/network/bearer/qnetworkconfigurationmanagerqappless/tst_qnetworkconfigurationmanagerqappless.cpp
deleted file mode 100644
index fdeaa9d3b2..0000000000
--- a/tests/auto/network/bearer/qnetworkconfigurationmanagerqappless/tst_qnetworkconfigurationmanagerqappless.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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 <QtTest/QtTest>
-#include <QtNetwork/qnetworkaccessmanager.h>
-
-QT_USE_NAMESPACE
-
-class tst_QNetworkConfigurationManager : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void staticsInitialization();
-};
-
-void tst_QNetworkConfigurationManager::staticsInitialization()
-{
-    // This code should not crash. The test was introduced as
-    // a fix for QTBUG-36897
-    for (int i = 0; i < 2; i++)
-    {
-        int argc = 1;
-        const char *testName = "tst_qnetworkconfigurationmanagerqappless";
-        char **argv = const_cast<char **>(&testName);
-        QCoreApplication app(argc, argv);
-        QNetworkAccessManager qnam;
-        Q_UNUSED(app);
-        Q_UNUSED(qnam);
-    }
-    QVERIFY(true);
-}
-
-QTEST_APPLESS_MAIN(tst_QNetworkConfigurationManager)
-#include "tst_qnetworkconfigurationmanagerqappless.moc"
diff --git a/tests/auto/network/bearer/qnetworksession/CMakeLists.txt b/tests/auto/network/bearer/qnetworksession/CMakeLists.txt
deleted file mode 100644
index 99c3483e6c..0000000000
--- a/tests/auto/network/bearer/qnetworksession/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated from qnetworksession.pro.
-
-add_subdirectory(test)
-
-if(NOT WINRT)
-    add_subdirectory(lackey)
-endif()
diff --git a/tests/auto/network/bearer/qnetworksession/lackey/CMakeLists.txt b/tests/auto/network/bearer/qnetworksession/lackey/CMakeLists.txt
deleted file mode 100644
index c2d0d59d57..0000000000
--- a/tests/auto/network/bearer/qnetworksession/lackey/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated from lackey.pro.
-
-#####################################################################
-## lackey Binary:
-#####################################################################
-
-add_qt_executable(lackey
-    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
-    SOURCES
-        main.cpp
-    PUBLIC_LIBRARIES
-        Qt::Network
-)
diff --git a/tests/auto/network/bearer/qnetworksession/lackey/lackey.pro b/tests/auto/network/bearer/qnetworksession/lackey/lackey.pro
deleted file mode 100644
index dd83d905e6..0000000000
--- a/tests/auto/network/bearer/qnetworksession/lackey/lackey.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-SOURCES += main.cpp
-TARGET = lackey
-
-QT = core network
-
-DESTDIR = ./
-
-CONFIG += cmdline
diff --git a/tests/auto/network/bearer/qnetworksession/lackey/main.cpp b/tests/auto/network/bearer/qnetworksession/lackey/main.cpp
deleted file mode 100644
index 5fad06c2cf..0000000000
--- a/tests/auto/network/bearer/qnetworksession/lackey/main.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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 <QCoreApplication>
-#include <QStringList>
-#include <QLocalSocket>
-
-#ifndef QT_NO_BEARERMANAGEMENT
-#include <QtNetwork/qnetworkconfiguration.h>
-#include <QtNetwork/qnetworkconfigmanager.h>
-#include <QtNetwork/qnetworksession.h>
-#endif
-
-#include <QEventLoop>
-#include <QTimer>
-#include <QDebug>
-
-QT_USE_NAMESPACE
-
-
-#define NO_DISCOVERED_CONFIGURATIONS_ERROR 1
-#define SESSION_OPEN_ERROR 2
-
-
-int main(int argc, char** argv)
-{
-    QCoreApplication app(argc, argv);
-
-#ifndef QT_NO_BEARERMANAGEMENT
-    // Update configurations so that everything is up to date for this process too.
-    // Event loop is used to wait for awhile.
-    QNetworkConfigurationManager manager;
-    manager.updateConfigurations();
-    QEventLoop iIgnoreEventLoop;
-    QTimer::singleShot(3000, &iIgnoreEventLoop, SLOT(quit()));
-    iIgnoreEventLoop.exec();
-
-    QList<QNetworkConfiguration> discovered =
-        manager.allConfigurations(QNetworkConfiguration::Discovered);
-
-        foreach(QNetworkConfiguration config, discovered) {
-            qDebug() << "Lackey: Name of the config enumerated: " << config.name();
-            qDebug() << "Lackey: State of the config enumerated: " << config.state();
-        }
-
-    if (discovered.isEmpty()) {
-        qDebug("Lackey: no discovered configurations, returning empty error.");
-        return NO_DISCOVERED_CONFIGURATIONS_ERROR;
-    }
-
-    // Cannot read/write to processes on WinCE.
-    // Easiest alternative is to use sockets for IPC.
-    QLocalSocket oopSocket;
-
-    oopSocket.connectToServer("tst_qnetworksession");
-    oopSocket.waitForConnected(-1);
-
-    qDebug() << "Lackey started";
-
-    QNetworkSession *session = 0;
-    do {
-        if (session) {
-            delete session;
-            session = 0;
-        }
-
-        qDebug() << "Discovered configurations:" << discovered.count();
-
-        if (discovered.isEmpty()) {
-            qDebug() << "No more discovered configurations";
-            break;
-        }
-
-        qDebug() << "Taking first configuration";
-
-        QNetworkConfiguration config = discovered.takeFirst();
-
-        if ((config.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) {
-            qDebug() << config.name() << "is active, therefore skipping it (looking for configs in 'discovered' state).";
-            continue;
-        }
-
-        qDebug() << "Creating session for" << config.name() << config.identifier();
-
-        session = new QNetworkSession(config);
-
-        QString output = QString("Starting session for %1\n").arg(config.identifier());
-        oopSocket.write(output.toLatin1());
-        oopSocket.waitForBytesWritten();
-        session->open();
-        session->waitForOpened();
-    } while (!(session && session->isOpen()));
-
-    qDebug() << "lackey: loop done";
-
-    if (!session) {
-        qDebug() << "Could not start session";
-
-        oopSocket.disconnectFromServer();
-        oopSocket.waitForDisconnected(-1);
-
-        return SESSION_OPEN_ERROR;
-    }
-
-    QByteArray output = "Started session for "
-        + session->configuration().identifier().toLatin1() + '\n';
-    oopSocket.write(output);
-    oopSocket.waitForBytesWritten();
-
-    oopSocket.waitForReadyRead();
-    oopSocket.readLine();
-
-    session->stop();
-
-    delete session;
-
-    oopSocket.disconnectFromServer();
-    oopSocket.waitForDisconnected(-1);
-#endif
-
-    return 0;
-}
diff --git a/tests/auto/network/bearer/qnetworksession/qnetworksession.pro b/tests/auto/network/bearer/qnetworksession/qnetworksession.pro
deleted file mode 100644
index cd480fb73b..0000000000
--- a/tests/auto/network/bearer/qnetworksession/qnetworksession.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-TEMPLATE = subdirs
-!winrt:SUBDIRS = lackey
-test.depends = $$SUBDIRS
-SUBDIRS += test
diff --git a/tests/auto/network/bearer/qnetworksession/test/.prev_CMakeLists.txt b/tests/auto/network/bearer/qnetworksession/test/.prev_CMakeLists.txt
deleted file mode 100644
index e164bccbdf..0000000000
--- a/tests/auto/network/bearer/qnetworksession/test/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-# Generated from test.pro.
-
-#####################################################################
-## tst_qnetworksession Test:
-#####################################################################
-
-add_qt_test(tst_qnetworksession
-    SOURCES
-        ../../qbearertestcommon.h
-        tst_qnetworksession.cpp
-    PUBLIC_LIBRARIES
-        Qt::Network
-        Qt::NetworkPrivate
-)
-
-## Scopes:
-#####################################################################
-
-#### Keys ignored in scope 3:.:.:test.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
-# DESTDIR = "../debug"
-
-#### Keys ignored in scope 4:.:.:test.pro:else:
-# DESTDIR = "../release"
-
-#### Keys ignored in scope 5:.:.:test.pro:else:
-# DESTDIR = ".."
-
-#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID AND NOT WINRT:
-# TEST_HELPER_INSTALLS = "../lackey/lackey"
diff --git a/tests/auto/network/bearer/qnetworksession/test/CMakeLists.txt b/tests/auto/network/bearer/qnetworksession/test/CMakeLists.txt
deleted file mode 100644
index c86966600d..0000000000
--- a/tests/auto/network/bearer/qnetworksession/test/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-# Generated from test.pro.
-
-#####################################################################
-## tst_qnetworksession Test:
-#####################################################################
-
-add_qt_test(tst_qnetworksession
-    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
-    SOURCES
-        ../../qbearertestcommon.h
-        tst_qnetworksession.cpp
-    PUBLIC_LIBRARIES
-        Qt::Network
-        Qt::NetworkPrivate
-)
-
-## Scopes:
-#####################################################################
-
-#### Keys ignored in scope 3:.:.:test.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
-# DESTDIR = "../debug"
-
-#### Keys ignored in scope 4:.:.:test.pro:else:
-# DESTDIR = "../release"
-
-#### Keys ignored in scope 5:.:.:test.pro:else:
-# DESTDIR = ".."
-
-#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID AND NOT WINRT:
-# TEST_HELPER_INSTALLS = "../lackey/lackey"
diff --git a/tests/auto/network/bearer/qnetworksession/test/test.pro b/tests/auto/network/bearer/qnetworksession/test/test.pro
deleted file mode 100644
index bfc1ec7727..0000000000
--- a/tests/auto/network/bearer/qnetworksession/test/test.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-CONFIG += testcase
-SOURCES  += tst_qnetworksession.cpp
-HEADERS  += ../../qbearertestcommon.h
-
-QT = core network testlib network-private
-
-TARGET = tst_qnetworksession
-CONFIG(debug_and_release) {
-  CONFIG(debug, debug|release) {
-    DESTDIR = ../debug
-  } else {
-    DESTDIR = ../release
-  }
-} else {
-  DESTDIR = ..
-}
-
-!android:!winrt: TEST_HELPER_INSTALLS = ../lackey/lackey
diff --git a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp
deleted file mode 100644
index a13adc8ebf..0000000000
--- a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp
+++ /dev/null
@@ -1,1299 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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 <QtTest/QtTest>
-#include <QLocalServer>
-#include <QLocalSocket>
-#include <QTimer>
-#include "../../qbearertestcommon.h"
-
-#ifndef QT_NO_BEARERMANAGEMENT
-#include <QtNetwork/qnetworkconfigmanager.h>
-#include <QtNetwork/qnetworksession.h>
-#include <private/qnetworksession_p.h>
-#endif
-
-QT_USE_NAMESPACE
-
-// Can be used to configure tests that require manual attention (such as roaming)
-//#define QNETWORKSESSION_MANUAL_TESTS 1
-
-#ifndef QT_NO_BEARERMANAGEMENT
-Q_DECLARE_METATYPE(QNetworkConfiguration::Type)
-#endif
-
-class tst_QNetworkSession : public QObject
-{
-    Q_OBJECT
-
-#ifndef QT_NO_BEARERMANAGEMENT
-public slots:
-    void initTestCase();
-    void cleanupTestCase();
-
-private slots:
-    void robustnessBombing();
-
-    void sessionClosing_data();
-    void sessionClosing();
-
-    void outOfProcessSession();
-    void invalidSession();
-
-    void repeatedOpenClose_data();
-    void repeatedOpenClose();
-
-    void sessionProperties_data();
-    void sessionProperties();
-
-    void userChoiceSession_data();
-    void userChoiceSession();
-
-    void sessionOpenCloseStop_data();
-    void sessionOpenCloseStop();
-
-    void sessionAutoClose_data();
-    void sessionAutoClose();
-
-    void usagePolicies();
-
-private:
-    QNetworkConfigurationManager manager;
-    int inProcessSessionManagementCount;
-    QString lackeyDir;
-#endif
-};
-
-#ifndef QT_NO_BEARERMANAGEMENT
-// Helper functions
-bool openSession(QNetworkSession *session);
-bool closeSession(QNetworkSession *session, bool lastSessionOnConfiguration = true);
-void updateConfigurations();
-void printConfigurations();
-QNetworkConfiguration suitableConfiguration(QString bearerType, QNetworkConfiguration::Type configType);
-
-void tst_QNetworkSession::initTestCase()
-{
-    qRegisterMetaType<QNetworkConfiguration>("QNetworkConfiguration");
-    qRegisterMetaType<QNetworkConfiguration::Type>("QNetworkConfiguration::Type");
-
-    inProcessSessionManagementCount = -1;
-
-    QSignalSpy spy(&manager, SIGNAL(updateCompleted()));
-    manager.updateConfigurations();
-    QTRY_VERIFY_WITH_TIMEOUT(spy.count() >= 1, TestTimeOut);
-
-    lackeyDir = QFINDTESTDATA("lackey");
-    QVERIFY2(!lackeyDir.isEmpty(), qPrintable(
-        QString::fromLatin1("Couldn't find lackey dir starting from %1.").arg(QDir::currentPath())));
-}
-
-void tst_QNetworkSession::cleanupTestCase()
-{
-    if (!(manager.capabilities() & QNetworkConfigurationManager::SystemSessionSupport) &&
-        (manager.capabilities() & QNetworkConfigurationManager::CanStartAndStopInterfaces) &&
-        inProcessSessionManagementCount == 0) {
-        qWarning("No usable configurations found to complete all possible tests in "
-                 "inProcessSessionManagement()");
-    }
-}
-
-// Robustness test for calling interfaces in nonsense order / with nonsense parameters
-void tst_QNetworkSession::robustnessBombing()
-{
-    QNetworkConfigurationManager mgr;
-    QNetworkSession testSession(mgr.defaultConfiguration());
-    // Should not reset even session is not opened
-    testSession.migrate();
-    testSession.accept();
-    testSession.ignore();
-    testSession.reject();
-}
-
-void tst_QNetworkSession::sessionClosing_data() {
-    QTest::addColumn<QString>("bearerType");
-    QTest::addColumn<QNetworkConfiguration::Type>("configurationType");
-
-    QTest::newRow("WLAN_IAP") << "WLAN" << QNetworkConfiguration::InternetAccessPoint;
-    QTest::newRow("Cellular_IAP") << "cellular" << QNetworkConfiguration::InternetAccessPoint;
-    QTest::newRow("SNAP") << "bearer_type_not_relevant_with_SNAPs" << QNetworkConfiguration::ServiceNetwork;
-}
-
-// Testcase for closing the session at unexpected times
-void tst_QNetworkSession::sessionClosing()
-{
-    QFETCH(QString, bearerType);
-    QFETCH(QNetworkConfiguration::Type, configurationType);
-
-    // Update configurations so that WLANs are discovered too.
-    updateConfigurations();
-
-    // First check that opening once succeeds and determine if test is doable
-    QNetworkConfiguration config = suitableConfiguration(bearerType, configurationType);
-    if (!config.isValid())
-        QSKIP("No suitable configurations, skipping this round of repeated open-close test.");
-    qDebug() << "Using following configuration to bomb with close(): " << config.name();
-    QNetworkSession session(config);
-    if (!openSession(&session) || !closeSession(&session))
-        QSKIP("Unable to open/close session, skipping this round of close() bombing.");
-
-    qDebug() << "Closing without issuing open()";
-    session.close();
-
-    for (int i = 0; i < 25; i++) {
-        qDebug() << "Opening and then waiting: " << i * 100 << " ms before closing.";
-        session.open();
-        QTest::qWait(i*100);
-        session.close();
-        // Sooner or later session must end in Disconnected state,
-        // no matter what the phase was.
-        QTRY_VERIFY_WITH_TIMEOUT(session.state() == QNetworkSession::Disconnected, TestTimeOut);
-        QTest::qWait(200); // Give platform a breathe, otherwise we'll be catching other errors
-    }
-}
-
-void tst_QNetworkSession::invalidSession()
-{
-    // 1. Verify that session created with invalid configuration remains in invalid state
-    QNetworkSession session(QNetworkConfiguration(), 0);
-    QVERIFY(!session.isOpen());
-    QCOMPARE(session.state(), QNetworkSession::Invalid);
-    QCOMPARE(session.error(), QNetworkSession::InvalidConfigurationError);
-
-    // 2. Verify that opening session with invalid configuration both 1) emits invalidconfigurationerror and 2) sets session's state as invalid.
-    QSignalSpy errorSpy(&session, SIGNAL(error(QNetworkSession::SessionError)));
-    session.open();
-    session.waitForOpened(1000); // Should bail out right away
-    QCOMPARE(errorSpy.count(), 1);
-    QNetworkSession::SessionError error =
-           qvariant_cast<QNetworkSession::SessionError> (errorSpy.first().at(0));
-    QCOMPARE(error, QNetworkSession::InvalidConfigurationError);
-    QCOMPARE(session.error(), QNetworkSession::InvalidConfigurationError);
-    QCOMPARE(session.state(), QNetworkSession::Invalid);
-
-#ifdef QNETWORKSESSION_MANUAL_TESTS
-
-    QNetworkConfiguration invalidatedConfig = suitableConfiguration("WLAN",QNetworkConfiguration::InternetAccessPoint);
-    if (invalidatedConfig.isValid()) {
-        // 3. Verify that invalidating a session after its successfully configured works
-        QNetworkSession invalidatedSession(invalidatedConfig);
-        qDebug() << "Delete the WLAN IAP from phone now (waiting 60 seconds): " << invalidatedConfig.name();
-        QTest::qWait(60000);
-        QVERIFY(!invalidatedConfig.isValid());
-        QCOMPARE(invalidatedSession.state(), QNetworkSession::Invalid);
-        qDebug() << "Add the WLAN IAP back (waiting 60 seconds): " << invalidatedConfig.name();
-        QTest::qWait(60000);
-    }
-
-    QNetworkConfiguration definedConfig = suitableConfiguration("WLAN",QNetworkConfiguration::InternetAccessPoint);
-    if (definedConfig.isValid()) {
-        // 4. Verify that opening a session with defined configuration emits error and enters notavailable-state
-        // TODO these timer waits should be changed to waiting appropriate signals, now these wait excessively
-        qDebug() << "Shutdown WLAN IAP (waiting 60 seconds): " << definedConfig.name();
-        QTest::qWait(60000);
-        // Shutting down WLAN should bring back to defined -state.
-        QVERIFY((definedConfig.state() & QNetworkConfiguration::Defined) == QNetworkConfiguration::Defined);
-        QNetworkSession definedSession(definedConfig);
-        QSignalSpy errorSpy(&definedSession, SIGNAL(error(QNetworkSession::SessionError)));
-        QNetworkSession::SessionError sessionError;
-        updateConfigurations();
-
-        definedSession.open();
-        updateConfigurations();
-
-        QVERIFY(definedConfig.isValid()); // Session remains valid
-        QVERIFY(definedSession.state() == QNetworkSession::NotAvailable); // State is not available because WLAN is not in coverage
-        QVERIFY(!errorSpy.isEmpty()); // Session tells with error about invalidated configuration
-        sessionError = qvariant_cast<QNetworkSession::SessionError> (errorSpy.first().at(0));
-        QCOMPARE(sessionError, QNetworkSession::InvalidConfigurationError);
-        qDebug() << "Turn the WLAN IAP back on (waiting 60 seconds): " << definedConfig.name();
-        QTest::qWait(60000);
-        updateConfigurations();
-        QCOMPARE(definedConfig.state(), QNetworkConfiguration::Discovered);
-    }
-#endif
-}
-
-void tst_QNetworkSession::sessionProperties_data()
-{
-    QTest::addColumn<QNetworkConfiguration>("configuration");
-
-    QTest::newRow("invalid configuration") << QNetworkConfiguration();
-
-    foreach (const QNetworkConfiguration &config, manager.allConfigurations()) {
-        const QString name = config.name().isEmpty() ? QString("<Hidden>") : config.name();
-        QTest::newRow(name.toLocal8Bit().constData()) << config;
-    }
-}
-
-void tst_QNetworkSession::sessionProperties()
-{
-    QFETCH(QNetworkConfiguration, configuration);
-    QNetworkSession session(configuration);
-    QCOMPARE(session.configuration(), configuration);
-    QStringList validBearerNames = QStringList() << QLatin1String("Unknown")
-                                                 << QLatin1String("Ethernet")
-                                                 << QLatin1String("WLAN")
-                                                 << QLatin1String("2G")
-                                                 << QLatin1String("CDMA2000")
-                                                 << QLatin1String("WCDMA")
-                                                 << QLatin1String("HSPA")
-                                                 << QLatin1String("Bluetooth")
-                                                 << QLatin1String("WiMAX")
-                                                 << QLatin1String("BearerEVDO")
-                                                 << QLatin1String("BearerLTE")
-                                                 << QLatin1String("Bearer3G")
-                                                 << QLatin1String("Bearer4G");
-
-    if (!configuration.isValid()) {
-        QVERIFY(configuration.bearerTypeName().isEmpty());
-    } else {
-        switch (configuration.type())
-        {
-            case QNetworkConfiguration::ServiceNetwork:
-            case QNetworkConfiguration::UserChoice:
-            default:
-                QVERIFY(configuration.bearerTypeName().isEmpty());
-                break;
-            case QNetworkConfiguration::InternetAccessPoint:
-                QVERIFY(validBearerNames.contains(configuration.bearerTypeName()));
-                break;
-        }
-    }
-
-    // QNetworkSession::interface() should return an invalid interface unless
-    // session is in the connected state.
-#ifndef QT_NO_NETWORKINTERFACE
-    QCOMPARE(session.state() == QNetworkSession::Connected, session.interface().isValid());
-#endif
-
-    if (!configuration.isValid()) {
-        QVERIFY(configuration.state() == QNetworkConfiguration::Undefined &&
-                session.state() == QNetworkSession::Invalid);
-    } else {
-        switch (configuration.state()) {
-        case QNetworkConfiguration::Undefined:
-            QCOMPARE(session.state(), QNetworkSession::NotAvailable);
-            break;
-        case QNetworkConfiguration::Defined:
-            QCOMPARE(session.state(), QNetworkSession::NotAvailable);
-            break;
-        case QNetworkConfiguration::Discovered:
-            QVERIFY(session.state() == QNetworkSession::Connecting ||
-                    session.state() == QNetworkSession::Disconnected);
-            break;
-        case QNetworkConfiguration::Active:
-            QVERIFY(session.state() == QNetworkSession::Connected ||
-                    session.state() == QNetworkSession::Closing ||
-                    session.state() == QNetworkSession::Roaming);
-            break;
-        default:
-            QFAIL("Invalid configuration state");
-        };
-    }
-}
-
-void tst_QNetworkSession::repeatedOpenClose_data() {
-    QTest::addColumn<QString>("bearerType");
-    QTest::addColumn<QNetworkConfiguration::Type>("configurationType");
-    QTest::addColumn<int>("repeatTimes");
-
-    QTest::newRow("WLAN_IAP") << "WLAN" << QNetworkConfiguration::InternetAccessPoint << 3;
-    // QTest::newRow("Cellular_IAP") << "cellular" << QNetworkConfiguration::InternetAccessPoint << 3;
-    // QTest::newRow("SNAP") << "bearer_type_not_relevant_with_SNAPs" << QNetworkConfiguration::ServiceNetwork << 3;
-}
-
-// Tests repeated-open close.
-void tst_QNetworkSession::repeatedOpenClose()
-{
-    QFETCH(QString, bearerType);
-    QFETCH(QNetworkConfiguration::Type, configurationType);
-    QFETCH(int, repeatTimes);
-
-    // First check that opening once succeeds and determine if repeatable testing is doable
-    QNetworkConfiguration config = suitableConfiguration(bearerType, configurationType);
-    if (!config.isValid())
-        QSKIP("No suitable configurations, skipping this round of repeated open-close test.");
-    qDebug() << "Using following configuratio to repeatedly open and close: " << config.name();
-    QNetworkSession permanentSession(config);
-    if (!openSession(&permanentSession) || !closeSession(&permanentSession))
-        QSKIP("Unable to open/close session, skipping this round of repeated open-close test.");
-    for (int i = 0; i < repeatTimes; i++) {
-       qDebug() << "Opening, loop number " << i;
-       QVERIFY(openSession(&permanentSession));
-       qDebug() << "Closing, loop number, then waiting 5 seconds: " << i;
-       QVERIFY(closeSession(&permanentSession));
-       QTest::qWait(5000);
-    }
-}
-
-void tst_QNetworkSession::userChoiceSession_data()
-{
-    QTest::addColumn<QNetworkConfiguration>("configuration");
-
-    QNetworkConfiguration config = manager.defaultConfiguration();
-    if (config.type() == QNetworkConfiguration::UserChoice)
-        QTest::newRow("UserChoice") << config;
-    else
-        QSKIP("Default configuration is not a UserChoice configuration.");
-}
-
-void tst_QNetworkSession::userChoiceSession()
-{
-    QFETCH(QNetworkConfiguration, configuration);
-
-    QCOMPARE(configuration.type(), QNetworkConfiguration::UserChoice);
-
-    QNetworkSession session(configuration);
-
-    // Check that configuration was really set
-    QCOMPARE(session.configuration(), configuration);
-
-    QVERIFY(!session.isOpen());
-
-    // Check that session is not active
-    QVERIFY(session.sessionProperty("ActiveConfiguration").toString().isEmpty());
-
-    // The remaining tests require the session to be not NotAvailable.
-    if (session.state() == QNetworkSession::NotAvailable)
-        QSKIP("Network is not available.");
-
-    QSignalSpy sessionOpenedSpy(&session, SIGNAL(opened()));
-    QSignalSpy sessionClosedSpy(&session, SIGNAL(closed()));
-    QSignalSpy stateChangedSpy(&session, SIGNAL(stateChanged(QNetworkSession::State)));
-    QSignalSpy errorSpy(&session, SIGNAL(error(QNetworkSession::SessionError)));
-
-    // Test opening the session.
-    {
-        bool expectStateChange = session.state() != QNetworkSession::Connected;
-
-        session.open();
-        session.waitForOpened();
-
-        if (session.isOpen())
-            QVERIFY(!sessionOpenedSpy.isEmpty() || !errorSpy.isEmpty());
-        if (!errorSpy.isEmpty()) {
-            QNetworkSession::SessionError error =
-                qvariant_cast<QNetworkSession::SessionError>(errorSpy.first().at(0));
-            if (error == QNetworkSession::OperationNotSupportedError) {
-                // The session needed to bring up the interface,
-                // but the operation is not supported.
-                QSKIP("Configuration does not support open().");
-            } else if (error == QNetworkSession::InvalidConfigurationError) {
-                // The session needed to bring up the interface, but it is not possible for the
-                // specified configuration.
-                if ((session.configuration().state() & QNetworkConfiguration::Discovered) ==
-                    QNetworkConfiguration::Discovered) {
-                    QFAIL("Failed to open session for Discovered configuration.");
-                } else {
-                    QSKIP("Cannot test session for non-Discovered configuration.");
-                }
-            } else if (error == QNetworkSession::UnknownSessionError) {
-                QSKIP("Unknown session error.");
-            } else {
-                QFAIL("Error opening session.");
-            }
-        } else if (!sessionOpenedSpy.isEmpty()) {
-            QCOMPARE(sessionOpenedSpy.count(), 1);
-            QVERIFY(sessionClosedSpy.isEmpty());
-            QVERIFY(errorSpy.isEmpty());
-
-            if (expectStateChange)
-                QTRY_VERIFY_WITH_TIMEOUT(!stateChangedSpy.isEmpty(), TestTimeOut);
-
-            QCOMPARE(session.state(), QNetworkSession::Connected);
-#ifndef QT_NO_NETWORKINTERFACE
-            QVERIFY(session.interface().isValid());
-#endif
-            const QString userChoiceIdentifier =
-                session.sessionProperty("UserChoiceConfiguration").toString();
-
-            QVERIFY(!userChoiceIdentifier.isEmpty());
-            QVERIFY(userChoiceIdentifier != configuration.identifier());
-
-            QNetworkConfiguration userChoiceConfiguration =
-                manager.configurationFromIdentifier(userChoiceIdentifier);
-
-            QVERIFY(userChoiceConfiguration.isValid());
-            QVERIFY(userChoiceConfiguration.type() != QNetworkConfiguration::UserChoice);
-
-            const QString testIdentifier("abc");
-            //resetting UserChoiceConfiguration is ignored (read only property)
-            session.setSessionProperty("UserChoiceConfiguration", testIdentifier);
-            QVERIFY(session.sessionProperty("UserChoiceConfiguration").toString() != testIdentifier);
-
-            const QString activeIdentifier =
-                session.sessionProperty("ActiveConfiguration").toString();
-
-            QVERIFY(!activeIdentifier.isEmpty());
-            QVERIFY(activeIdentifier != configuration.identifier());
-
-            QNetworkConfiguration activeConfiguration =
-                manager.configurationFromIdentifier(activeIdentifier);
-
-            QVERIFY(activeConfiguration.isValid());
-            QCOMPARE(activeConfiguration.type(), QNetworkConfiguration::InternetAccessPoint);
-
-            //resetting ActiveConfiguration is ignored (read only property)
-            session.setSessionProperty("ActiveConfiguration", testIdentifier);
-            QVERIFY(session.sessionProperty("ActiveConfiguration").toString() != testIdentifier);
-
-            if (userChoiceConfiguration.type() == QNetworkConfiguration::InternetAccessPoint) {
-                QCOMPARE(userChoiceConfiguration, activeConfiguration);
-            } else {
-                QCOMPARE(userChoiceConfiguration.type(), QNetworkConfiguration::ServiceNetwork);
-                QVERIFY(userChoiceConfiguration.children().contains(activeConfiguration));
-            }
-        } else {
-            QFAIL("Timeout waiting for session to open.");
-        }
-    }
-}
-
-void tst_QNetworkSession::sessionOpenCloseStop_data()
-{
-    QTest::addColumn<QNetworkConfiguration>("configuration");
-    QTest::addColumn<bool>("forceSessionStop");
-
-    foreach (const QNetworkConfiguration &config, manager.allConfigurations()) {
-        const QString name = config.name().isEmpty() ? QString("<Hidden>") : config.name();
-        QTest::newRow((name + QLatin1String(" close")).toLocal8Bit().constData())
-            << config << false;
-        QTest::newRow((name + QLatin1String(" stop")).toLocal8Bit().constData())
-            << config << true;
-    }
-
-    inProcessSessionManagementCount = 0;
-}
-
-void tst_QNetworkSession::sessionOpenCloseStop()
-{
-    QFETCH(QNetworkConfiguration, configuration);
-    QFETCH(bool, forceSessionStop);
-#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
-    QSKIP("Deadlocks on Linux due to QTBUG-45655");
-#endif
-
-    QNetworkSession session(configuration);
-
-    // Test initial state of the session.
-    {
-        QCOMPARE(session.configuration(), configuration);
-        QVERIFY(!session.isOpen());
-        // session may be invalid if configuration is removed between when
-        // sessionOpenCloseStop_data() is called and here.
-        QVERIFY((configuration.isValid() && (session.state() != QNetworkSession::Invalid)) ||
-                (!configuration.isValid() && (session.state() == QNetworkSession::Invalid)));
-        QCOMPARE(session.error(), QNetworkSession::UnknownSessionError);
-    }
-
-    // The remaining tests require the session to be not NotAvailable.
-    if (session.state() == QNetworkSession::NotAvailable)
-        QSKIP("Network is not available.");
-
-    QSignalSpy sessionOpenedSpy(&session, SIGNAL(opened()));
-    QSignalSpy sessionClosedSpy(&session, SIGNAL(closed()));
-    QSignalSpy stateChangedSpy(&session, SIGNAL(stateChanged(QNetworkSession::State)));
-    QSignalSpy errorSpy(&session, SIGNAL(error(QNetworkSession::SessionError)));
-
-    // Test opening the session.
-    {
-        QNetworkSession::State previousState = session.state();
-        bool expectStateChange = previousState != QNetworkSession::Connected;
-
-        session.open();
-        session.waitForOpened();
-
-        // Wait until the configuration is uptodate as well, it may be signaled 'connected'
-        // bit later than the session
-        QTRY_VERIFY_WITH_TIMEOUT(configuration.state() == QNetworkConfiguration::Active, TestTimeOut);
-
-        if (session.isOpen())
-            QVERIFY(!sessionOpenedSpy.isEmpty() || !errorSpy.isEmpty());
-        if (!errorSpy.isEmpty()) {
-            QNetworkSession::SessionError error =
-                qvariant_cast<QNetworkSession::SessionError>(errorSpy.first().at(0));
-
-            QCOMPARE(session.state(), previousState);
-
-            if (error == QNetworkSession::OperationNotSupportedError) {
-                // The session needed to bring up the interface,
-                // but the operation is not supported.
-                QSKIP("Configuration does not support open().");
-            } else if (error == QNetworkSession::InvalidConfigurationError) {
-                // The session needed to bring up the interface, but it is not possible for the
-                // specified configuration.
-                if ((session.configuration().state() & QNetworkConfiguration::Discovered) ==
-                    QNetworkConfiguration::Discovered) {
-                    QFAIL("Failed to open session for Discovered configuration.");
-                } else {
-                    QSKIP("Cannot test session for non-Discovered configuration.");
-                }
-            } else if (error == QNetworkSession::UnknownSessionError) {
-                QSKIP("Unknown Session error.");
-            } else {
-                QFAIL("Error opening session.");
-            }
-        } else if (!sessionOpenedSpy.isEmpty()) {
-            QCOMPARE(sessionOpenedSpy.count(), 1);
-            QVERIFY(sessionClosedSpy.isEmpty());
-            QVERIFY(errorSpy.isEmpty());
-
-            if (expectStateChange) {
-                QTRY_VERIFY_WITH_TIMEOUT(stateChangedSpy.count() >= 2, TestTimeOut);
-
-                QNetworkSession::State state =
-                    qvariant_cast<QNetworkSession::State>(stateChangedSpy.at(0).at(0));
-                QCOMPARE(state, QNetworkSession::Connecting);
-
-                state = qvariant_cast<QNetworkSession::State>(stateChangedSpy.at(1).at(0));
-                QCOMPARE(state, QNetworkSession::Connected);
-            }
-
-            QCOMPARE(session.state(), QNetworkSession::Connected);
-#ifndef QT_NO_NETWORKINTERFACE
-            QVERIFY(session.interface().isValid());
-#endif
-        } else {
-            QFAIL("Timeout waiting for session to open.");
-        }
-    }
-
-    sessionOpenedSpy.clear();
-    sessionClosedSpy.clear();
-    stateChangedSpy.clear();
-    errorSpy.clear();
-
-    QNetworkSession session2(configuration);
-
-    QSignalSpy sessionOpenedSpy2(&session2, SIGNAL(opened()));
-    QSignalSpy sessionClosedSpy2(&session2, SIGNAL(closed()));
-    QSignalSpy stateChangedSpy2(&session2, SIGNAL(stateChanged(QNetworkSession::State)));
-    QSignalSpy errorSpy2(&session2, SIGNAL(error(QNetworkSession::SessionError)));
-
-    // Test opening a second session.
-    {
-        QCOMPARE(session2.configuration(), configuration);
-        QVERIFY(!session2.isOpen());
-        QCOMPARE(session2.state(), QNetworkSession::Connected);
-        QCOMPARE(session.error(), QNetworkSession::UnknownSessionError);
-
-        session2.open();
-
-        QTRY_VERIFY_WITH_TIMEOUT(!sessionOpenedSpy2.isEmpty() || !errorSpy2.isEmpty(), TestTimeOut);
-
-        if (errorSpy2.isEmpty()) {
-            QVERIFY(session2.isOpen());
-            QCOMPARE(session2.state(), QNetworkSession::Connected);
-        }
-        QVERIFY(session.isOpen());
-        QCOMPARE(session.state(), QNetworkSession::Connected);
-#ifndef QT_NO_NETWORKINTERFACE
-        QVERIFY(session.interface().isValid());
-        if (errorSpy2.isEmpty()) {
-            QCOMPARE(session.interface().hardwareAddress(), session2.interface().hardwareAddress());
-            QCOMPARE(session.interface().index(), session2.interface().index());
-        }
-#endif
-    }
-
-    sessionOpenedSpy2.clear();
-
-    if (forceSessionStop && session2.isOpen()) {
-        // Test forcing the second session to stop the interface.
-        QNetworkSession::State previousState = session.state();
-        bool expectStateChange = previousState != QNetworkSession::Disconnected;
-        session2.stop();
-
-        // QNetworkSession::stop() must result either closed() signal
-        // or error() signal
-        QTRY_VERIFY_WITH_TIMEOUT(!sessionClosedSpy2.isEmpty() || !errorSpy2.isEmpty(), TestTimeOut);
-        QVERIFY(!session2.isOpen());
-
-        if (!errorSpy2.isEmpty()) {
-            // QNetworkSession::stop() resulted error() signal for session2
-            // => also session should emit error() signal
-            QTRY_VERIFY_WITH_TIMEOUT(!errorSpy.isEmpty(), TestTimeOut);
-
-            // check for SessionAbortedError
-            QNetworkSession::SessionError error =
-                qvariant_cast<QNetworkSession::SessionError>(errorSpy.first().at(0));
-            QNetworkSession::SessionError error2 =
-                qvariant_cast<QNetworkSession::SessionError>(errorSpy2.first().at(0));
-
-            QCOMPARE(error, QNetworkSession::SessionAbortedError);
-            QCOMPARE(error2, QNetworkSession::SessionAbortedError);
-
-            QCOMPARE(errorSpy.count(), 1);
-            QCOMPARE(errorSpy2.count(), 1);
-
-            errorSpy.clear();
-            errorSpy2.clear();
-        }
-
-        QVERIFY(errorSpy.isEmpty());
-        QVERIFY(errorSpy2.isEmpty());
-
-        // Wait for Disconnected state
-        QTRY_NOOP(session2.state() == QNetworkSession::Disconnected);
-
-        if (expectStateChange)
-            QTRY_VERIFY_WITH_TIMEOUT(stateChangedSpy2.count() >= 1 || !errorSpy2.isEmpty(), TestTimeOut);
-
-        if (!errorSpy2.isEmpty()) {
-            QCOMPARE(session2.state(), previousState);
-            QCOMPARE(session.state(), previousState);
-
-            QNetworkSession::SessionError error =
-                qvariant_cast<QNetworkSession::SessionError>(errorSpy2.first().at(0));
-            if (error == QNetworkSession::OperationNotSupportedError) {
-                // The session needed to bring down the interface,
-                // but the operation is not supported.
-                QSKIP("Configuration does not support stop().");
-            } else if (error == QNetworkSession::InvalidConfigurationError) {
-                // The session needed to bring down the interface, but it is not possible for the
-                // specified configuration.
-                if ((session.configuration().state() & QNetworkConfiguration::Discovered) ==
-                    QNetworkConfiguration::Discovered) {
-                    QFAIL("Failed to stop session for Discovered configuration.");
-                } else {
-                    QSKIP("Cannot test session for non-Discovered configuration.");
-                }
-            } else {
-                QFAIL("Error stopping session.");
-            }
-        } else if (!sessionClosedSpy2.isEmpty()) {
-            if (expectStateChange) {
-                if (configuration.type() == QNetworkConfiguration::ServiceNetwork) {
-                    bool roamedSuccessfully = false;
-
-                    QNetworkSession::State state;
-                    if (stateChangedSpy2.count() == 4) {
-                        state = qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(0).at(0));
-                        QCOMPARE(state, QNetworkSession::Connecting);
-
-                        state = qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(1).at(0));
-                        QCOMPARE(state, QNetworkSession::Connected);
-
-                        state = qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(2).at(0));
-                        QCOMPARE(state, QNetworkSession::Closing);
-
-                        state = qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(3).at(0));
-                        QCOMPARE(state, QNetworkSession::Disconnected);
-                    } else if (stateChangedSpy2.count() == 2) {
-                        state = qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(0).at(0));
-                        QCOMPARE(state, QNetworkSession::Closing);
-
-                        state = qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(1).at(0));
-                        QCOMPARE(state, QNetworkSession::Disconnected);
-                    } else {
-                        QFAIL("Unexpected amount of state changes when roaming.");
-                    }
-
-                    QTRY_VERIFY_WITH_TIMEOUT(session.state() == QNetworkSession::Roaming ||
-                                session.state() == QNetworkSession::Connected ||
-                                session.state() == QNetworkSession::Disconnected, TestTimeOut);
-
-                    QTRY_VERIFY_WITH_TIMEOUT(stateChangedSpy.count() > 0, TestTimeOut);
-                    state = qvariant_cast<QNetworkSession::State>(stateChangedSpy.at(stateChangedSpy.count() - 1).at(0));
-
-                    for (int i = 0; i < stateChangedSpy.count(); i++) {
-                        QNetworkSession::State state_temp =
-                                qvariant_cast<QNetworkSession::State>(stateChangedSpy.at(i).at(0));
-                        // Extra debug because a fragile point in testcase because statuses vary.
-                        qDebug() << "------- Statechange spy at: " << i << " is " << state_temp;
-                    }
-
-                    if (state == QNetworkSession::Roaming) {
-                        QTRY_VERIFY_WITH_TIMEOUT(session.state() == QNetworkSession::Connected, TestTimeOut);
-                        QTRY_VERIFY_WITH_TIMEOUT(session2.state() == QNetworkSession::Connected, TestTimeOut);
-                        roamedSuccessfully = true;
-                    } else if (state == QNetworkSession::Closing) {
-                        QTRY_VERIFY_WITH_TIMEOUT(session2.state() == QNetworkSession::Disconnected, TestTimeOut);
-                        QTRY_VERIFY_WITH_TIMEOUT(session.state() == QNetworkSession::Connected ||
-                                    session.state() == QNetworkSession::Disconnected, TestTimeOut );
-                        roamedSuccessfully = false;
-                    } else if (state == QNetworkSession::Disconnected) {
-                        QTRY_VERIFY_WITH_TIMEOUT(!errorSpy.isEmpty(), TestTimeOut);
-                        QTRY_VERIFY_WITH_TIMEOUT(session2.state() == QNetworkSession::Disconnected, TestTimeOut);
-                    } else if (state == QNetworkSession::Connected) {
-                        QTRY_VERIFY_WITH_TIMEOUT(errorSpy.isEmpty(),TestTimeOut);
-
-                        if (stateChangedSpy.count() > 1) {
-                            state = qvariant_cast<QNetworkSession::State>(stateChangedSpy.at(stateChangedSpy.count() - 2).at(0));
-                            QCOMPARE(state, QNetworkSession::Roaming);
-                        }
-                        roamedSuccessfully = true;
-                    }
-
-                    if (roamedSuccessfully) {
-                        // Verify that you can open session based on the disconnected configuration
-                        QString configId = session.sessionProperty("ActiveConfiguration").toString();
-                        QNetworkConfiguration config = manager.configurationFromIdentifier(configId);
-                        QNetworkSession session3(config);
-                        QSignalSpy errorSpy3(&session3, SIGNAL(error(QNetworkSession::SessionError)));
-                        QSignalSpy sessionOpenedSpy3(&session3, SIGNAL(opened()));
-                        session3.open();
-                        session3.waitForOpened();
-                        QTest::qWait(1000); // Wait awhile to get all signals from platform
-                        if (session.isOpen())
-                            QVERIFY(!sessionOpenedSpy3.isEmpty() || !errorSpy3.isEmpty());
-                        session.stop();
-                        QTRY_VERIFY_WITH_TIMEOUT(session.state() == QNetworkSession::Disconnected, TestTimeOut);
-                    }
-                    if (!roamedSuccessfully)
-                        QVERIFY(!errorSpy.isEmpty());
-                } else {
-                    QTest::qWait(2000); // Wait awhile to get all signals from platform
-
-                    if (stateChangedSpy2.count() == 2)  {
-                        QNetworkSession::State state =
-                            qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(0).at(0));
-                        QCOMPARE(state, QNetworkSession::Closing);
-                        state = qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(1).at(0));
-                        QCOMPARE(state, QNetworkSession::Disconnected);
-                    } else {
-                        QVERIFY(stateChangedSpy2.count() >= 1);
-
-                        for (int i = 0; i < stateChangedSpy2.count(); i++) {
-                            QNetworkSession::State state_temp =
-                                    qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(i).at(0));
-                            // Extra debug because a fragile point in testcase.
-                            qDebug() << "+++++ Statechange spy at: " << i << " is " << state_temp;
-                        }
-
-                        QNetworkSession::State state =
-                                qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(stateChangedSpy2.count() - 1).at(0));
-                        QCOMPARE(state, QNetworkSession::Disconnected);
-                    }
-                }
-
-                QTRY_VERIFY_WITH_TIMEOUT(!sessionClosedSpy.isEmpty(), TestTimeOut);
-                QTRY_VERIFY_WITH_TIMEOUT(session.state() == QNetworkSession::Disconnected, TestTimeOut);
-            }
-
-            QVERIFY(errorSpy2.isEmpty());
-
-            ++inProcessSessionManagementCount;
-        } else {
-            QFAIL("Timeout waiting for session to stop.");
-        }
-
-        QVERIFY(!sessionClosedSpy.isEmpty());
-        QVERIFY(!sessionClosedSpy2.isEmpty());
-
-        QVERIFY(!session.isOpen());
-        QVERIFY(!session2.isOpen());
-    } else if (session2.isOpen()) {
-        // Test closing the second session.
-        {
-            int stateChangedCountBeforeClose = stateChangedSpy2.count();
-            session2.close();
-
-            QTRY_VERIFY_WITH_TIMEOUT(!sessionClosedSpy2.isEmpty(), TestTimeOut);
-            QCOMPARE(stateChangedSpy2.count(), stateChangedCountBeforeClose);
-
-            QVERIFY(sessionClosedSpy.isEmpty());
-
-            QVERIFY(session.isOpen());
-            QVERIFY(!session2.isOpen());
-            QCOMPARE(session.state(), QNetworkSession::Connected);
-            QCOMPARE(session2.state(), QNetworkSession::Connected);
-#ifndef QT_NO_NETWORKINTERFACE
-            QVERIFY(session.interface().isValid());
-            QCOMPARE(session.interface().hardwareAddress(), session2.interface().hardwareAddress());
-            QCOMPARE(session.interface().index(), session2.interface().index());
-#endif
-        }
-
-        sessionClosedSpy2.clear();
-
-        // Test closing the first session.
-        {
-            bool expectStateChange = session.state() != QNetworkSession::Disconnected &&
-                                     manager.capabilities() & QNetworkConfigurationManager::SystemSessionSupport;
-
-            session.close();
-
-            QTRY_VERIFY_WITH_TIMEOUT(!sessionClosedSpy.isEmpty() || !errorSpy.isEmpty(), TestTimeOut);
-
-            QVERIFY(!session.isOpen());
-
-            if (expectStateChange)
-                QTRY_VERIFY_WITH_TIMEOUT(!stateChangedSpy.isEmpty() || !errorSpy.isEmpty(), TestTimeOut);
-
-            if (!errorSpy.isEmpty()) {
-                QNetworkSession::SessionError error =
-                    qvariant_cast<QNetworkSession::SessionError>(errorSpy.first().at(0));
-                if (error == QNetworkSession::OperationNotSupportedError) {
-                    // The session needed to bring down the interface,
-                    // but the operation is not supported.
-                    QSKIP("Configuration does not support close().");
-                } else if (error == QNetworkSession::InvalidConfigurationError) {
-                    // The session needed to bring down the interface, but it is not possible for the
-                    // specified configuration.
-                    if ((session.configuration().state() & QNetworkConfiguration::Discovered) ==
-                        QNetworkConfiguration::Discovered) {
-                        QFAIL("Failed to close session for Discovered configuration.");
-                    } else {
-                        QSKIP("Cannot test session for non-Discovered configuration.");
-                    }
-                } else {
-                    QFAIL("Error closing session.");
-                }
-            } else if (!sessionClosedSpy.isEmpty()) {
-                QVERIFY(sessionOpenedSpy.isEmpty());
-                QCOMPARE(sessionClosedSpy.count(), 1);
-                if (expectStateChange)
-                    QVERIFY(!stateChangedSpy.isEmpty());
-                QVERIFY(errorSpy.isEmpty());
-
-                if (expectStateChange)
-                    QTRY_VERIFY_WITH_TIMEOUT(session.state() == QNetworkSession::Disconnected, TestTimeOut);
-
-                ++inProcessSessionManagementCount;
-            } else {
-                QFAIL("Timeout waiting for session to close.");
-            }
-        }
-    }
-}
-
-QDebug operator<<(QDebug debug, const QList<QNetworkConfiguration> &list)
-{
-    debug.nospace() << "( ";
-    foreach (const QNetworkConfiguration &config, list)
-        debug.nospace() << config.identifier() << ", ";
-    debug.nospace() << ")\n";
-    return debug;
-}
-
-// Note: outOfProcessSession requires that at least one configuration is
-// at Discovered -state.
-void tst_QNetworkSession::outOfProcessSession()
-{
-#if !QT_CONFIG(process)
-    QSKIP("No qprocess support", SkipAll);
-#else
-    updateConfigurations();
-    QTest::qWait(2000);
-
-    QNetworkConfigurationManager manager;
-    // Create a QNetworkConfigurationManager to detect configuration changes made in Lackey. This
-    // is actually the essence of this testcase - to check that platform mediates/reflects changes
-    // regardless of process boundaries. The interprocess communication is more like a way to get
-    // this test-case act correctly and timely.
-    QList<QNetworkConfiguration> before = manager.allConfigurations(QNetworkConfiguration::Active);
-    QSignalSpy spy(&manager, SIGNAL(configurationChanged(QNetworkConfiguration)));
-
-    // Cannot read/write to processes on WinCE.
-    // Easiest alternative is to use sockets for IPC.
-    QLocalServer oopServer;
-    // First remove possible earlier listening address which would cause listen to fail
-    // (e.g. previously abruptly ended unit test might cause this)
-    QLocalServer::removeServer("tst_qnetworksession");
-    oopServer.listen("tst_qnetworksession");
-
-    QProcess lackey;
-    QString lackeyExe = lackeyDir + "/lackey";
-    lackey.start(lackeyExe);
-    QVERIFY2(lackey.waitForStarted(), qPrintable(
-        QString::fromLatin1("Could not start %1: %2").arg(lackeyExe, lackey.errorString())));
-
-    QVERIFY(oopServer.waitForNewConnection(-1));
-    QLocalSocket *oopSocket = oopServer.nextPendingConnection();
-
-    do {
-        QByteArray output;
-
-        if (oopSocket->waitForReadyRead())
-            output = oopSocket->readLine().trimmed();
-
-        if (output.startsWith("Started session ")) {
-            QString identifier = QString::fromLocal8Bit(output.mid(20).constData());
-            QNetworkConfiguration changed;
-
-            do {
-                QTRY_VERIFY_WITH_TIMEOUT(!spy.isEmpty(), TestTimeOut);
-                changed = qvariant_cast<QNetworkConfiguration>(spy.takeFirst().at(0));
-            } while (changed.identifier() != identifier);
-
-            QVERIFY((changed.state() & QNetworkConfiguration::Active) ==
-                    QNetworkConfiguration::Active);
-
-            QVERIFY(!before.contains(changed));
-
-            QList<QNetworkConfiguration> after =
-                manager.allConfigurations(QNetworkConfiguration::Active);
-
-            QVERIFY(after.contains(changed));
-
-            spy.clear();
-
-            oopSocket->write("stop\n");
-            oopSocket->waitForBytesWritten();
-
-            do {
-                QTRY_VERIFY_WITH_TIMEOUT(!spy.isEmpty(), TestTimeOut);
-
-                changed = qvariant_cast<QNetworkConfiguration>(spy.takeFirst().at(0));
-            } while (changed.identifier() != identifier);
-
-            QVERIFY((changed.state() & QNetworkConfiguration::Active) !=
-                    QNetworkConfiguration::Active);
-
-            QList<QNetworkConfiguration> afterStop =
-                    manager.allConfigurations(QNetworkConfiguration::Active);
-
-            QVERIFY(!afterStop.contains(changed));
-
-            oopSocket->disconnectFromServer();
-            oopSocket->waitForDisconnected(-1);
-
-            lackey.waitForFinished();
-        }
-    // This is effected by QTBUG-4903, process will always report as running
-    //} while (lackey.state() == QProcess::Running);
-
-    // Workaround: the socket in the lackey will disconnect on exit
-    } while (oopSocket->state() == QLocalSocket::ConnectedState);
-
-    switch (lackey.exitCode()) {
-    case 0:
-        qDebug("Lackey returned exit success (0)");
-        break;
-    case 1:
-        QSKIP("No discovered configurations found.");
-    case 2:
-        QSKIP("Lackey could not start session.");
-    default:
-        QSKIP("Lackey failed");
-    }
-#endif
-}
-
-// A convenience / helper function for testcases. Return the first matching configuration.
-// Ignores configurations in other than 'discovered' -state. Returns invalid (QNetworkConfiguration())
-// if none found.
-QNetworkConfiguration suitableConfiguration(QString bearerType, QNetworkConfiguration::Type configType) {
-
-    // Refresh configurations and derive configurations matching given parameters.
-    QNetworkConfigurationManager mgr;
-    QSignalSpy updateSpy(&mgr, SIGNAL(updateCompleted()));
-
-    mgr.updateConfigurations();
-    QTRY_NOOP(updateSpy.count() >= 1);
-    if (updateSpy.count() != 1) {
-        qDebug("tst_QNetworkSession::suitableConfiguration() failure: unable to update configurations");
-        return QNetworkConfiguration();
-    }
-    QList<QNetworkConfiguration> discoveredConfigs = mgr.allConfigurations(QNetworkConfiguration::Discovered);
-    foreach(QNetworkConfiguration config, discoveredConfigs) {
-        if ((config.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) {
-            discoveredConfigs.removeOne(config);
-        } else if (config.type() != configType) {
-            // qDebug() << "Dumping config because type (IAP/SNAP) mismatches: " << config.name();
-            discoveredConfigs.removeOne(config);
-        } else if ((config.type() == QNetworkConfiguration::InternetAccessPoint) &&
-                    bearerType == "cellular") { // 'cellular' bearertype is for convenience
-            if (config.bearerTypeName() != "2G" &&
-                config.bearerTypeName() != "CDMA2000" &&
-                config.bearerTypeName() != "WCDMA" &&
-                config.bearerTypeName() != "HSPA" &&
-                config.bearerTypeName() != "EVDO" &&
-                config.bearerTypeName() != "LTE" &&
-                config.bearerTypeName() != "3G" &&
-                config.bearerTypeName() != "4G") {
-                // qDebug() << "Dumping config because bearer mismatches (cellular): " << config.name();
-                discoveredConfigs.removeOne(config);
-            }
-        } else if ((config.type() == QNetworkConfiguration::InternetAccessPoint) &&
-                    bearerType != config.bearerTypeName()) {
-            // qDebug() << "Dumping config because bearer mismatches (WLAN): " << config.name();
-            discoveredConfigs.removeOne(config);
-        }
-    }
-    if (discoveredConfigs.isEmpty()) {
-        qDebug("tst_QNetworkSession::suitableConfiguration() failure: no suitable configurations present.");
-        return QNetworkConfiguration();
-    } else {
-        return discoveredConfigs.first();
-    }
-}
-
-// A convenience-function: updates configurations and waits that they are updated.
-void updateConfigurations()
-{
-    QNetworkConfigurationManager mgr;
-    QSignalSpy updateSpy(&mgr, SIGNAL(updateCompleted()));
-    mgr.updateConfigurations();
-    QTRY_NOOP(updateSpy.count() >= 1);
-}
-
-// A convenience-function: updates and prints all available confiurations and their states
-void printConfigurations()
-{
-    QNetworkConfigurationManager manager;
-    QList<QNetworkConfiguration> allConfigs =
-    manager.allConfigurations();
-    qDebug("tst_QNetworkSession::printConfigurations QNetworkConfigurationManager gives following configurations: ");
-    foreach(QNetworkConfiguration config, allConfigs) {
-        qDebug() << "Name of the configuration: " << config.name();
-        qDebug() << "State of the configuration: " << config.state();
-    }
-}
-
-// A convenience function for test-cases: opens the given configuration and return
-// true if it was done gracefully.
-bool openSession(QNetworkSession *session) {
-    bool result = true;
-    QNetworkConfigurationManager mgr;
-    QSignalSpy openedSpy(session, SIGNAL(opened()));
-    QSignalSpy stateChangeSpy(session, SIGNAL(stateChanged(QNetworkSession::State)));
-    QSignalSpy errorSpy(session, SIGNAL(error(QNetworkSession::SessionError)));
-    QSignalSpy configChangeSpy(&mgr, SIGNAL(configurationChanged(QNetworkConfiguration)));
-    // Store some initial statuses, because expected signals differ if the config is already
-    // active by some other session
-    QNetworkConfiguration::StateFlags configInitState = session->configuration().state();
-    QNetworkSession::State sessionInitState = session->state();
-    qDebug() << "tst_QNetworkSession::openSession() name of the configuration to be opened:  " << session->configuration().name();
-    qDebug() << "tst_QNetworkSession::openSession() state of the configuration to be opened:  " << session->configuration().state();
-    qDebug() << "tst_QNetworkSession::openSession() state of the session to be opened:  " << session->state();
-
-    if (session->isOpen() ||
-        !session->sessionProperty("ActiveConfiguration").toString().isEmpty()) {
-        qDebug("tst_QNetworkSession::openSession() failure: session was already open / active.");
-        result = false;
-    } else {
-        session->open();
-        session->waitForOpened(120000); // Bringing interfaces up and down may take time at platform
-    }
-    QTest::qWait(5000); // Wait a moment to ensure all signals are propagated
-    // Check that connection opening went by the book. Add checks here if more strictness needed.
-    if (!session->isOpen()) {
-        qDebug("tst_QNetworkSession::openSession() failure: QNetworkSession::open() failed.");
-        result =  false;
-    }
-    if (openedSpy.count() != 1) {
-        qDebug("tst_QNetworkSession::openSession() failure: QNetworkSession::opened() - signal not received.");
-        result =  false;
-    }
-    if (!errorSpy.isEmpty()) {
-        qDebug("tst_QNetworkSession::openSession() failure: QNetworkSession::error() - signal was detected.");
-        result = false;
-    }
-    if (sessionInitState != QNetworkSession::Connected &&
-        stateChangeSpy.isEmpty()) {
-        qDebug("tst_QNetworkSession::openSession() failure: QNetworkSession::stateChanged() - signals not detected.");
-        result =  false;
-    }
-    if (configInitState != QNetworkConfiguration::Active &&
-        configChangeSpy.isEmpty()) {
-        qDebug("tst_QNetworkSession::openSession() failure: QNetworkConfigurationManager::configurationChanged() - signals not detected.");
-        result =  false;
-    }
-    if (session->configuration().state() != QNetworkConfiguration::Active) {
-        qDebug("tst_QNetworkSession::openSession() failure: session's configuration is not in 'Active' -state.");
-        qDebug() << "tst_QNetworkSession::openSession() state is:  " << session->configuration().state();
-        result =  false;
-    }
-    if (result == false) {
-        qDebug() << "tst_QNetworkSession::openSession() opening session failed.";
-    } else {
-        qDebug() << "tst_QNetworkSession::openSession() opening session succeeded.";
-    }
-    qDebug() << "tst_QNetworkSession::openSession() name of the configuration is:  " << session->configuration().name();
-    qDebug() << "tst_QNetworkSession::openSession() configuration state is:  " << session->configuration().state();
-    qDebug() << "tst_QNetworkSession::openSession() session state is:  " << session->state();
-
-    return result;
-}
-
-// Helper function for closing opened session. Performs checks that
-// session is closed gradefully (e.g. signals). Function does not delete
-// the session. The lastSessionOnConfiguration (true by default) is used to
-// tell if there are more sessions open, basing on same configuration. This
-// impacts the checks made.
-bool closeSession(QNetworkSession *session, bool lastSessionOnConfiguration) {
-    if (!session) {
-        qDebug("tst_QNetworkSession::closeSession() failure: NULL session given");
-        return false;
-    }
-
-    qDebug() << "tst_QNetworkSession::closeSession() name of the configuration to be closed:  " << session->configuration().name();
-    qDebug() << "tst_QNetworkSession::closeSession() state of the configuration to be closed:  " << session->configuration().state();
-    qDebug() << "tst_QNetworkSession::closeSession() state of the session to be closed:  " << session->state();
-
-    if (session->state() != QNetworkSession::Connected ||
-        !session->isOpen()) {
-        qDebug("tst_QNetworkSession::closeSession() failure: session is not opened.");
-        return false;
-    }
-    QNetworkConfigurationManager mgr;
-    QSignalSpy sessionClosedSpy(session, SIGNAL(closed()));
-    QSignalSpy sessionStateChangedSpy(session, SIGNAL(stateChanged(QNetworkSession::State)));
-    QSignalSpy sessionErrorSpy(session, SIGNAL(error(QNetworkSession::SessionError)));
-    QSignalSpy configChangeSpy(&mgr, SIGNAL(configurationChanged(QNetworkConfiguration)));
-
-    bool result = true;
-    session->close();
-    QTest::qWait(5000); // Wait a moment so that all signals are propagated
-
-    if (!sessionErrorSpy.isEmpty()) {
-        qDebug("tst_QNetworkSession::closeSession() failure: QNetworkSession::error() received.");
-        result = false;
-    }
-    if (sessionClosedSpy.count() != 1) {
-        qDebug("tst_QNetworkSession::closeSession() failure: QNetworkSession::closed() signal not received.");
-        result = false;
-    }
-    if (lastSessionOnConfiguration &&
-        sessionStateChangedSpy.isEmpty()) {
-        qDebug("tst_QNetworkSession::closeSession() failure: QNetworkSession::stateChanged() signals not received.");
-        result = false;
-    }
-    if (lastSessionOnConfiguration &&
-        session->state() != QNetworkSession::Disconnected) {
-        qDebug("tst_QNetworkSession::closeSession() failure: QNetworkSession is not in Disconnected -state");
-        result = false;
-    }
-    QTRY_NOOP(!configChangeSpy.isEmpty());
-    if (lastSessionOnConfiguration &&
-        configChangeSpy.isEmpty()) {
-        qDebug("tst_QNetworkSession::closeSession() failure: QNetworkConfigurationManager::configurationChanged() - signal not detected.");
-        result = false;
-    }
-    if (lastSessionOnConfiguration &&
-        session->configuration().state() == QNetworkConfiguration::Active) {
-         qDebug("tst_QNetworkSession::closeSession() failure: session's configuration is still in active state.");
-         result = false;
-    }
-    if (result == false) {
-        qDebug() << "tst_QNetworkSession::closeSession() closing session failed.";
-    } else {
-        qDebug() << "tst_QNetworkSession::closeSession() closing session succeeded.";
-    }
-    qDebug() << "tst_QNetworkSession::closeSession() name of the configuration is:  " << session->configuration().name();
-    qDebug() << "tst_QNetworkSession::closeSession() configuration state is:  " << session->configuration().state();
-    qDebug() << "tst_QNetworkSession::closeSession() session state is:  " << session->state();
-    return result;
-}
-
-void tst_QNetworkSession::sessionAutoClose_data()
-{
-    QTest::addColumn<QNetworkConfiguration>("configuration");
-
-    bool testData = false;
-    foreach (const QNetworkConfiguration &config,
-             manager.allConfigurations(QNetworkConfiguration::Discovered)) {
-        QNetworkSession session(config);
-        if (!session.sessionProperty(QLatin1String("AutoCloseSessionTimeout")).isValid())
-            continue;
-
-        testData = true;
-
-        const QString name = config.name().isEmpty() ? QString("<Hidden>") : config.name();
-        QTest::newRow(name.toLocal8Bit().constData()) << config;
-    }
-
-    if (!testData)
-        QSKIP("No applicable configurations to test");
-}
-
-void tst_QNetworkSession::sessionAutoClose()
-{
-    QFETCH(QNetworkConfiguration, configuration);
-
-    QNetworkSession session(configuration);
-
-    QCOMPARE(session.configuration(), configuration);
-
-    QVariant autoCloseSession = session.sessionProperty(QLatin1String("AutoCloseSessionTimeout"));
-
-    QVERIFY(autoCloseSession.isValid());
-
-    // property defaults to false
-    QCOMPARE(autoCloseSession.toInt(), -1);
-
-    QSignalSpy closeSpy(&session, SIGNAL(closed()));
-
-    session.open();
-    session.waitForOpened();
-
-    if (!session.isOpen())
-        QSKIP("Session not open");
-
-    // set session to auto close at next polling interval.
-    session.setSessionProperty(QLatin1String("AutoCloseSessionTimeout"), 0);
-
-    QTRY_VERIFY_WITH_TIMEOUT(!closeSpy.isEmpty(), TestTimeOut);
-
-    QCOMPARE(session.state(), QNetworkSession::Connected);
-
-    QVERIFY(!session.isOpen());
-
-    QCOMPARE(session.configuration(), configuration);
-
-    autoCloseSession = session.sessionProperty(QLatin1String("AutoCloseSessionTimeout"));
-
-    QVERIFY(autoCloseSession.isValid());
-
-    QCOMPARE(autoCloseSession.toInt(), -1);
-}
-
-void tst_QNetworkSession::usagePolicies()
-{
-    QNetworkSession session(manager.defaultConfiguration());
-    QNetworkSession::UsagePolicies initial;
-    initial = session.usagePolicies();
-    if (initial != 0)
-        QNetworkSessionPrivate::setUsagePolicies(session, { });
-    QSignalSpy spy(&session, SIGNAL(usagePoliciesChanged(QNetworkSession::UsagePolicies)));
-    QNetworkSessionPrivate::setUsagePolicies(session, QNetworkSession::NoBackgroundTrafficPolicy);
-    QCOMPARE(spy.count(), 1);
-    QNetworkSession::UsagePolicies policies = qvariant_cast<QNetworkSession::UsagePolicies>(spy.at(0).at(0));
-    QCOMPARE(policies, QNetworkSession::NoBackgroundTrafficPolicy);
-    QCOMPARE(session.usagePolicies(), QNetworkSession::NoBackgroundTrafficPolicy);
-    QNetworkSessionPrivate::setUsagePolicies(session, initial);
-    spy.clear();
-
-    session.open();
-    QVERIFY(session.waitForOpened());
-
-    //policies may be changed when session is opened, if so, signal should have been emitted
-    if (session.usagePolicies() != initial)
-        QCOMPARE(spy.count(), 1);
-    else
-        QCOMPARE(spy.count(), 0);
-}
-
-
-#endif
-
-QTEST_MAIN(tst_QNetworkSession)
-#include "tst_qnetworksession.moc"
diff --git a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
index a603b2d879..c4364aeb4e 100644
--- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
+++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
@@ -47,12 +47,6 @@
 #include <private/qthread_p.h>
 #include <QTcpServer>
 
-#ifndef QT_NO_BEARERMANAGEMENT
-#include <QtNetwork/qnetworkconfigmanager.h>
-#include <QtNetwork/qnetworkconfiguration.h>
-#include <QtNetwork/qnetworksession.h>
-#endif
-
 #include <time.h>
 #if defined(Q_OS_WIN)
 #include <windows.h>
@@ -121,11 +115,6 @@ private:
     bool lookupDone;
     int lookupsDoneCounter;
     QHostInfo lookupResults;
-#ifndef QT_NO_BEARERMANAGEMENT
-    QNetworkConfigurationManager *netConfMan;
-    QNetworkConfiguration networkConfiguration;
-    QScopedPointer<QNetworkSession> networkSession;
-#endif
 };
 
 void tst_QHostInfo::swapFunction()
@@ -180,17 +169,6 @@ void tst_QHostInfo::staticInformation()
 
 void tst_QHostInfo::initTestCase()
 {
-#ifndef QT_NO_BEARERMANAGEMENT
-    //start the default network
-    netConfMan = new QNetworkConfigurationManager(this);
-    networkConfiguration = netConfMan->defaultConfiguration();
-    networkSession.reset(new QNetworkSession(networkConfiguration));
-    if (!networkSession->isOpen()) {
-        networkSession->open();
-        networkSession->waitForOpened(30000);
-    }
-#endif
-
     ipv6Available = false;
     ipv6LookupsAvailable = false;
 
diff --git a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
index bc6e5435df..47dd80a1c2 100644
--- a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
+++ b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
@@ -33,10 +33,6 @@
 #include <qcoreapplication.h>
 #include <qnetworkinterface.h>
 #include <qudpsocket.h>
-#ifndef QT_NO_BEARERMANAGEMENT
-#include <QNetworkConfigurationManager>
-#include <QNetworkSession>
-#endif
 #include "../../../network-settings.h"
 #include "emulationdetector.h"
 
@@ -54,7 +50,6 @@ public:
 
 private slots:
     void initTestCase();
-    void cleanupTestCase();
     void dump();
     void consistencyCheck();
     void loopbackIPv4();
@@ -64,13 +59,6 @@ private slots:
     void interfaceFromXXX_data();
     void interfaceFromXXX();
     void copyInvalidInterface();
-
-private:
-#ifndef QT_NO_BEARERMANAGEMENT
-    QNetworkConfigurationManager *netConfMan;
-    QNetworkConfiguration networkConfiguration;
-    QScopedPointer<QNetworkSession> networkSession;
-#endif
 };
 
 tst_QNetworkInterface::tst_QNetworkInterface()
@@ -92,27 +80,6 @@ void tst_QNetworkInterface::initTestCase()
 {
     if (!QtNetworkSettings::verifyTestNetworkSettings())
         QSKIP("No network test server available");
-#ifndef QT_NO_BEARERMANAGEMENT
-    netConfMan = new QNetworkConfigurationManager(this);
-    if (netConfMan->capabilities()
-            & QNetworkConfigurationManager::NetworkSessionRequired) {
-        networkConfiguration = netConfMan->defaultConfiguration();
-        networkSession.reset(new QNetworkSession(networkConfiguration));
-        if (!networkSession->isOpen()) {
-            networkSession->open();
-            QVERIFY(networkSession->waitForOpened(30000));
-        }
-    }
-#endif
-}
-
-void tst_QNetworkInterface::cleanupTestCase()
-{
-#ifndef QT_NO_BEARERMANAGEMENT
-    if (networkSession && networkSession->isOpen()) {
-        networkSession->close();
-    }
-#endif
 }
 
 void tst_QNetworkInterface::dump()
diff --git a/tests/auto/network/network.pro b/tests/auto/network/network.pro
index 9a3ababe61..2572bb235f 100644
--- a/tests/auto/network/network.pro
+++ b/tests/auto/network/network.pro
@@ -2,10 +2,8 @@ TEMPLATE=subdirs
 SUBDIRS=\
    selftest \
    access \
-   bearer \
    kernel \
    ssl \
    socket \
 
 win32:    socket.CONFIG += no_check_target      # QTBUG-24451 - all socket tests require waitForX
-win32|mac:bearer.CONFIG += no_check_target      # QTBUG-24503 - these tests fail if machine has a WLAN adaptor
diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
index 849d8b0ed1..094e28149c 100644
--- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
@@ -55,12 +55,10 @@
 #include <qstringlist.h>
 #include <qplatformdefs.h>
 #include <qhostinfo.h>
+#include <qnetworkinterface.h>
 
 #include <QNetworkProxy>
 
-#include <QNetworkSession>
-#include <QNetworkConfiguration>
-#include <QNetworkConfigurationManager>
 #include "../../../network-settings.h"
 
 #if defined(Q_OS_LINUX)
@@ -123,9 +121,6 @@ private:
     bool ipv6GetsockoptionMissing(int level, int optname);
 #endif
 
-#ifndef QT_NO_BEARERMANAGEMENT
-    QNetworkSession *networkSession;
-#endif
     QString crashingServerDir;
 };
 
@@ -169,12 +164,6 @@ void tst_QTcpServer::initTestCase()
     if (!QtNetworkSettings::verifyTestNetworkSettings())
         QSKIP("No network test server available");
 #endif
-#ifndef QT_NO_BEARERMANAGEMENT
-    QNetworkConfigurationManager man;
-    networkSession = new QNetworkSession(man.defaultConfiguration(), this);
-    networkSession->open();
-    QVERIFY(networkSession->waitForOpened());
-#endif
 }
 
 void tst_QTcpServer::init()
diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
index 6dd390ccbd..88d2c46f3d 100644
--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -52,6 +52,7 @@
 #include <QFile>
 #include <QHostAddress>
 #include <QHostInfo>
+#include <QNetworkInterface>
 #include <QMap>
 #include <QPointer>
 #if QT_CONFIG(process)
author	Mårten Nordheim <marten.nordheim@qt.io>	2020-03-04 16:33:51 +0100
committer	Lars Knoll <lars.knoll@qt.io>	2020-04-05 16:41:08 +0200
commit	d8b49e6b51007d6f0a9faec82a66b95dc7ccf541 (patch)
tree	a99632bb0a43abd29f824806fccf790b144c3d0e /tests/auto/network
parent	430232e44d5e6c7d7fd7ca3ebebb06d74e21ce2f (diff)