diff options
author | Mårten Nordheim <marten.nordheim@qt.io> | 2021-01-28 13:11:08 +0100 |
---|---|---|
committer | Mårten Nordheim <marten.nordheim@qt.io> | 2021-02-05 14:37:09 +0100 |
commit | 7860b9e6ffece207d054ac0c321bc3c5b983708f (patch) | |
tree | 3d9c13eec8f1463a8a167be78ab6fb46ee1c9c98 /tests/manual | |
parent | 309a2360fdb3e9c1b07d2937859c521da187c486 (diff) |
Remove QNetworkStatusMonitor
Since the old code is now fully integrated in QNetworkInformation backends
Pick-to: dev
Change-Id: Ia843d17bb3c98333e8d68752e25722b5860f48e0
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/qnetconmonitor/tst_qnetconmonitor.cpp | 65 |
1 files changed, 13 insertions, 52 deletions
diff --git a/tests/manual/qnetconmonitor/tst_qnetconmonitor.cpp b/tests/manual/qnetconmonitor/tst_qnetconmonitor.cpp index 92daee3348..1909b684e9 100644 --- a/tests/manual/qnetconmonitor/tst_qnetconmonitor.cpp +++ b/tests/manual/qnetconmonitor/tst_qnetconmonitor.cpp @@ -30,19 +30,19 @@ #include <QtCore/qdeadlinetimer.h> #include <QtNetwork/qhostinfo.h> +#include <QtNetwork/qnetworkinformation.h> #include <QtNetwork/private/qnetconmonitor_p.h> #include <QtTest/qsignalspy.h> -void testDetectDisconnection(); void testDetectRouteDisrupted(); int main(int argc, char *argv[]) { QCoreApplication app(argc, argv); - if (!QNetworkStatusMonitor::isEnabled()) { - qWarning("QNetworkStatusMonitor is not enabled for this platform!"); + if (!QNetworkConnectionMonitor::isEnabled()) { + qWarning("QNetworkConnectionMonitor is not enabled for this platform!"); return 0; } @@ -51,10 +51,8 @@ int main(int argc, char *argv[]) QByteArray indent(" "); { QTextStream writer(stdout); - writer << "Manual test for QNetwork{Status|Connection}Monitor\n" + writer << "Manual test for QNetworkConnection}Monitor\n" << "The tests are grouped by what they test. Run them in any order\n" - << "- QNetworkStatusMonitor tests:\n" - << indent << "c" << indent << "Test connection and disconnection detection.\n" << "- QNetworkConnectionMonitor tests:\n" << indent << "r" << indent << "Test detection of disruption of route to target.\n" << "- General\n" @@ -70,9 +68,6 @@ int main(int argc, char *argv[]) }; switch (getCommand()) { - case 'c': - testDetectDisconnection(); - break; case 'r': testDetectRouteDisrupted(); break; @@ -84,16 +79,19 @@ int main(int argc, char *argv[]) return 0; } -bool ensureNetworkAccessible(QNetworkStatusMonitor &status, QTextStream &writer) +bool ensureNetworkAccessible(QTextStream &writer) { - if (!status.isNetworkAccessible()) { + auto netInfo = QNetworkInformation::instance(); + if (netInfo->reachability() == QNetworkInformation::Reachability::Disconnected) { writer << "Network currently not accessible, please make sure you have an internet " "connection. Will wait for a connection for 20 seconds.\n"; writer.flush(); QDeadlineTimer timer{ 20 * 1000 }; - while (!timer.hasExpired() && !status.isNetworkAccessible()) + while (!timer.hasExpired() + && netInfo->reachability() == QNetworkInformation::Reachability::Disconnected) { QCoreApplication::processEvents(); - if (!status.isNetworkAccessible()) { + } + if (netInfo->reachability() == QNetworkInformation::Reachability::Disconnected) { writer << "Error: No network in 20 seconds, ending now!\n"; return false; } @@ -102,53 +100,16 @@ bool ensureNetworkAccessible(QNetworkStatusMonitor &status, QTextStream &writer) return true; } -void testDetectDisconnection() -{ - QTextStream writer(stdout); - QNetworkStatusMonitor status; - - if (!status.start()) { - writer << "Error: Failed to start"; - return; - } - - if (!ensureNetworkAccessible(status, writer)) - return; - - QSignalSpy onlineStateSpy(&status, &QNetworkStatusMonitor::onlineStateChanged); - - writer << "Please disconnect from the internet within 20 seconds\n"; - writer.flush(); - QDeadlineTimer timer{ 20 * 1000 }; - while (!timer.hasExpired() && status.isNetworkAccessible()) - QCoreApplication::processEvents(); - if (status.isNetworkAccessible()) { - writer << "Error: Still connected after 20 seconds, ending now!\n"; - return; - } - if (onlineStateSpy.count() == 0) { - writer << "Error: There was a disconnection but there was no signal emitted!\n"; - return; - } - // Get the final parameter of the final signal emission and make sure it is false. - if (onlineStateSpy.last().last().toBool()) { - writer << "Error: There was a disconnection but the latest signal emitted says we are online!\n"; - return; - } - writer << "Success, connection loss was detected!\n"; -} - void testDetectRouteDisrupted() { QTextStream writer(stdout); { - QNetworkStatusMonitor status; - if (!status.start()) { + if (!QNetworkInformation::load()) { writer << "Error: Failed to start"; return; } - if (!ensureNetworkAccessible(status, writer)) + if (!ensureNetworkAccessible(writer)) return; } |