Remove bearermanagement usage inside QNAM and QNetworkProxy

Change-Id: I2c4fdf598b46daf1b69a65848ebe0fd78ef8be24
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>

1 files changed, 0 insertions, 79 deletions

diff --git a/tests/auto/network/access/qnetworkaccessmanager/tst_qnetworkaccessmanager.cpp b/tests/auto/network/access/qnetworkaccessmanager/tst_qnetworkaccessmanager.cpp
index b5ded86d58..78919e8af6 100644
--- a/tests/auto/network/access/qnetworkaccessmanager/tst_qnetworkaccessmanager.cpp
+++ b/tests/auto/network/access/qnetworkaccessmanager/tst_qnetworkaccessmanager.cpp
@@ -30,16 +30,9 @@
 
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtNetwork/QNetworkReply>
-#ifndef QT_NO_BEARERMANAGEMENT
-#include <QtNetwork/QNetworkConfigurationManager>
-#endif
 
 #include <QtCore/QDebug>
 
-#ifndef QT_NO_BEARERMANAGEMENT
-Q_DECLARE_METATYPE(QNetworkAccessManager::NetworkAccessibility)
-#endif
-
 class tst_QNetworkAccessManager : public QObject
 {
     Q_OBJECT
@@ -48,7 +41,6 @@ public:
     tst_QNetworkAccessManager();
 
 private slots:
-    void networkAccessible();
     void alwaysCacheRequest();
 };
 
@@ -56,77 +48,6 @@ tst_QNetworkAccessManager::tst_QNetworkAccessManager()
 {
 }
 
-void tst_QNetworkAccessManager::networkAccessible()
-{
-#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section
-    QNetworkAccessManager manager;
-
-    qRegisterMetaType<QNetworkAccessManager::NetworkAccessibility>("QNetworkAccessManager::NetworkAccessibility");
-
-    QSignalSpy spy(&manager,
-                   SIGNAL(networkAccessibleChanged(QNetworkAccessManager::NetworkAccessibility)));
-
-    // if there is no session, we cannot know in which state we are in
-    QNetworkAccessManager::NetworkAccessibility initialAccessibility =
-            manager.networkAccessible();
-
-    if (initialAccessibility == QNetworkAccessManager::UnknownAccessibility)
-          QSKIP("Unknown accessibility", SkipAll);
-
-    QCOMPARE(manager.networkAccessible(), initialAccessibility);
-
-    manager.setNetworkAccessible(QNetworkAccessManager::NotAccessible);
-
-    int expectedCount = (initialAccessibility == QNetworkAccessManager::Accessible) ? 1 : 0;
-    QCOMPARE(spy.count(), expectedCount);
-    if (expectedCount > 0)
-        QCOMPARE(spy.takeFirst().at(0).value<QNetworkAccessManager::NetworkAccessibility>(),
-                 QNetworkAccessManager::NotAccessible);
-    QCOMPARE(manager.networkAccessible(), QNetworkAccessManager::NotAccessible);
-
-    // When network is not accessible, all requests fail
-    QNetworkReply *reply = manager.get(QNetworkRequest(QUrl("http://www.example.org")));
-    QSignalSpy finishedSpy(reply, &QNetworkReply::finished);
-    QSignalSpy errorSpy(reply, &QNetworkReply::errorOccurred);
-    QVERIFY(finishedSpy.wait());
-    QCOMPARE(reply->isFinished(), true);
-    QCOMPARE(reply->errorString(), QStringLiteral("Network access is disabled."));
-    QCOMPARE(errorSpy.count(), 1);
-
-    manager.setNetworkAccessible(QNetworkAccessManager::Accessible);
-
-    QCOMPARE(spy.count(), expectedCount);
-    if (expectedCount > 0)
-        QCOMPARE(spy.takeFirst().at(0).value<QNetworkAccessManager::NetworkAccessibility>(),
-                 initialAccessibility);
-    QCOMPARE(manager.networkAccessible(), initialAccessibility);
-
-    QNetworkConfigurationManager configManager;
-    QNetworkConfiguration defaultConfig = configManager.defaultConfiguration();
-    if (defaultConfig.isValid()) {
-        manager.setConfiguration(defaultConfig);
-
-        QCOMPARE(spy.count(), 0);
-
-        if (defaultConfig.state().testFlag(QNetworkConfiguration::Active))
-            QCOMPARE(manager.networkAccessible(), QNetworkAccessManager::Accessible);
-        else
-            QCOMPARE(manager.networkAccessible(), QNetworkAccessManager::NotAccessible);
-
-        manager.setNetworkAccessible(QNetworkAccessManager::NotAccessible);
-
-        if (defaultConfig.state().testFlag(QNetworkConfiguration::Active)) {
-            QCOMPARE(spy.count(), 1);
-            QCOMPARE(QNetworkAccessManager::NetworkAccessibility(spy.takeFirst().at(0).toInt()),
-                     QNetworkAccessManager::NotAccessible);
-        } else {
-            QCOMPARE(spy.count(), 0);
-        }
-    }
-    QCOMPARE(manager.networkAccessible(), QNetworkAccessManager::NotAccessible);
-#endif
-}
-
 void tst_QNetworkAccessManager::alwaysCacheRequest()
 {
     QNetworkAccessManager manager;