Fix int/qsizetype mismatches in tst_QBluetoothServiceDiscoveryAgent::tst_serviceDiscovery_data()

Cache the result of QBluetoothLocalDevice::allDevices(), not just it's
size(), use ranged instead of indexed for-loops, and remove some weird
casts to identical types.

As a drive-by, replace a function-local QList with QVarLengthArray.

Pick-to: 6.3
Change-Id: Ic2e8314ae4a90d65a759c96cd4fb4d8fe0e00d21
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>

1 files changed, 9 insertions, 11 deletions

diff --git a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
index 83c79503..af3ab34f 100644
--- a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
+++ b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
@@ -294,15 +294,15 @@ void tst_QBluetoothServiceDiscoveryAgent::tst_serviceDiscovery_data()
 void tst_QBluetoothServiceDiscoveryAgent::tst_serviceDiscoveryAdapters()
 {
     QBluetoothLocalDevice localDevice;
-    int numberOfAdapters = (localDevice.allDevices()).size();
-    if (numberOfAdapters>1) {
+    const QList<QBluetoothHostInfo> adapters = localDevice.allDevices();
+    if (adapters.size() > 1) {
         if (devices.isEmpty())
             QSKIP("This test requires an in-range bluetooth device");
 
-        QList<QBluetoothAddress> addresses;
+        QVarLengthArray<QBluetoothAddress> addresses;
 
-        for (int i=0; i<numberOfAdapters; i++) {
-            addresses.append(((QBluetoothHostInfo)localDevice.allDevices().at(i)).address());
+        for (const auto &adapter : adapters) {
+            addresses.append(adapter.address());
         }
         QBluetoothServer server(QBluetoothServiceInfo::RfcommProtocol);
         QBluetoothUuid uuid(QBluetoothUuid::ProtocolUuid::Ftp);
@@ -357,17 +357,15 @@ void tst_QBluetoothServiceDiscoveryAgent::tst_serviceDiscoveryAdapters()
             scanTime -= 1000;
         }
 
-        QList<QBluetoothServiceInfo> discServices = discoveryAgent.discoveredServices();
+        const QList<QBluetoothServiceInfo> discServices = discoveryAgent.discoveredServices();
         QVERIFY(!discServices.empty());
 
-        int counter = 0;
-        for (int i = 0; i<discServices.size(); i++)
-        {
-            QBluetoothServiceInfo service((QBluetoothServiceInfo)discServices.at(i));
+        qsizetype counter = 0;
+        for (const QBluetoothServiceInfo &service : discServices) {
             if (uuid == service.serviceUuid())
                 counter++;
         }
-        QVERIFY(counter == 1);
+        QCOMPARE(counter, 1);
     }
 
 }