diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-04-07 14:12:32 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-04-11 15:21:46 +0200 |
| commit | 4d975c3ffc47e4d67609bf3dd9eb487ba7fdf376 (patch) | |
| tree | 390bb5fdfe76657ce19feb5d85d5cb9e7bedef27 /tests | |
| parent | 831e364b580eb8412573ddce55acd7481754779a (diff) | |
Port simple cases of count() to size()
The count() methods on QByteArray and QString are deprecated. The ones
on other Qt containers will likely follow soon, so port them all to
size().
The changes which also require int -> qsizetype will come in a
follow-up patch.
Pick-to: 6.3
Change-Id: I23e364019b9cfc457d93f4a3bb4660fe8d790da8
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests')
13 files changed, 233 insertions, 232 deletions
diff --git a/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp b/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp index 80dd1e6f..884526ac 100644 --- a/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp +++ b/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp @@ -97,7 +97,7 @@ void tst_QBluetoothDeviceDiscoveryAgent::initTestCase() { qRegisterMetaType<QBluetoothDeviceInfo>(); - noOfLocalDevices = QBluetoothLocalDevice::allDevices().count(); + noOfLocalDevices = QBluetoothLocalDevice::allDevices().size(); if (!noOfLocalDevices) return; @@ -190,7 +190,7 @@ void tst_QBluetoothDeviceDiscoveryAgent::tst_startStopDeviceDiscoveries() // we should not be active anymore QVERIFY(!discoveryAgent.isActive()); QVERIFY(errorSpy.isEmpty()); - QCOMPARE(cancelSpy.count(), 1); + QCOMPARE(cancelSpy.size(), 1); cancelSpy.clear(); // Starting case 2: start-start-stop, expecting cancel signal discoveryAgent.start(); @@ -214,7 +214,7 @@ void tst_QBluetoothDeviceDiscoveryAgent::tst_startStopDeviceDiscoveries() // we should not be active anymore QVERIFY(!discoveryAgent.isActive()); QVERIFY(errorSpy.isEmpty()); - QVERIFY(cancelSpy.count() == 1); + QVERIFY(cancelSpy.size() == 1); cancelSpy.clear(); // Starting case 3: stop @@ -246,7 +246,7 @@ void tst_QBluetoothDeviceDiscoveryAgent::tst_startStopDeviceDiscoveries() // cancel current request. discoveryAgent.stop(); //should only have triggered cancel() if stop didn't involve the event loop - if (cancelSpy.count() == 1) immediateSignal = true; + if (cancelSpy.size() == 1) immediateSignal = true; // start a new one discoveryAgent.start(); @@ -256,7 +256,7 @@ void tst_QBluetoothDeviceDiscoveryAgent::tst_startStopDeviceDiscoveries() // stop discoveryAgent.stop(); if (immediateSignal) - QVERIFY(cancelSpy.count() == 2); + QVERIFY(cancelSpy.size() == 2); // Wait for up to MaxWaitForCancelTime for the cancel to finish waitTime = MaxWaitForCancelTime; @@ -270,9 +270,9 @@ void tst_QBluetoothDeviceDiscoveryAgent::tst_startStopDeviceDiscoveries() // should only have 1 cancel if (immediateSignal) - QVERIFY(cancelSpy.count() == 2); + QVERIFY(cancelSpy.size() == 2); else - QVERIFY(cancelSpy.count() == 1); + QVERIFY(cancelSpy.size() == 1); cancelSpy.clear(); // Starting case 5: start-stop-start: expecting finished signal & no cancel @@ -298,7 +298,7 @@ void tst_QBluetoothDeviceDiscoveryAgent::tst_startStopDeviceDiscoveries() QVERIFY(!discoveryAgent.isActive()); QVERIFY(errorSpy.isEmpty()); // should only have 1 cancel - QVERIFY(finishedSpy.count() == 1); + QVERIFY(finishedSpy.size() == 1); // On OS X, stop is synchronous (signal will be emitted immediately). if (!immediateSignal) @@ -356,7 +356,7 @@ void tst_QBluetoothDeviceDiscoveryAgent::tst_deviceDiscovery() QVERIFY(!discoveryAgent.isActive()); qDebug() << "Scan time left:" << scanTime; // Expect finished signal with no error - QVERIFY(finishedSpy.count() == 1); + QVERIFY(finishedSpy.size() == 1); QVERIFY(errorSpy.isEmpty()); QVERIFY(discoveryAgent.error() == discoveryAgent.NoError); QVERIFY(discoveryAgent.errorString().isEmpty()); @@ -365,7 +365,7 @@ void tst_QBluetoothDeviceDiscoveryAgent::tst_deviceDiscovery() // discoveredSpy might have more events as some devices are found multiple times, // leading to messages like // "Almost Duplicate "88:C6:26:F5:3E:E2" "88-C6-26-F5-3E-E2" - replacing in place" - QVERIFY(discoveredSpy.count() >= discoveryAgent.discoveredDevices().length()); + QVERIFY(discoveredSpy.size() >= discoveryAgent.discoveredDevices().size()); // verify that there really was some devices in the array const QString remote = qEnvironmentVariable("BT_TEST_DEVICE"); @@ -482,7 +482,7 @@ void tst_QBluetoothDeviceDiscoveryAgent::tst_discoveryMethods() QVERIFY(supportedMethods == QBluetoothDeviceDiscoveryAgent::LowEnergyMethod); QCOMPARE(agent.error(), QBluetoothDeviceDiscoveryAgent::UnsupportedDiscoveryMethod); } else { - QVERIFY(finishedSpy.count() == 1); + QVERIFY(finishedSpy.size() == 1); QVERIFY(agent.error() == QBluetoothDeviceDiscoveryAgent::NoError); QVERIFY(agent.errorString().isEmpty()); diff --git a/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp b/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp index 25c6218f..55a191e3 100644 --- a/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp +++ b/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp @@ -457,7 +457,7 @@ void tst_QBluetoothDeviceInfo::tst_serviceUuids() deviceInfo.setServiceUuids(servicesList); QVERIFY(!deviceInfo.serviceUuids().isEmpty()); deviceInfo.setServiceUuids(QList<QBluetoothUuid>()); - QCOMPARE(deviceInfo.serviceUuids().count(), 0); + QCOMPARE(deviceInfo.serviceUuids().size(), 0); } void tst_QBluetoothDeviceInfo::tst_cached() @@ -528,8 +528,8 @@ void tst_QBluetoothDeviceInfo::tst_manufacturerData() QVERIFY(!info.setManufacturerData(manufacturerAVM, QByteArray::fromHex("ABCD"))); QCOMPARE(info.manufacturerData(manufacturerAVM), QByteArray::fromHex("ABCD")); auto temp = info.manufacturerData(); - QCOMPARE(temp.keys().count(), 1); - QCOMPARE(temp.values().count(), 1); + QCOMPARE(temp.keys().size(), 1); + QCOMPARE(temp.values().size(), 1); QCOMPARE(temp.values(), QList<QByteArray>() << QByteArray::fromHex("ABCD")); QVERIFY(info.setManufacturerData(manufacturerAVM, QByteArray::fromHex("CDEF"))); @@ -537,8 +537,8 @@ void tst_QBluetoothDeviceInfo::tst_manufacturerData() QVERIFY(!info.setManufacturerData(manufacturerAVM, QByteArray::fromHex("CDEF"))); temp = info.manufacturerData(); - QCOMPARE(temp.keys().count(), 2); - QCOMPARE(temp.values().count(), 2); + QCOMPARE(temp.keys().size(), 2); + QCOMPARE(temp.values().size(), 2); auto list = temp.values(); QCOMPARE(QSet<QByteArray> (list.begin(), list.end()), diff --git a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp b/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp index 32e272af..8fe8dc9c 100644 --- a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp +++ b/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp @@ -75,7 +75,8 @@ private: }; tst_QBluetoothLocalDevice::tst_QBluetoothLocalDevice() - : numDevices(QBluetoothLocalDevice::allDevices().count()), expectRemoteDevice(false) + : numDevices(QBluetoothLocalDevice::allDevices().size()), + expectRemoteDevice(false) { const QString remote = qgetenv("BT_TEST_DEVICE"); if (!remote.isEmpty()) { diff --git a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp index e1ef9591..83c79503 100644 --- a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp +++ b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp @@ -133,7 +133,7 @@ void tst_QBluetoothServiceDiscoveryAgent::initTestCase() } // Expect finished signal with no error - QVERIFY(finishedSpy.count() == 1); + QVERIFY(finishedSpy.size() == 1); QVERIFY(errorSpy.isEmpty()); devices = discoveryAgent.discoveredDevices(); @@ -153,12 +153,12 @@ void tst_QBluetoothServiceDiscoveryAgent::tst_serviceDiscoveryStop() discoveryAgent.start(QBluetoothServiceDiscoveryAgent::FullDiscovery); QVERIFY(discoveryAgent.isActive()); discoveryAgent.stop(); - QTRY_COMPARE(canceledSpy.count(), 1); + QTRY_COMPARE(canceledSpy.size(), 1); QVERIFY(!discoveryAgent.isActive()); // Wait a bit to see that there are no latent signals QTest::qWait(200); - QCOMPARE(canceledSpy.count(), 1); - QCOMPARE(finishedSpy.count(), 0); + QCOMPARE(canceledSpy.size(), 1); + QCOMPARE(finishedSpy.size(), 0); } @@ -431,13 +431,13 @@ void tst_QBluetoothServiceDiscoveryAgent::tst_serviceDiscovery() // Expect finished signal with no error if (scanTime) - QVERIFY(finishedSpy.count() == 1); + QVERIFY(finishedSpy.size() == 1); QVERIFY(errorSpy.isEmpty()); //if (!discoveryAgent.discoveredServices().isEmpty() && expected_failures++ <2){ if (discoveredSpy.isEmpty()) { - qDebug() << "Device failed to return any results, skipping device" << discoveryAgent.discoveredServices().count(); + qDebug() << "Device failed to return any results, skipping device" << discoveryAgent.discoveredServices().size(); return; } diff --git a/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp b/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp index 65194909..825bcb4f 100644 --- a/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp +++ b/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp @@ -127,13 +127,13 @@ void tst_QBluetoothServiceInfo::tst_construction() QCOMPARE(serviceInfo.serviceDescription(), QString()); QCOMPARE(serviceInfo.serviceProvider(), QString()); QCOMPARE(serviceInfo.serviceUuid(), QBluetoothUuid()); - QCOMPARE(serviceInfo.serviceClassUuids().count(), 0); - QCOMPARE(serviceInfo.attributes().count(), 0); + QCOMPARE(serviceInfo.serviceClassUuids().size(), 0); + QCOMPARE(serviceInfo.attributes().size(), 0); QCOMPARE(serviceInfo.serverChannel(), -1); QCOMPARE(serviceInfo.protocolServiceMultiplexer(), -1); for (QBluetoothUuid::ProtocolUuid u : qAsConst(protUuids)) - QCOMPARE(serviceInfo.protocolDescriptor(u).count(), 0); + QCOMPARE(serviceInfo.protocolDescriptor(u).size(), 0); } { @@ -167,9 +167,9 @@ void tst_QBluetoothServiceInfo::tst_construction() QCOMPARE(serviceInfo.device().address(), alternatedeviceInfo.address()); for (QBluetoothUuid::ProtocolUuid u : qAsConst(protUuids)) - QCOMPARE(serviceInfo.protocolDescriptor(u).count(), 0); + QCOMPARE(serviceInfo.protocolDescriptor(u).size(), 0); for (QBluetoothUuid::ProtocolUuid u : qAsConst(protUuids)) - QCOMPARE(copyInfo.protocolDescriptor(u).count(), 0); + QCOMPARE(copyInfo.protocolDescriptor(u).size(), 0); } } @@ -396,20 +396,20 @@ void tst_QBluetoothServiceInfo::tst_assignment() void tst_QBluetoothServiceInfo::tst_serviceClassUuids() { QBluetoothServiceInfo info; - QCOMPARE(info.serviceClassUuids().count(), 0); + QCOMPARE(info.serviceClassUuids().size(), 0); QBluetoothServiceInfo::Sequence classIds; classIds << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::ServiceClassUuid::SerialPort)); - QCOMPARE(classIds.count(), 1); + QCOMPARE(classIds.size(), 1); QBluetoothUuid uuid(QString("e8e10f95-1a70-4b27-9ccf-02010264e9c8")); classIds.prepend(QVariant::fromValue(uuid)); - QCOMPARE(classIds.count(), 2); + QCOMPARE(classIds.size(), 2); QCOMPARE(classIds.at(0).value<QBluetoothUuid>(), uuid); info.setAttribute(QBluetoothServiceInfo::ServiceClassIds, classIds); QList<QBluetoothUuid> svclids = info.serviceClassUuids(); - QCOMPARE(svclids.count(), 2); + QCOMPARE(svclids.size(), 2); QCOMPARE(svclids.at(0), uuid); QCOMPARE(svclids.at(1), QBluetoothUuid(QBluetoothUuid::ServiceClassUuid::SerialPort)); } diff --git a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp b/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp index 24f3ae4c..455e31bb 100644 --- a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp +++ b/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp @@ -257,7 +257,7 @@ void tst_QBluetoothSocket::tst_serviceConnection() socket.connectToService(remoteServiceInfo); - QCOMPARE(stateSpy.count(), 1); + QCOMPARE(stateSpy.size(), 1); QCOMPARE(stateSpy.takeFirst().at(0).value<QBluetoothSocket::SocketState>(), QBluetoothSocket::SocketState::ConnectingState); QCOMPARE(socket.state(), QBluetoothSocket::SocketState::ConnectingState); @@ -273,8 +273,8 @@ void tst_QBluetoothSocket::tst_serviceConnection() qDebug() << errorSpy.takeFirst().at(0).toInt(); QSKIP("Connection error"); } - QCOMPARE(connectedSpy.count(), 1); - QCOMPARE(stateSpy.count(), 1); + QCOMPARE(connectedSpy.size(), 1); + QCOMPARE(stateSpy.size(), 1); QCOMPARE(stateSpy.takeFirst().at(0).value<QBluetoothSocket::SocketState>(), QBluetoothSocket::SocketState::ConnectedState); QCOMPARE(socket.state(), QBluetoothSocket::SocketState::ConnectedState); @@ -314,8 +314,8 @@ void tst_QBluetoothSocket::tst_serviceConnection() disconnectTime -= 1000; } - QCOMPARE(disconnectedSpy.count(), 1); - QCOMPARE(stateSpy.count(), 1); + QCOMPARE(disconnectedSpy.size(), 1); + QCOMPARE(stateSpy.size(), 1); QCOMPARE(stateSpy.takeFirst().at(0).value<QBluetoothSocket::SocketState>(), QBluetoothSocket::SocketState::UnconnectedState); // The remote service needs time to close the connection and resume listening @@ -358,7 +358,7 @@ void tst_QBluetoothSocket::tst_clientCommunication() QCOMPARE(socket.openMode(), QIODevice::NotOpen); socket.connectToService(remoteServiceInfo); - QCOMPARE(stateSpy.count(), 1); + QCOMPARE(stateSpy.size(), 1); QCOMPARE(qvariant_cast<QBluetoothSocket::SocketState>(stateSpy.takeFirst().at(0)), QBluetoothSocket::SocketState::ConnectingState); QCOMPARE(socket.state(), QBluetoothSocket::SocketState::ConnectingState); @@ -374,8 +374,8 @@ void tst_QBluetoothSocket::tst_clientCommunication() QCOMPARE(socket.isReadable(), true); QCOMPARE(socket.isOpen(), true); - QCOMPARE(connectedSpy.count(), 1); - QCOMPARE(stateSpy.count(), 1); + QCOMPARE(connectedSpy.size(), 1); + QCOMPARE(stateSpy.size(), 1); QCOMPARE(qvariant_cast<QBluetoothSocket::SocketState>(stateSpy.takeFirst().at(0)), QBluetoothSocket::SocketState::ConnectedState); QCOMPARE(socket.state(), QBluetoothSocket::SocketState::ConnectedState); @@ -406,7 +406,7 @@ void tst_QBluetoothSocket::tst_clientCommunication() readWriteTime -= 1000; } - QCOMPARE(bytesWrittenSpy.count(), 1); + QCOMPARE(bytesWrittenSpy.size(), 1); QCOMPARE(bytesWrittenSpy.at(0).at(0).toLongLong(), qint64(line.length())); readWriteTime = MaxReadWriteTime; @@ -415,7 +415,7 @@ void tst_QBluetoothSocket::tst_clientCommunication() readWriteTime -= 1000; } - QCOMPARE(readyReadSpy.count(), 1); + QCOMPARE(readyReadSpy.size(), 1); if (socket.openMode() & QIODevice::Unbuffered) QVERIFY(socket.bytesAvailable() <= qint64(line.length())); @@ -455,7 +455,7 @@ void tst_QBluetoothSocket::tst_clientCommunication() readWriteTime -= 1000; } - QCOMPARE(bytesWrittenSpy.count(), 1); + QCOMPARE(bytesWrittenSpy.size(), 1); QCOMPARE(bytesWrittenSpy.at(0).at(0).toLongLong(), qint64(joined.length())); QVERIFY(!readyReadSpy.isEmpty()); @@ -487,8 +487,8 @@ void tst_QBluetoothSocket::tst_clientCommunication() disconnectTime -= 1000; } - QCOMPARE(disconnectedSpy.count(), 1); - QCOMPARE(stateSpy.count(), 2); + QCOMPARE(disconnectedSpy.size(), 1); + QCOMPARE(stateSpy.size(), 2); QCOMPARE(qvariant_cast<QBluetoothSocket::SocketState>(stateSpy.takeFirst().at(0)), QBluetoothSocket::SocketState::ClosingState); QCOMPARE(qvariant_cast<QBluetoothSocket::SocketState>(stateSpy.takeFirst().at(0)), QBluetoothSocket::SocketState::UnconnectedState); @@ -500,7 +500,7 @@ void tst_QBluetoothSocket::tst_error() { QBluetoothSocket socket; QSignalSpy errorSpy(&socket, SIGNAL(errorOccurred(QBluetoothSocket::SocketError))); - QCOMPARE(errorSpy.count(), 0); + QCOMPARE(errorSpy.size(), 0); const QBluetoothSocket::SocketError e = socket.error(); QVERIFY(e == QBluetoothSocket::SocketError::NoSocketError); diff --git a/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp b/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp index 125aa3dd..a8727e2c 100644 --- a/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp +++ b/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp @@ -134,8 +134,8 @@ void tst_QLowEnergyCharacteristic::initTestCase() QSignalSpy discoveryFinishedSpy(controller, SIGNAL(discoveryFinished())); QSignalSpy stateSpy(controller, SIGNAL(stateChanged(QLowEnergyController::ControllerState))); controller->discoverServices(); - QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.count() == 1, 10000); - QCOMPARE(stateSpy.count(), 2); + QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.size() == 1, 10000); + QCOMPARE(stateSpy.size(), 2); QCOMPARE(stateSpy.at(0).at(0).value<QLowEnergyController::ControllerState>(), QLowEnergyController::DiscoveringState); QCOMPARE(stateSpy.at(1).at(0).value<QLowEnergyController::ControllerState>(), @@ -199,7 +199,7 @@ void tst_QLowEnergyCharacteristic::tst_constructionDefault() QCOMPARE(characteristic.value(), QByteArray()); QVERIFY(characteristic.uuid().isNull()); QCOMPARE(characteristic.name(), QString()); - QCOMPARE(characteristic.descriptors().count(), 0); + QCOMPARE(characteristic.descriptors().size(), 0); QCOMPARE(characteristic.descriptor(QBluetoothUuid()), QLowEnergyDescriptor()); QCOMPARE(characteristic.descriptor(QBluetoothUuid(QBluetoothUuid::DescriptorType::ClientCharacteristicConfiguration)), @@ -213,7 +213,7 @@ void tst_QLowEnergyCharacteristic::tst_constructionDefault() QCOMPARE(copyConstructed.value(), QByteArray()); QVERIFY(copyConstructed.uuid().isNull()); QCOMPARE(copyConstructed.name(), QString()); - QCOMPARE(copyConstructed.descriptors().count(), 0); + QCOMPARE(copyConstructed.descriptors().size(), 0); QCOMPARE(copyConstructed.properties(), QLowEnergyCharacteristic::Unknown); QVERIFY(copyConstructed == characteristic); @@ -233,7 +233,7 @@ void tst_QLowEnergyCharacteristic::tst_constructionDefault() QCOMPARE(assigned.value(), QByteArray()); QVERIFY(assigned.uuid().isNull()); QCOMPARE(assigned.name(), QString()); - QCOMPARE(assigned.descriptors().count(), 0); + QCOMPARE(assigned.descriptors().size(), 0); QCOMPARE(assigned.properties(), QLowEnergyCharacteristic::Unknown); QVERIFY(assigned == characteristic); @@ -252,7 +252,7 @@ void tst_QLowEnergyCharacteristic::tst_assignCompare() QCOMPARE(target.value(), QByteArray()); QVERIFY(target.uuid().isNull()); QCOMPARE(target.name(), QString()); - QCOMPARE(target.descriptors().count(), 0); + QCOMPARE(target.descriptors().size(), 0); QCOMPARE(target.properties(), QLowEnergyCharacteristic::Unknown); int indexWithDescriptor = -1; @@ -297,8 +297,8 @@ void tst_QLowEnergyCharacteristic::tst_assignCompare() QCOMPARE(target.uuid(), chars[indexWithDescriptor].uuid()); QCOMPARE(target.value(), chars[indexWithDescriptor].value()); QCOMPARE(target.properties(), chars[indexWithDescriptor].properties()); - QCOMPARE(target.descriptors().count(), - chars[indexWithDescriptor].descriptors().count()); + QCOMPARE(target.descriptors().size(), + chars[indexWithDescriptor].descriptors().size()); for (int i = 0; i < target.descriptors().count(); i++) { const QLowEnergyDescriptor ref = chars[indexWithDescriptor].descriptors()[i]; QCOMPARE(target.descriptors()[i].name(), ref.name()); @@ -318,8 +318,8 @@ void tst_QLowEnergyCharacteristic::tst_assignCompare() QCOMPARE(copyConstructed.uuid(), chars[indexWithDescriptor].uuid()); QCOMPARE(copyConstructed.value(), chars[indexWithDescriptor].value()); QCOMPARE(copyConstructed.properties(), chars[indexWithDescriptor].properties()); - QCOMPARE(copyConstructed.descriptors().count(), - chars[indexWithDescriptor].descriptors().count()); + QCOMPARE(copyConstructed.descriptors().size(), + chars[indexWithDescriptor].descriptors().size()); QVERIFY(copyConstructed == target); QVERIFY(target == copyConstructed); @@ -333,7 +333,7 @@ void tst_QLowEnergyCharacteristic::tst_assignCompare() QCOMPARE(target.value(), QByteArray()); QVERIFY(target.uuid().isNull()); QCOMPARE(target.name(), QString()); - QCOMPARE(target.descriptors().count(), 0); + QCOMPARE(target.descriptors().size(), 0); QCOMPARE(target.properties(), QLowEnergyCharacteristic::Unknown); QVERIFY(invalid == target); @@ -346,7 +346,7 @@ void tst_QLowEnergyCharacteristic::tst_assignCompare() QVERIFY(chars[indexWithDescriptor] != target); QVERIFY(target != chars[indexWithDescriptor]); - if (chars.count() >= 2) { + if (chars.size() >= 2) { // at least two characteristics QVERIFY(!(chars[0] == chars[1])); QVERIFY(!(chars[1] == chars[0])); diff --git a/tests/auto/qlowenergycontroller-gattserver/test/tst_qlowenergycontroller-gattserver.cpp b/tests/auto/qlowenergycontroller-gattserver/test/tst_qlowenergycontroller-gattserver.cpp index 9b0249d9..c9b2c2f3 100644 --- a/tests/auto/qlowenergycontroller-gattserver/test/tst_qlowenergycontroller-gattserver.cpp +++ b/tests/auto/qlowenergycontroller-gattserver/test/tst_qlowenergycontroller-gattserver.cpp @@ -286,7 +286,7 @@ void TestQLowEnergyControllerGattServer::advertisedData() // name is seen on the scanning machine. // QCOMPARE(m_serverInfo.name(), QString("Qt GATT server")); - QVERIFY(m_serverInfo.serviceUuids().count() >= 3); + QVERIFY(m_serverInfo.serviceUuids().size() >= 3); QVERIFY(m_serverInfo.serviceUuids().contains(QBluetoothUuid::ServiceClassUuid::GenericAccess)); QVERIFY(m_serverInfo.serviceUuids().contains(QBluetoothUuid::ServiceClassUuid::RunningSpeedAndCadence)); QVERIFY(m_serverInfo.serviceUuids().contains(QBluetoothUuid(quint16(0x2000)))); @@ -306,7 +306,7 @@ void TestQLowEnergyControllerGattServer::serverCommunication() spy.reset(new QSignalSpy(m_leController.data(), &QLowEnergyController::discoveryFinished)); QVERIFY(spy->wait(30000)); const QList<QBluetoothUuid> serviceUuids = m_leController->services(); - QCOMPARE(serviceUuids.count(), 4); + QCOMPARE(serviceUuids.size(), 4); QVERIFY(serviceUuids.contains(QBluetoothUuid::ServiceClassUuid::GenericAccess)); QVERIFY(serviceUuids.contains(QBluetoothUuid::ServiceClassUuid::RunningSpeedAndCadence)); QVERIFY(serviceUuids.contains(QBluetoothUuid(quint16(0x2000)))); @@ -320,21 +320,21 @@ void TestQLowEnergyControllerGattServer::serverCommunication() spy.reset(new QSignalSpy(genericAccessService.data(), &QLowEnergyService::stateChanged)); QVERIFY(spy->wait(3000)); } - QCOMPARE(genericAccessService->includedServices().count(), 1); + QCOMPARE(genericAccessService->includedServices().size(), 1); QCOMPARE(genericAccessService->includedServices().first(), QBluetoothUuid(QBluetoothUuid::ServiceClassUuid::RunningSpeedAndCadence)); - QCOMPARE(genericAccessService->characteristics().count(), 2); + QCOMPARE(genericAccessService->characteristics().size(), 2); const QLowEnergyCharacteristic deviceNameChar = genericAccessService->characteristic(QBluetoothUuid::CharacteristicType::DeviceName); QVERIFY(deviceNameChar.isValid()); - QCOMPARE(deviceNameChar.descriptors().count(), 0); + QCOMPARE(deviceNameChar.descriptors().size(), 0); QCOMPARE(deviceNameChar.properties(), QLowEnergyCharacteristic::Read | QLowEnergyCharacteristic::Write); QCOMPARE(deviceNameChar.value().constData(), "Qt GATT server"); const QLowEnergyCharacteristic appearanceChar = genericAccessService->characteristic(QBluetoothUuid::CharacteristicType::Appearance); QVERIFY(appearanceChar.isValid()); - QCOMPARE(appearanceChar.descriptors().count(), 0); + QCOMPARE(appearanceChar.descriptors().size(), 0); QCOMPARE(appearanceChar.properties(), QLowEnergyCharacteristic::Read); auto value = qFromLittleEndian<quint16>(reinterpret_cast<const uchar *>( appearanceChar.value().constData())); @@ -348,12 +348,12 @@ void TestQLowEnergyControllerGattServer::serverCommunication() spy.reset(new QSignalSpy(runningSpeedService.data(), &QLowEnergyService::stateChanged)); QVERIFY(spy->wait(3000)); } - QCOMPARE(runningSpeedService->includedServices().count(), 0); - QCOMPARE(runningSpeedService->characteristics().count(), 2); + QCOMPARE(runningSpeedService->includedServices().size(), 0); + QCOMPARE(runningSpeedService->characteristics().size(), 2); QLowEnergyCharacteristic measurementChar = runningSpeedService->characteristic(QBluetoothUuid::CharacteristicType::RSCMeasurement); QVERIFY(measurementChar.isValid()); - QCOMPARE(measurementChar.descriptors().count(), 1); + QCOMPARE(measurementChar.descriptors().size(), 1); const QLowEnergyDescriptor clientConfigDesc = measurementChar.descriptor(QBluetoothUuid::DescriptorType::ClientCharacteristicConfiguration); QVERIFY(clientConfigDesc.isValid()); @@ -363,7 +363,7 @@ void TestQLowEnergyControllerGattServer::serverCommunication() QLowEnergyCharacteristic featureChar = runningSpeedService->characteristic(QBluetoothUuid::CharacteristicType::RSCFeature); QVERIFY(featureChar.isValid()); - QCOMPARE(featureChar.descriptors().count(), 0); + QCOMPARE(featureChar.descriptors().size(), 0); QCOMPARE(featureChar.properties(), QLowEnergyCharacteristic::Read); value = qFromLittleEndian<quint16>(reinterpret_cast<const uchar *>( featureChar.value().constData())); @@ -381,12 +381,12 @@ void TestQLowEnergyControllerGattServer::serverCommunication() QVERIFY(spy->wait(5000)); } QCOMPARE(customService128->serviceUuid(), serviceUuid128); - QCOMPARE(customService128->includedServices().count(), 0); - QCOMPARE(customService128->characteristics().count(), 1); + QCOMPARE(customService128->includedServices().size(), 0); + QCOMPARE(customService128->characteristics().size(), 1); QLowEnergyCharacteristic customChar128 = customService128->characteristic(charUuid128); QVERIFY(customChar128.isValid()); - QCOMPARE(customChar128.descriptors().count(), 0); + QCOMPARE(customChar128.descriptors().size(), 0); QCOMPARE(customChar128.value(), QByteArray(15, 'a')); QScopedPointer<QLowEnergyService> customService( @@ -397,18 +397,18 @@ void TestQLowEnergyControllerGattServer::serverCommunication() spy.reset(new QSignalSpy(customService.data(), &QLowEnergyService::stateChanged)); QVERIFY(spy->wait(5000)); } - QCOMPARE(customService->includedServices().count(), 0); - QCOMPARE(customService->characteristics().count(), 5); + QCOMPARE(customService->includedServices().size(), 0); + QCOMPARE(customService->characteristics().size(), 5); QLowEnergyCharacteristic customChar = customService->characteristic(QBluetoothUuid(quint16(0x5000))); QVERIFY(customChar.isValid()); - QCOMPARE(customChar.descriptors().count(), 0); + QCOMPARE(customChar.descriptors().size(), 0); QCOMPARE(customChar.value(), QByteArray(1024, 'x')); QLowEnergyCharacteristic customChar2 = customService->characteristic(QBluetoothUuid(quint16(0x5001))); QVERIFY(customChar2.isValid()); - QCOMPARE(customChar2.descriptors().count(), 0); + QCOMPARE(customChar2.descriptors().size(), 0); QCOMPARE(customChar2.value(), QByteArray()); // Was not readable due to authorization requirement. QLowEnergyCharacteristic customChar3 @@ -416,7 +416,7 @@ void TestQLowEnergyControllerGattServer::serverCommunication() QVERIFY(customChar3.isValid()); QCOMPARE(customChar3.properties(), QLowEnergyCharacteristic::Read | QLowEnergyCharacteristic::Indicate); - QCOMPARE(customChar3.descriptors().count(), 1); + QCOMPARE(customChar3.descriptors().size(), 1); QLowEnergyDescriptor cc3ClientConfig = customChar3.descriptor(QBluetoothUuid::DescriptorType::ClientCharacteristicConfiguration); QVERIFY(cc3ClientConfig.isValid()); @@ -426,7 +426,7 @@ void TestQLowEnergyControllerGattServer::serverCommunication() QVERIFY(customChar4.isValid()); QCOMPARE(customChar4.properties(), QLowEnergyCharacteristic::Read | QLowEnergyCharacteristic::Notify); - QCOMPARE(customChar4.descriptors().count(), 1); + QCOMPARE(customChar4.descriptors().size(), 1); QLowEnergyDescriptor cc4ClientConfig = customChar4.descriptor(QBluetoothUuid::DescriptorType::ClientCharacteristicConfiguration); QVERIFY(cc4ClientConfig.isValid()); @@ -436,7 +436,7 @@ void TestQLowEnergyControllerGattServer::serverCommunication() QVERIFY(customChar5.isValid()); QCOMPARE(customChar5.properties(), QLowEnergyCharacteristic::Read | QLowEnergyCharacteristic::WriteSigned); - QCOMPARE(customChar5.descriptors().count(), 0); + QCOMPARE(customChar5.descriptors().size(), 0); QCOMPARE(customChar5.value(), QByteArray("initial")); customService->writeCharacteristic(customChar, "whatever"); @@ -482,7 +482,7 @@ void TestQLowEnergyControllerGattServer::serverCommunication() spy.reset(new QSignalSpy(customService.data(), &QLowEnergyService::characteristicChanged)); QVERIFY(spy->wait(3000)); - if (spy->count() == 1) + if (spy->size() == 1) QVERIFY(spy->wait(3000)); QCOMPARE(customChar3.value().constData(), "indicated"); QCOMPARE(customChar4.value().constData(), "notified"); @@ -616,9 +616,9 @@ void TestQLowEnergyControllerGattServer::serviceData() | AttAccessConstraint::AttAuthorizationRequired); charData.addDescriptor(descData); - QCOMPARE(charData.descriptors().count(), 1); + QCOMPARE(charData.descriptors().size(), 1); charData.setDescriptors(QList<QLowEnergyDescriptorData>()); - QCOMPARE(charData.descriptors().count(), 0); + QCOMPARE(charData.descriptors().size(), 0); charData.setDescriptors(QList<QLowEnergyDescriptorData>() << descData << descData2); QLowEnergyDescriptorData descData3(QBluetoothUuid::DescriptorType::ExternalReportReference, "someval"); charData.addDescriptor(descData3); @@ -638,9 +638,9 @@ void TestQLowEnergyControllerGattServer::serviceData() QCOMPARE(secondaryData.type(), QLowEnergyServiceData::ServiceTypeSecondary); secondaryData.addCharacteristic(charData); - QCOMPARE(secondaryData.characteristics().count(), 1); + QCOMPARE(secondaryData.characteristics().size(), 1); secondaryData.setCharacteristics(QList<QLowEnergyCharacteristicData>()); - QCOMPARE(secondaryData.characteristics().count(), 0); + QCOMPARE(secondaryData.characteristics().size(), 0); secondaryData.setCharacteristics(QList<QLowEnergyCharacteristicData>() << charData << QLowEnergyCharacteristicData()); QCOMPARE(secondaryData.characteristics(), QList<QLowEnergyCharacteristicData>() << charData); @@ -668,10 +668,10 @@ void TestQLowEnergyControllerGattServer::serviceData() QVERIFY(!secondaryService.isNull()); QCOMPARE(secondaryService->serviceUuid(), secondaryData.uuid()); const QList<QLowEnergyCharacteristic> characteristics = secondaryService->characteristics(); - QCOMPARE(characteristics.count(), 1); + QCOMPARE(characteristics.size(), 1); QCOMPARE(characteristics.first().uuid(), charData.uuid()); const QList<QLowEnergyDescriptor> descriptors = characteristics.first().descriptors(); - QCOMPARE(descriptors.count(), 3); + QCOMPARE(descriptors.size(), 3); const auto inUuids = QSet<QBluetoothUuid>() << descData.uuid() << descData2.uuid() << descData3.uuid(); QSet<QBluetoothUuid> outUuids; @@ -684,9 +684,9 @@ void TestQLowEnergyControllerGattServer::serviceData() primaryData.addIncludedService(secondaryService.data()); const QScopedPointer<QLowEnergyService> primaryService(controller->addService(primaryData)); QVERIFY(!primaryService.isNull()); - QCOMPARE(primaryService->characteristics().count(), 0); + QCOMPARE(primaryService->characteristics().size(), 0); const QList<QBluetoothUuid> includedServices = primaryService->includedServices(); - QCOMPARE(includedServices.count(), 1); + QCOMPARE(includedServices.size(), 1); QCOMPARE(includedServices.first(), secondaryService->serviceUuid()); } diff --git a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp index 5b7e1c9e..d8d34292 100644 --- a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp +++ b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp @@ -275,8 +275,8 @@ void tst_QLowEnergyController::tst_connect() QCOMPARE(control->state(), QLowEnergyController::UnconnectedState); QCOMPARE(control->error(), QLowEnergyController::NoError); QVERIFY(control->errorString().isEmpty()); - QCOMPARE(disconnectedSpy.count(), 0); - QCOMPARE(connectedSpy.count(), 0); + QCOMPARE(disconnectedSpy.size(), 0); + QCOMPARE(connectedSpy.size(), 0); QVERIFY(control->services().isEmpty()); bool wasError = false; @@ -284,15 +284,15 @@ void tst_QLowEnergyController::tst_connect() QTRY_IMPL(control->state() != QLowEnergyController::ConnectingState, 10000) - QCOMPARE(disconnectedSpy.count(), 0); + QCOMPARE(disconnectedSpy.size(), 0); if (control->error() != QLowEnergyController::NoError) { //error during connect - QCOMPARE(connectedSpy.count(), 0); + QCOMPARE(connectedSpy.size(), 0); QCOMPARE(control->state(), QLowEnergyController::UnconnectedState); wasError = true; } else if (control->state() == QLowEnergyController::ConnectingState) { //timeout - QCOMPARE(connectedSpy.count(), 0); + QCOMPARE(connectedSpy.size(), 0); QVERIFY(control->errorString().isEmpty()); QCOMPARE(control->error(), QLowEnergyController::NoError); QVERIFY(control->services().isEmpty()); @@ -300,7 +300,7 @@ void tst_QLowEnergyController::tst_connect() return; } else { QCOMPARE(control->state(), QLowEnergyController::ConnectedState); - QCOMPARE(connectedSpy.count(), 1); + QCOMPARE(connectedSpy.size(), 1); QCOMPARE(control->error(), QLowEnergyController::NoError); QVERIFY(control->errorString().isEmpty()); } @@ -314,15 +314,15 @@ void tst_QLowEnergyController::tst_connect() QSignalSpy serviceFoundSpy(control.data(), SIGNAL(serviceDiscovered(QBluetoothUuid))); QSignalSpy stateSpy(control.data(), SIGNAL(stateChanged(QLowEnergyController::ControllerState))); control->discoverServices(); - QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.count() == 1, 20000); - QCOMPARE(stateSpy.count(), 2); + QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.size() == 1, 20000); + QCOMPARE(stateSpy.size(), 2); QCOMPARE(stateSpy.at(0).at(0).value<QLowEnergyController::ControllerState>(), QLowEnergyController::DiscoveringState); QCOMPARE(stateSpy.at(1).at(0).value<QLowEnergyController::ControllerState>(), QLowEnergyController::DiscoveredState); QVERIFY(!serviceFoundSpy.isEmpty()); - QVERIFY(serviceFoundSpy.count() >= foundServices.count()); + QVERIFY(serviceFoundSpy.size() >= foundServices.size()); QVERIFY(!serviceFoundSpy.isEmpty()); QList<QBluetoothUuid> listing; for (int i = 0; i < serviceFoundSpy.count(); i++) { @@ -359,8 +359,8 @@ void tst_QLowEnergyController::tst_connect() QTRY_VERIFY_WITH_TIMEOUT( service->state() == QLowEnergyService::RemoteServiceDiscovered, 10000); - QCOMPARE(errorSpy.count(), 0); //no error - QCOMPARE(stateSpy.count(), 2); // + QCOMPARE(errorSpy.size(), 0); //no error + QCOMPARE(stateSpy.size(), 2); // verifyServiceProperties(service); } @@ -382,9 +382,9 @@ void tst_QLowEnergyController::tst_connect() 10000); if (wasError) { - QCOMPARE(disconnectedSpy.count(), 0); + QCOMPARE(disconnectedSpy.size(), 0); } else { - QCOMPARE(disconnectedSpy.count(), 1); + QCOMPARE(disconnectedSpy.size(), 1); // after disconnect all service references must be invalid for (const QLowEnergyService *entry : qAsConst(savedReferences)) { const QBluetoothUuid &uuid = entry->serviceUuid(); @@ -499,8 +499,8 @@ void tst_QLowEnergyController::tst_concurrentDiscovery() QSignalSpy discoveryFinishedSpy(control.data(), SIGNAL(discoveryFinished())); QSignalSpy stateSpy(control.data(), SIGNAL(stateChanged(QLowEnergyController::ControllerState))); control->discoverServices(); - QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.count() == 1, 20000); - QCOMPARE(stateSpy.count(), 2); + QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.size() == 1, 20000); + QCOMPARE(stateSpy.size(), 2); QCOMPARE(stateSpy.at(0).at(0).value<QLowEnergyController::ControllerState>(), QLowEnergyController::DiscoveringState); QCOMPARE(stateSpy.at(1).at(0).value<QLowEnergyController::ControllerState>(), @@ -511,7 +511,7 @@ void tst_QLowEnergyController::tst_concurrentDiscovery() #define MAX_SERVICES_SAME_TIME_ACCESS 3 QLowEnergyService *services[MAX_SERVICES_SAME_TIME_ACCESS]; - QVERIFY(control->services().count() >= MAX_SERVICES_SAME_TIME_ACCESS); + QVERIFY(control->services().size() >= MAX_SERVICES_SAME_TIME_ACCESS); QList<QBluetoothUuid> uuids = control->services(); @@ -557,8 +557,8 @@ void tst_QLowEnergyController::tst_concurrentDiscovery() QCOMPARE(control->state(), QLowEnergyController::ConnectedState); stateSpy.clear(); control->discoverServices(); - QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.count() == 1, 20000); - QCOMPARE(stateSpy.count(), 2); + QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.size() == 1, 20000); + QCOMPARE(stateSpy.size(), 2); QCOMPARE(stateSpy.at(0).at(0).value<QLowEnergyController::ControllerState>(), QLowEnergyController::DiscoveringState); QCOMPARE(stateSpy.at(1).at(0).value<QLowEnergyController::ControllerState>(), @@ -625,7 +625,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QBluetoothUuid(QString("00001800-0000-1000-8000-00805f9b34fb"))) { qDebug() << "Verifying GAP Service"; QList<QLowEnergyCharacteristic> chars = info->characteristics(); - QCOMPARE(chars.count(), 5); + QCOMPARE(chars.size(), 5); // Device Name QString temp("00002a00-0000-1000-8000-00805f9b34fb"); @@ -633,7 +633,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QCOMPARE(chars[0].properties(), QLowEnergyCharacteristic::Read); QCOMPARE(chars[0].value(), QByteArray::fromHex("544920424c452053656e736f7220546167")); QVERIFY(chars[0].isValid()); - QCOMPARE(chars[0].descriptors().count(), 0); + QCOMPARE(chars[0].descriptors().size(), 0); QVERIFY(info->contains(chars[0])); // Appearance @@ -642,7 +642,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QCOMPARE(chars[1].properties(), QLowEnergyCharacteristic::Read); QCOMPARE(chars[1].value(), QByteArray::fromHex("0000")); QVERIFY(chars[1].isValid()); - QCOMPARE(chars[1].descriptors().count(), 0); + QCOMPARE(chars[1].descriptors().size(), 0); QVERIFY(info->contains(chars[1])); // Peripheral Privacy Flag @@ -651,7 +651,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[2].properties() & QLowEnergyCharacteristic::Read); QCOMPARE(chars[2].value(), QByteArray::fromHex("00")); QVERIFY(chars[2].isValid()); - QCOMPARE(chars[2].descriptors().count(), 0); + QCOMPARE(chars[2].descriptors().size(), 0); QVERIFY(info->contains(chars[2])); // Reconnection Address @@ -664,7 +664,7 @@ void tst_QLowEnergyController::verifyServiceProperties( else QCOMPARE(chars[3].value(), QByteArray()); QVERIFY(chars[3].isValid()); - QCOMPARE(chars[3].descriptors().count(), 0); + QCOMPARE(chars[3].descriptors().size(), 0); QVERIFY(info->contains(chars[3])); // Peripheral Preferred Connection Parameters @@ -673,13 +673,13 @@ void tst_QLowEnergyController::verifyServiceProperties( QCOMPARE(chars[4].properties(), QLowEnergyCharacteristic::Read); QCOMPARE(chars[4].value(), QByteArray::fromHex("5000a0000000e803")); QVERIFY(chars[4].isValid()); - QCOMPARE(chars[4].descriptors().count(), 0); + QCOMPARE(chars[4].descriptors().size(), 0); QVERIFY(info->contains(chars[4])); } else if (info->serviceUuid() == QBluetoothUuid(QString("00001801-0000-1000-8000-00805f9b34fb"))) { qDebug() << "Verifying GATT Service"; QList<QLowEnergyCharacteristic> chars = info->characteristics(); - QCOMPARE(chars.count(), 1); + QCOMPARE(chars.size(), 1); // Service Changed QString temp("00002a05-0000-1000-8000-00805f9b34fb"); @@ -690,7 +690,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[0].isValid()); QVERIFY(info->contains(chars[0])); - QCOMPARE(chars[0].descriptors().count(), 1); + QCOMPARE(chars[0].descriptors().size(), 1); QCOMPARE(chars[0].descriptors().at(0).isValid(), true); QCOMPARE(chars[0].descriptors().at(0).uuid(), QBluetoothUuid(QBluetoothUuid::DescriptorType::ClientCharacteristicConfiguration)); @@ -702,7 +702,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QBluetoothUuid(QString("0000180a-0000-1000-8000-00805f9b34fb"))) { qDebug() << "Verifying Device Information"; QList<QLowEnergyCharacteristic> chars = info->characteristics(); - QCOMPARE(chars.count(), 9); + QCOMPARE(chars.size(), 9); // System ID QString temp("00002a23-0000-1000-8000-00805f9b34fb"); @@ -714,7 +714,7 @@ void tst_QLowEnergyController::verifyServiceProperties( // QCOMPARE(chars[0].value(), QByteArray::fromHex("6e41ab0000296abc")); QVERIFY(chars[0].isValid()); QVERIFY(info->contains(chars[0])); - QCOMPARE(chars[0].descriptors().count(), 0); + QCOMPARE(chars[0].descriptors().size(), 0); // Model Number temp = QString("00002a24-0000-1000-8000-00805f9b34fb"); @@ -723,7 +723,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QCOMPARE(chars[1].value(), QByteArray::fromHex("4e2e412e00")); QVERIFY(chars[1].isValid()); QVERIFY(info->contains(chars[1])); - QCOMPARE(chars[1].descriptors().count(), 0); + QCOMPARE(chars[1].descriptors().size(), 0); // Serial Number temp = QString("00002a25-0000-1000-8000-00805f9b34fb"); @@ -733,7 +733,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QCOMPARE(chars[2].value(), QByteArray::fromHex("4e2e412e00")); QVERIFY(chars[2].isValid()); QVERIFY(info->contains(chars[2])); - QCOMPARE(chars[2].descriptors().count(), 0); + QCOMPARE(chars[2].descriptors().size(), 0); // Firmware Revision temp = QString("00002a26-0000-1000-8000-00805f9b34fb"); @@ -745,7 +745,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QCOMPARE(chars[3].value(), QByteArray::fromHex("312e3520284f637420323320323031332900")); QVERIFY(chars[3].isValid()); QVERIFY(info->contains(chars[3])); - QCOMPARE(chars[3].descriptors().count(), 0); + QCOMPARE(chars[3].descriptors().size(), 0); // Hardware Revision temp = QString("00002a27-0000-1000-8000-00805f9b34fb"); @@ -755,7 +755,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QCOMPARE(chars[4].value(), QByteArray::fromHex("4e2e412e00")); QVERIFY(chars[4].isValid()); QVERIFY(info->contains(chars[4])); - QCOMPARE(chars[4].descriptors().count(), 0); + QCOMPARE(chars[4].descriptors().size(), 0); // Software Revision temp = QString("00002a28-0000-1000-8000-00805f9b34fb"); @@ -765,7 +765,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QCOMPARE(chars[5].value(), QByteArray::fromHex("4e2e412e00")); QVERIFY(chars[5].isValid()); QVERIFY(info->contains(chars[5])); - QCOMPARE(chars[5].descriptors().count(), 0); + QCOMPARE(chars[5].descriptors().size(), 0); // Manufacturer Name temp = QString("00002a29-0000-1000-8000-00805f9b34fb"); @@ -775,7 +775,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QCOMPARE(chars[6].value(), QByteArray::fromHex("546578617320496e737472756d656e747300")); QVERIFY(chars[6].isValid()); QVERIFY(info->contains(chars[6])); - QCOMPARE(chars[6].descriptors().count(), 0); + QCOMPARE(chars[6].descriptors().size(), 0); // IEEE temp = QString("00002a2a-0000-1000-8000-00805f9b34fb"); @@ -785,7 +785,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QCOMPARE(chars[7].value(), QByteArray::fromHex("fe006578706572696d656e74616c")); QVERIFY(chars[7].isValid()); QVERIFY(info->contains(chars[7])); - QCOMPARE(chars[7].descriptors().count(), 0); + QCOMPARE(chars[7].descriptors().size(), 0); // PnP ID temp = QString("00002a50-0000-1000-8000-00805f9b34fb"); @@ -795,12 +795,12 @@ void tst_QLowEnergyController::verifyServiceProperties( QCOMPARE(chars[8].value(), QByteArray::fromHex("010d0000001001")); QVERIFY(chars[8].isValid()); QVERIFY(info->contains(chars[8])); - QCOMPARE(chars[8].descriptors().count(), 0); + QCOMPARE(chars[8].descriptors().size(), 0); } else if (info->serviceUuid() == QBluetoothUuid(QString("f000aa00-0451-4000-b000-000000000000"))) { qDebug() << "Verifying Temperature"; QList<QLowEnergyCharacteristic> chars = info->characteristics(); - QVERIFY(chars.count() >= 2); + QVERIFY(chars.size() >= 2); // Temp Data QString temp("f000aa01-0451-4000-b000-000000000000"); @@ -811,7 +811,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[0].isValid()); QVERIFY(info->contains(chars[0])); - QCOMPARE(chars[0].descriptors().count(), 2); + QCOMPARE(chars[0].descriptors().size(), 2); //descriptor checks QCOMPARE(chars[0].descriptors().at(0).isValid(), true); QCOMPARE(chars[0].descriptors().at(0).uuid(), @@ -840,7 +840,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[1].isValid()); QVERIFY(info->contains(chars[1])); - QCOMPARE(chars[1].descriptors().count(), 1); + QCOMPARE(chars[1].descriptors().size(), 1); //descriptor checks QCOMPARE(chars[1].descriptors().at(0).isValid(), true); QCOMPARE(chars[1].descriptors().at(0).uuid(), @@ -854,7 +854,7 @@ void tst_QLowEnergyController::verifyServiceProperties( //Temp Period (introduced by later firmware versions) - if (chars.count() > 2) { + if (chars.size() > 2) { temp = QString("f000aa03-0451-4000-b000-000000000000"); QCOMPARE(chars[2].uuid(), QBluetoothUuid(temp)); QCOMPARE(chars[2].properties(), @@ -863,7 +863,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[2].isValid()); QVERIFY(info->contains(chars[2])); - QCOMPARE(chars[2].descriptors().count(), 1); + QCOMPARE(chars[2].descriptors().size(), 1); //descriptor checks QCOMPARE(chars[2].descriptors().at(0).isValid(), true); QCOMPARE(chars[2].descriptors().at(0).uuid(), @@ -878,7 +878,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QBluetoothUuid(QString("0000ffe0-0000-1000-8000-00805f9b34fb"))) { qDebug() << "Verifying Simple Keys"; QList<QLowEnergyCharacteristic> chars = info->characteristics(); - QCOMPARE(chars.count(), 1); + QCOMPARE(chars.size(), 1); // Temp Data QString temp("0000ffe1-0000-1000-8000-00805f9b34fb"); @@ -890,7 +890,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[0].isValid()); QVERIFY(info->contains(chars[0])); - QCOMPARE(chars[0].descriptors().count(), 2); + QCOMPARE(chars[0].descriptors().size(), 2); //descriptor checks QCOMPARE(chars[0].descriptors().at(0).isValid(), true); // value different in other revisions and test may fail @@ -915,7 +915,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QBluetoothUuid(QString("f000aa10-0451-4000-b000-000000000000"))) { qDebug() << "Verifying Accelerometer"; QList<QLowEnergyCharacteristic> chars = info->characteristics(); - QCOMPARE(chars.count(), 3); + QCOMPARE(chars.size(), 3); // Accel Data QString temp("f000aa11-0451-4000-b000-000000000000"); @@ -927,7 +927,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[0].isValid()); QVERIFY(info->contains(chars[0])); - QCOMPARE(chars[0].descriptors().count(), 2); + QCOMPARE(chars[0].descriptors().size(), 2); QCOMPARE(chars[0].descriptors().at(0).isValid(), true); // value different in other revisions and test may fail @@ -957,7 +957,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QCOMPARE(chars[1].value(), QByteArray::fromHex("00")); QVERIFY(chars[1].isValid()); QVERIFY(info->contains(chars[1])); - QCOMPARE(chars[1].descriptors().count(), 1); + QCOMPARE(chars[1].descriptors().size(), 1); QCOMPARE(chars[1].descriptors().at(0).isValid(), true); // value different in other revisions and test may fail @@ -979,7 +979,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[2].isValid()); QVERIFY(info->contains(chars[2])); - QCOMPARE(chars[2].descriptors().count(), 1); + QCOMPARE(chars[2].descriptors().size(), 1); //descriptor checks QCOMPARE(chars[2].descriptors().at(0).isValid(), true); // value different in other revisions and test may fail @@ -995,7 +995,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QBluetoothUuid(QString("f000aa20-0451-4000-b000-000000000000"))) { qDebug() << "Verifying Humidity"; QList<QLowEnergyCharacteristic> chars = info->characteristics(); - QVERIFY(chars.count() >= 2); //new firmware has more chars + QVERIFY(chars.size() >= 2); //new firmware has more chars // Humidity Data QString temp("f000aa21-0451-4000-b000-000000000000"); @@ -1007,7 +1007,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[0].isValid()); QVERIFY(info->contains(chars[0])); - QCOMPARE(chars[0].descriptors().count(), 2); + QCOMPARE(chars[0].descriptors().size(), 2); //descriptor checks QCOMPARE(chars[0].descriptors().at(0).isValid(), true); // value different in other revisions and test may fail @@ -1038,7 +1038,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[1].isValid()); QVERIFY(info->contains(chars[1])); - QCOMPARE(chars[1].descriptors().count(), 1); + QCOMPARE(chars[1].descriptors().size(), 1); //descriptor checks QCOMPARE(chars[1].descriptors().at(0).isValid(), true); // value different in other revisions and test may fail @@ -1050,7 +1050,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QByteArray::fromHex("48756d69642e20436f6e662e")); QVERIFY(info->contains(chars[1].descriptors().at(0))); - if (chars.count() >= 3) { + if (chars.size() >= 3) { // New firmware new characteristic // Humidity Period temp = QString("f000aa23-0451-4000-b000-000000000000"); @@ -1061,7 +1061,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[2].isValid()); QVERIFY(info->contains(chars[2])); - QCOMPARE(chars[2].descriptors().count(), 1); + QCOMPARE(chars[2].descriptors().size(), 1); //descriptor checks QCOMPARE(chars[2].descriptors().at(0).isValid(), true); QCOMPARE(chars[2].descriptors().at(0).uuid(), @@ -1076,7 +1076,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QBluetoothUuid(QString("f000aa30-0451-4000-b000-000000000000"))) { qDebug() << "Verifying Magnetometer"; QList<QLowEnergyCharacteristic> chars = info->characteristics(); - QCOMPARE(chars.count(), 3); + QCOMPARE(chars.size(), 3); // Magnetometer Data QString temp("f000aa31-0451-4000-b000-000000000000"); @@ -1088,7 +1088,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[0].isValid()); QVERIFY(info->contains(chars[0])); - QCOMPARE(chars[0].descriptors().count(), 2); + QCOMPARE(chars[0].descriptors().size(), 2); QCOMPARE(chars[0].descriptors().at(0).isValid(), true); // value different in other revisions and test may fail @@ -1119,7 +1119,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[1].isValid()); QVERIFY(info->contains(chars[1])); - QCOMPARE(chars[1].descriptors().count(), 1); + QCOMPARE(chars[1].descriptors().size(), 1); QCOMPARE(chars[1].descriptors().at(0).isValid(), true); // value different in other revisions and test may fail QCOMPARE(chars[1].descriptors().at(0).uuid(), @@ -1141,7 +1141,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[2].isValid()); QVERIFY(info->contains(chars[2])); - QCOMPARE(chars[2].descriptors().count(), 1); + QCOMPARE(chars[2].descriptors().size(), 1); QCOMPARE(chars[2].descriptors().at(0).isValid(), true); // value different in other revisions and test may fail QCOMPARE(chars[2].descriptors().at(0).uuid(), @@ -1156,7 +1156,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QBluetoothUuid(QString("f000aa40-0451-4000-b000-000000000000"))) { qDebug() << "Verifying Pressure"; const QList<QLowEnergyCharacteristic> chars = info->characteristics(); - QVERIFY(chars.count() >= 3); + QVERIFY(chars.size() >= 3); // Pressure Data QString temp("f000aa41-0451-4000-b000-000000000000"); @@ -1168,7 +1168,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[0].isValid()); QVERIFY(info->contains(chars[0])); - QCOMPARE(chars[0].descriptors().count(), 2); + QCOMPARE(chars[0].descriptors().size(), 2); //descriptor checks QCOMPARE(chars[0].descriptors().at(0).isValid(), true); // value different in other revisions and test may fail @@ -1200,7 +1200,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[1].isValid()); QVERIFY(info->contains(chars[1])); - QCOMPARE(chars[1].descriptors().count(), 1); + QCOMPARE(chars[1].descriptors().size(), 1); QCOMPARE(chars[1].descriptors().at(0).isValid(), true); // value different in other revisions and test may fail QCOMPARE(chars[1].descriptors().at(0).uuid(), @@ -1232,7 +1232,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(calibration.isValid()); QVERIFY(info->contains(calibration)); - QCOMPARE(calibration.descriptors().count(), 2); + QCOMPARE(calibration.descriptors().size(), 2); //descriptor checks QCOMPARE(calibration.descriptors().at(0).isValid(), true); // value different in other revisions and test may fail @@ -1266,7 +1266,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(period.isValid()); QVERIFY(info->contains(period)); - QCOMPARE(period.descriptors().count(), 1); + QCOMPARE(period.descriptors().size(), 1); //descriptor checks QCOMPARE(period.descriptors().at(0).isValid(), true); // value different in other revisions and test may fail @@ -1282,7 +1282,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QBluetoothUuid(QString("f000aa50-0451-4000-b000-000000000000"))) { qDebug() << "Verifying Gyroscope"; QList<QLowEnergyCharacteristic> chars = info->characteristics(); - QVERIFY(chars.count() >= 2); + QVERIFY(chars.size() >= 2); // Gyroscope Data QString temp("f000aa51-0451-4000-b000-000000000000"); @@ -1294,7 +1294,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[0].isValid()); QVERIFY(info->contains(chars[0])); - QCOMPARE(chars[0].descriptors().count(), 2); + QCOMPARE(chars[0].descriptors().size(), 2); //descriptor checks QCOMPARE(chars[0].descriptors().at(0).isValid(), true); // value different in other revisions and test may fail @@ -1326,7 +1326,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[1].isValid()); QVERIFY(info->contains(chars[1])); - QCOMPARE(chars[1].descriptors().count(), 1); + QCOMPARE(chars[1].descriptors().size(), 1); //descriptor checks QCOMPARE(chars[1].descriptors().at(0).isValid(), true); // value different in other revisions and test may fail @@ -1348,7 +1348,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[2].isValid()); QVERIFY(info->contains(chars[2])); - QCOMPARE(chars[2].descriptors().count(), 1); + QCOMPARE(chars[2].descriptors().size(), 1); //descriptor checks QCOMPARE(chars[2].descriptors().at(0).isValid(), true); QCOMPARE(chars[2].descriptors().at(0).uuid(), @@ -1362,7 +1362,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QBluetoothUuid(QString("f000aa60-0451-4000-b000-000000000000"))) { qDebug() << "Verifying Test Service"; QList<QLowEnergyCharacteristic> chars = info->characteristics(); - QCOMPARE(chars.count(), 2); + QCOMPARE(chars.size(), 2); // Test Data QString temp("f000aa61-0451-4000-b000-000000000000"); @@ -1374,7 +1374,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[0].isValid()); QVERIFY(info->contains(chars[0])); - QCOMPARE(chars[0].descriptors().count(), 1); + QCOMPARE(chars[0].descriptors().size(), 1); QCOMPARE(chars[0].descriptors().at(0).isValid(), true); // value different in other revisions and test may fail QCOMPARE(chars[0].descriptors().at(0).uuid(), @@ -1394,7 +1394,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[1].isValid()); QVERIFY(info->contains(chars[1])); - QCOMPARE(chars[1].descriptors().count(), 1); + QCOMPARE(chars[1].descriptors().size(), 1); //descriptor checks QCOMPARE(chars[1].descriptors().at(0).isValid(), true); // value different in other revisions and test may fail @@ -1409,7 +1409,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QBluetoothUuid(QString("f000ccc0-0451-4000-b000-000000000000"))) { qDebug() << "Connection Control Service"; QList<QLowEnergyCharacteristic> chars = info->characteristics(); - QCOMPARE(chars.count(), 3); + QCOMPARE(chars.size(), 3); //first characteristic QString temp("f000ccc1-0451-4000-b000-000000000000"); @@ -1422,7 +1422,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[0].isValid()); QVERIFY(info->contains(chars[0])); - QCOMPARE(chars[0].descriptors().count(), 2); + QCOMPARE(chars[0].descriptors().size(), 2); //descriptor checks QCOMPARE(chars[0].descriptors().at(0).isValid(), true); QCOMPARE(chars[0].descriptors().at(0).uuid(), @@ -1450,7 +1450,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[1].isValid()); QVERIFY(info->contains(chars[1])); - QCOMPARE(chars[1].descriptors().count(), 1); + QCOMPARE(chars[1].descriptors().size(), 1); QCOMPARE(chars[1].descriptors().at(0).isValid(), true); QCOMPARE(chars[1].descriptors().at(0).uuid(), QBluetoothUuid(QBluetoothUuid::DescriptorType::CharacteristicUserDescription)); @@ -1468,7 +1468,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[2].isValid()); QVERIFY(info->contains(chars[2])); - QCOMPARE(chars[2].descriptors().count(), 1); + QCOMPARE(chars[2].descriptors().size(), 1); QCOMPARE(chars[2].descriptors().at(0).isValid(), true); QCOMPARE(chars[2].descriptors().at(0).uuid(), QBluetoothUuid(QBluetoothUuid::DescriptorType::CharacteristicUserDescription)); @@ -1481,7 +1481,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QBluetoothUuid(QString("f000ffc0-0451-4000-b000-000000000000"))) { qDebug() << "Verifying OID Service"; QList<QLowEnergyCharacteristic> chars = info->characteristics(); - QCOMPARE(chars.count(), 2); + QCOMPARE(chars.size(), 2); // first characteristic QString temp("f000ffc1-0451-4000-b000-000000000000"); @@ -1493,7 +1493,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[0].isValid()); QVERIFY(info->contains(chars[0])); - QCOMPARE(chars[0].descriptors().count(), 2); + QCOMPARE(chars[0].descriptors().size(), 2); //descriptor checks QCOMPARE(chars[0].descriptors().at(0).isValid(), true); QCOMPARE(chars[0].descriptors().at(0).uuid(), @@ -1523,7 +1523,7 @@ void tst_QLowEnergyController::verifyServiceProperties( QVERIFY(chars[1].isValid()); QVERIFY(info->contains(chars[1])); - QCOMPARE(chars[1].descriptors().count(), 2); + QCOMPARE(chars[1].descriptors().size(), 2); //descriptor checks QCOMPARE(chars[1].descriptors().at(0).isValid(), true); // value different in other revisions and test may fail @@ -1601,7 +1601,7 @@ void tst_QLowEnergyController::tst_defaultBehavior() QBluetoothUuid(QBluetoothUuid::CharacteristicType::DeviceName))); } - QCOMPARE(controlDefaultAdapter->services().count(), 0); + QCOMPARE(controlDefaultAdapter->services().size(), 0); // Test explicit local adapter if (!foundAddresses.isEmpty()) { @@ -1615,7 +1615,7 @@ void tst_QLowEnergyController::tst_defaultBehavior() QCOMPARE(controlExplicitAdapter->localAddress(), foundAddresses[0]); QCOMPARE(controlExplicitAdapter->state(), QLowEnergyController::UnconnectedState); - QCOMPARE(controlExplicitAdapter->services().count(), 0); + QCOMPARE(controlExplicitAdapter->services().size(), 0); // unrelated uuids don't return valid service object // invalid service uuid @@ -1658,8 +1658,8 @@ void tst_QLowEnergyController::tst_writeCharacteristic() QSignalSpy discoveryFinishedSpy(control.data(), SIGNAL(discoveryFinished())); QSignalSpy stateSpy(control.data(), SIGNAL(stateChanged(QLowEnergyController::ControllerState))); control->discoverServices(); - QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.count() == 1, 20000); - QCOMPARE(stateSpy.count(), 2); + QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.size() == 1, 20000); + QCOMPARE(stateSpy.size(), 2); QCOMPARE(stateSpy.at(0).at(0).value<QLowEnergyController::ControllerState>(), QLowEnergyController::DiscoveringState); QCOMPARE(stateSpy.at(1).at(0).value<QLowEnergyController::ControllerState>(), @@ -1728,7 +1728,7 @@ void tst_QLowEnergyController::tst_writeCharacteristic() service->readCharacteristic(configChar); QTRY_VERIFY_WITH_TIMEOUT(!readSpy.isEmpty(), 10000); QCOMPARE(configChar.value(), QByteArray::fromHex("81")); - QCOMPARE(readSpy.count(), 1); //expect one characteristicRead signal + QCOMPARE(readSpy.size(), 1); //expect one characteristicRead signal { //verify the readCharacteristic() QList<QVariant> firstSignalData = readSpy.first(); @@ -1754,8 +1754,8 @@ void tst_QLowEnergyController::tst_writeCharacteristic() // write wrong value -> error response required QSignalSpy errorSpy(service, SIGNAL(errorOccurred(QLowEnergyService::ServiceError))); writeSpy.clear(); - QCOMPARE(errorSpy.count(), 0); - QCOMPARE(writeSpy.count(), 0); + QCOMPARE(errorSpy.size(), 0); + QCOMPARE(writeSpy.size(), 0); // write 2 byte value to 1 byte characteristic service->writeCharacteristic(configChar, QByteArray::fromHex("1111")); @@ -1763,20 +1763,20 @@ void tst_QLowEnergyController::tst_writeCharacteristic() QCOMPARE(errorSpy[0].at(0).value<QLowEnergyService::ServiceError>(), QLowEnergyService::CharacteristicWriteError); QCOMPARE(service->error(), QLowEnergyService::CharacteristicWriteError); - QCOMPARE(writeSpy.count(), 0); + QCOMPARE(writeSpy.size(), 0); QCOMPARE(configChar.value(), QByteArray::fromHex("00")); // ******************************************* // write to read-only characteristic -> error errorSpy.clear(); - QCOMPARE(errorSpy.count(), 0); + QCOMPARE(errorSpy.size(), 0); service->writeCharacteristic(dataChar, QByteArray::fromHex("ffff")); QTRY_VERIFY_WITH_TIMEOUT(!errorSpy.isEmpty(), 10000); QCOMPARE(errorSpy[0].at(0).value<QLowEnergyService::ServiceError>(), QLowEnergyService::CharacteristicWriteError); QCOMPARE(service->error(), QLowEnergyService::CharacteristicWriteError); - QCOMPARE(writeSpy.count(), 0); + QCOMPARE(writeSpy.size(), 0); QCOMPARE(dataChar.value(), QByteArray::fromHex("3f00")); @@ -1786,13 +1786,13 @@ void tst_QLowEnergyController::tst_writeCharacteristic() // ******************************************* // write value while disconnected -> error errorSpy.clear(); - QCOMPARE(errorSpy.count(), 0); + QCOMPARE(errorSpy.size(), 0); service->writeCharacteristic(configChar, QByteArray::fromHex("ffff")); QTRY_VERIFY_WITH_TIMEOUT(!errorSpy.isEmpty(), 2000); QCOMPARE(errorSpy[0].at(0).value<QLowEnergyService::ServiceError>(), QLowEnergyService::OperationError); QCOMPARE(service->error(), QLowEnergyService::OperationError); - QCOMPARE(writeSpy.count(), 0); + QCOMPARE(writeSpy.size(), 0); QCOMPARE(configChar.value(), QByteArray::fromHex("00")); // invalid characteristics still belong to their respective service @@ -1833,8 +1833,8 @@ void tst_QLowEnergyController::tst_readWriteDescriptor() QSignalSpy discoveryFinishedSpy(control.data(), SIGNAL(discoveryFinished())); QSignalSpy stateSpy(control.data(), SIGNAL(stateChanged(QLowEnergyController::ControllerState))); control->discoverServices(); - QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.count() == 1, 20000); - QCOMPARE(stateSpy.count(), 2); + QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.size() == 1, 20000); + QCOMPARE(stateSpy.size(), 2); QCOMPARE(stateSpy.at(0).at(0).value<QLowEnergyController::ControllerState>(), QLowEnergyController::DiscoveringState); QCOMPARE(stateSpy.at(1).at(0).value<QLowEnergyController::ControllerState>(), @@ -1921,10 +1921,10 @@ void tst_QLowEnergyController::tst_readWriteDescriptor() // first signal is confirmation of humidConfig write // subsequent signals are temp data updates - QTRY_VERIFY_WITH_TIMEOUT(charWrittenSpy.count() == 1, 10000); - QTRY_VERIFY_WITH_TIMEOUT(charChangedSpy.count() >= 4, 10000); + QTRY_VERIFY_WITH_TIMEOUT(charWrittenSpy.size() == 1, 10000); + QTRY_VERIFY_WITH_TIMEOUT(charChangedSpy.size() >= 4, 10000); - QCOMPARE(charWrittenSpy.count(), 1); + QCOMPARE(charWrittenSpy.size(), 1); QLowEnergyCharacteristic writtenChar = charWrittenSpy[0].at(0).value<QLowEnergyCharacteristic>(); QByteArray writtenValue = charWrittenSpy[0].at(1).toByteArray(); QCOMPARE(humidConfig, writtenChar); @@ -1940,7 +1940,7 @@ void tst_QLowEnergyController::tst_readWriteDescriptor() QCOMPARE(humidData, ch); //check last characteristic changed value matches the characteristics current value - if (i == (charChangedSpy.count() - 1)) { + if (i == (charChangedSpy.size() - 1)) { writtenValue = entry[1].toByteArray(); QCOMPARE(ch.value(), writtenValue); QCOMPARE(humidData.value(), writtenValue); @@ -1954,7 +1954,7 @@ void tst_QLowEnergyController::tst_readWriteDescriptor() service->readDescriptor(notification); QTRY_VERIFY_WITH_TIMEOUT(!descReadSpy.isEmpty(), 3000); - QCOMPARE(descReadSpy.count(), 1); + QCOMPARE(descReadSpy.size(), 1); firstSignalData = descReadSpy.first(); signalDesc = firstSignalData[0].value<QLowEnergyDescriptor>(); signalValue = firstSignalData[1].toByteArray(); @@ -1998,7 +1998,7 @@ void tst_QLowEnergyController::tst_readWriteDescriptor() if (isBluezDbusLE) QTest::qWait(1000); - QTRY_VERIFY_WITH_TIMEOUT(descWrittenSpy.count() == 4, 10000); + QTRY_VERIFY_WITH_TIMEOUT(descWrittenSpy.size() == 4, 10000); QCOMPARE(notification.value(), QByteArray::fromHex("0000")); for (int i = 0; i < descWrittenSpy.count(); i++) { @@ -2017,7 +2017,7 @@ void tst_QLowEnergyController::tst_readWriteDescriptor() service->readDescriptor(notification); QTRY_VERIFY_WITH_TIMEOUT(!descReadSpy.isEmpty(), 3000); - QCOMPARE(descReadSpy.count(), 1); + QCOMPARE(descReadSpy.size(), 1); firstSignalData = descReadSpy.first(); signalDesc = firstSignalData[0].value<QLowEnergyDescriptor>(); signalValue = firstSignalData[1].toByteArray(); @@ -2031,8 +2031,8 @@ void tst_QLowEnergyController::tst_readWriteDescriptor() // write wrong value -> error response required QSignalSpy errorSpy(service, SIGNAL(errorOccurred(QLowEnergyService::ServiceError))); descWrittenSpy.clear(); - QCOMPARE(errorSpy.count(), 0); - QCOMPARE(descWrittenSpy.count(), 0); + QCOMPARE(errorSpy.size(), 0); + QCOMPARE(descWrittenSpy.size(), 0); // write 4 byte value to 2 byte characteristic service->writeDescriptor(notification, QByteArray::fromHex("11112222")); @@ -2048,7 +2048,7 @@ void tst_QLowEnergyController::tst_readWriteDescriptor() QCOMPARE(errorSpy[0].at(0).value<QLowEnergyService::ServiceError>(), QLowEnergyService::DescriptorWriteError); QCOMPARE(service->error(), QLowEnergyService::DescriptorWriteError); - QCOMPARE(descWrittenSpy.count(), 0); + QCOMPARE(descWrittenSpy.size(), 0); QCOMPARE(notification.value(), QByteArray::fromHex("0000")); control->disconnectFromDevice(); @@ -2063,7 +2063,7 @@ void tst_QLowEnergyController::tst_readWriteDescriptor() QCOMPARE(errorSpy[0].at(0).value<QLowEnergyService::ServiceError>(), QLowEnergyService::OperationError); QCOMPARE(service->error(), QLowEnergyService::OperationError); - QCOMPARE(descWrittenSpy.count(), 0); + QCOMPARE(descWrittenSpy.size(), 0); QCOMPARE(notification.value(), QByteArray::fromHex("0000")); delete service; @@ -2127,8 +2127,8 @@ void tst_QLowEnergyController::tst_customProgrammableDevice() QSignalSpy discoveryFinishedSpy(control.data(), SIGNAL(discoveryFinished())); QSignalSpy stateSpy(control.data(), SIGNAL(stateChanged(QLowEnergyController::ControllerState))); control->discoverServices(); - QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.count() == 1, 20000); - QCOMPARE(stateSpy.count(), 2); + QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.size() == 1, 20000); + QCOMPARE(stateSpy.size(), 2); QCOMPARE(stateSpy.at(0).at(0).value<QLowEnergyController::ControllerState>(), QLowEnergyController::DiscoveringState); QCOMPARE(stateSpy.at(1).at(0).value<QLowEnergyController::ControllerState>(), @@ -2160,7 +2160,7 @@ void tst_QLowEnergyController::tst_customProgrammableDevice() service->readCharacteristic(encryptedChar); QTRY_VERIFY_WITH_TIMEOUT(!encryptedReadSpy.isEmpty(), 10000); QVERIFY(encryptedErrorSpy.isEmpty()); - QCOMPARE(encryptedReadSpy.count(), 1); + QCOMPARE(encryptedReadSpy.size(), 1); QList<QVariant> entry = encryptedReadSpy[0]; QVERIFY(entry[0].value<QLowEnergyCharacteristic>() == encryptedChar); QCOMPARE(entry[1].toByteArray(), encryptedReference); @@ -2176,7 +2176,7 @@ void tst_QLowEnergyController::tst_customProgrammableDevice() QTRY_VERIFY_WITH_TIMEOUT(!encryptedWriteSpy.isEmpty(), 10000); QVERIFY(encryptedErrorSpy.isEmpty()); QVERIFY(encryptedReadSpy.isEmpty()); - QCOMPARE(encryptedWriteSpy.count(), 1); + QCOMPARE(encryptedWriteSpy.size(), 1); entry = encryptedWriteSpy[0]; QVERIFY(entry[0].value<QLowEnergyCharacteristic>() == encryptedChar); QCOMPARE(entry[1].toByteArray(), newValue); @@ -2208,7 +2208,7 @@ void tst_QLowEnergyController::tst_customProgrammableDevice() service->readCharacteristic(softwareRevChar); QTRY_VERIFY_WITH_TIMEOUT(!readSpy.isEmpty(), 10000); QVERIFY(errorSpy.isEmpty()); - QCOMPARE(readSpy.count(), 1); + QCOMPARE(readSpy.size(), 1); entry = readSpy[0]; QVERIFY(entry[0].value<QLowEnergyCharacteristic>() == softwareRevChar); QCOMPARE(entry[1].toByteArray(), expectedSoftRev); @@ -2233,7 +2233,7 @@ void tst_QLowEnergyController::tst_customProgrammableDevice() service->readCharacteristic(manufacturerChar); QTRY_VERIFY_WITH_TIMEOUT(!readSpy.isEmpty(), 10000); QVERIFY(errorSpy.isEmpty()); - QCOMPARE(readSpy.count(), 1); + QCOMPARE(readSpy.size(), 1); entry = readSpy[0]; QVERIFY(entry[0].value<QLowEnergyCharacteristic>() == manufacturerChar); QCOMPARE(entry[1].toByteArray(), expectedManufacturer); @@ -2281,8 +2281,8 @@ void tst_QLowEnergyController::tst_errorCases() QSignalSpy discoveryFinishedSpy(control.data(), SIGNAL(discoveryFinished())); QSignalSpy stateSpy(control.data(), SIGNAL(stateChanged(QLowEnergyController::ControllerState))); control->discoverServices(); - QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.count() == 1, 20000); - QCOMPARE(stateSpy.count(), 2); + QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.size() == 1, 20000); + QCOMPARE(stateSpy.size(), 2); QCOMPARE(stateSpy.at(0).at(0).value<QLowEnergyController::ControllerState>(), QLowEnergyController::DiscoveringState); QCOMPARE(stateSpy.at(1).at(0).value<QLowEnergyController::ControllerState>(), @@ -2339,7 +2339,7 @@ void tst_QLowEnergyController::tst_errorCases() // read invalid characteristic irService->readCharacteristic(invalidChar); QTRY_VERIFY_WITH_TIMEOUT(!irErrorSpy.isEmpty(), 5000); - QCOMPARE(irErrorSpy.count(), 1); + QCOMPARE(irErrorSpy.size(), 1); QVERIFY(irWrittenSpy.isEmpty()); QVERIFY(irReadSpy.isEmpty()); QCOMPARE(irErrorSpy[0].at(0).value<QLowEnergyService::ServiceError>(), @@ -2349,7 +2349,7 @@ void tst_QLowEnergyController::tst_errorCases() // read invalid descriptor irService->readDescriptor(invalidDesc); QTRY_VERIFY_WITH_TIMEOUT(!irErrorSpy.isEmpty(), 5000); - QCOMPARE(irErrorSpy.count(), 1); + QCOMPARE(irErrorSpy.size(), 1); QVERIFY(irDescWrittenSpy.isEmpty()); QVERIFY(irDescReadSpy.isEmpty()); QCOMPARE(irErrorSpy[0].at(0).value<QLowEnergyService::ServiceError>(), @@ -2359,7 +2359,7 @@ void tst_QLowEnergyController::tst_errorCases() // write invalid characteristic irService->writeCharacteristic(invalidChar, QByteArray("foo")); QTRY_VERIFY_WITH_TIMEOUT(!irErrorSpy.isEmpty(), 5000); - QCOMPARE(irErrorSpy.count(), 1); + QCOMPARE(irErrorSpy.size(), 1); QVERIFY(irWrittenSpy.isEmpty()); QVERIFY(irReadSpy.isEmpty()); QCOMPARE(irErrorSpy[0].at(0).value<QLowEnergyService::ServiceError>(), @@ -2369,7 +2369,7 @@ void tst_QLowEnergyController::tst_errorCases() // write invalid descriptor irService->readDescriptor(invalidDesc); QTRY_VERIFY_WITH_TIMEOUT(!irErrorSpy.isEmpty(), 5000); - QCOMPARE(irErrorSpy.count(), 1); + QCOMPARE(irErrorSpy.size(), 1); QVERIFY(irDescWrittenSpy.isEmpty()); QVERIFY(irDescReadSpy.isEmpty()); QCOMPARE(irErrorSpy[0].at(0).value<QLowEnergyService::ServiceError>(), @@ -2383,7 +2383,7 @@ void tst_QLowEnergyController::tst_errorCases() // read invalid characteristic oadService->readCharacteristic(invalidChar); QTRY_VERIFY_WITH_TIMEOUT(!oadErrorSpy.isEmpty(), 5000); - QCOMPARE(oadErrorSpy.count(), 1); + QCOMPARE(oadErrorSpy.size(), 1); QCOMPARE(oadErrorSpy[0].at(0).value<QLowEnergyService::ServiceError>(), QLowEnergyService::OperationError); oadErrorSpy.clear(); @@ -2391,7 +2391,7 @@ void tst_QLowEnergyController::tst_errorCases() // read invalid descriptor oadService->readDescriptor(invalidDesc); QTRY_VERIFY_WITH_TIMEOUT(!oadErrorSpy.isEmpty(), 5000); - QCOMPARE(oadErrorSpy.count(), 1); + QCOMPARE(oadErrorSpy.size(), 1); QCOMPARE(oadErrorSpy[0].at(0).value<QLowEnergyService::ServiceError>(), QLowEnergyService::OperationError); oadErrorSpy.clear(); @@ -2399,7 +2399,7 @@ void tst_QLowEnergyController::tst_errorCases() // write invalid characteristic oadService->writeCharacteristic(invalidChar, QByteArray("foo")); QTRY_VERIFY_WITH_TIMEOUT(!oadErrorSpy.isEmpty(), 5000); - QCOMPARE(oadErrorSpy.count(), 1); + QCOMPARE(oadErrorSpy.size(), 1); QCOMPARE(oadErrorSpy[0].at(0).value<QLowEnergyService::ServiceError>(), QLowEnergyService::OperationError); oadErrorSpy.clear(); @@ -2407,7 +2407,7 @@ void tst_QLowEnergyController::tst_errorCases() // write invalid descriptor oadService->readDescriptor(invalidDesc); QTRY_VERIFY_WITH_TIMEOUT(!oadErrorSpy.isEmpty(), 5000); - QCOMPARE(oadErrorSpy.count(), 1); + QCOMPARE(oadErrorSpy.size(), 1); QCOMPARE(oadErrorSpy[0].at(0).value<QLowEnergyService::ServiceError>(), QLowEnergyService::OperationError); oadErrorSpy.clear(); @@ -2459,7 +2459,7 @@ void tst_QLowEnergyController::tst_errorCases() QVERIFY(oadChar.isValid()); oadService->readCharacteristic(oadChar); QTRY_VERIFY_WITH_TIMEOUT(!oadErrorSpy.isEmpty(), 5000); - QCOMPARE(oadErrorSpy.count(), 1); + QCOMPARE(oadErrorSpy.size(), 1); QVERIFY(oadCharReadSpy.isEmpty()); QCOMPARE(oadErrorSpy[0].at(0).value<QLowEnergyService::ServiceError>(), QLowEnergyService::CharacteristicReadError); @@ -2506,8 +2506,8 @@ void tst_QLowEnergyController::tst_writeCharacteristicNoResponse() QSignalSpy discoveryFinishedSpy(control.data(), SIGNAL(discoveryFinished())); QSignalSpy stateSpy(control.data(), SIGNAL(stateChanged(QLowEnergyController::ControllerState))); control->discoverServices(); - QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.count() == 1, 20000); - QCOMPARE(stateSpy.count(), 2); + QTRY_VERIFY_WITH_TIMEOUT(discoveryFinishedSpy.size() == 1, 20000); + QCOMPARE(stateSpy.size(), 2); QCOMPARE(stateSpy.at(0).at(0).value<QLowEnergyController::ControllerState>(), QLowEnergyController::DiscoveringState); QCOMPARE(stateSpy.at(1).at(0).value<QLowEnergyController::ControllerState>(), @@ -2594,7 +2594,7 @@ void tst_QLowEnergyController::tst_writeCharacteristicNoResponse() QVERIFY(charReadSpy.isEmpty()); service->readCharacteristic(imageIdentityChar); QTRY_VERIFY_WITH_TIMEOUT(!errorSpy.isEmpty(), 10000); - QCOMPARE(errorSpy.count(), 1); // should throw CharacteristicReadError + QCOMPARE(errorSpy.size(), 1); // should throw CharacteristicReadError QVERIFY(charReadSpy.isEmpty()); entry = errorSpy[0]; QCOMPARE(entry[0].value<QLowEnergyService::ServiceError>(), @@ -2607,8 +2607,8 @@ void tst_QLowEnergyController::tst_writeCharacteristicNoResponse() // Write triggers a notification and write confirmation service->writeCharacteristic(imageIdentityChar, QByteArray::fromHex("0")); QTest::qWait(1000); - QTRY_COMPARE_WITH_TIMEOUT(charChangedSpy.count(), 1, 5000); - QTRY_COMPARE_WITH_TIMEOUT(charWrittenSpy.count(), 1, 5000); + QTRY_COMPARE_WITH_TIMEOUT(charChangedSpy.size(), 1, 5000); + QTRY_COMPARE_WITH_TIMEOUT(charWrittenSpy.size(), 1, 5000); // This is very SensorTag specific logic. // If the image block is empty the current firmware @@ -2643,8 +2643,8 @@ void tst_QLowEnergyController::tst_writeCharacteristicNoResponse() // Image B service->writeCharacteristic(imageIdentityChar, QByteArray::fromHex("1")); QTest::qWait(1000); - QTRY_COMPARE_WITH_TIMEOUT(charChangedSpy.count(), 1, 5000); - QTRY_COMPARE_WITH_TIMEOUT(charWrittenSpy.count(), 1, 5000);; + QTRY_COMPARE_WITH_TIMEOUT(charChangedSpy.size(), 1, 5000); + QTRY_COMPARE_WITH_TIMEOUT(charWrittenSpy.size(), 1, 5000);; entry = charChangedSpy[0]; first = entry[0].value<QLowEnergyCharacteristic>(); @@ -2689,8 +2689,8 @@ void tst_QLowEnergyController::tst_writeCharacteristicNoResponse() // we only expect one signal (the notification but not the write confirmation) // Wait at least a second for a potential second signals QTest::qWait(1000); - QTRY_COMPARE_WITH_TIMEOUT(charChangedSpy.count(), 1, 10000); - QTRY_COMPARE_WITH_TIMEOUT(charWrittenSpy.count(), 0, 10000); + QTRY_COMPARE_WITH_TIMEOUT(charChangedSpy.size(), 1, 10000); + QTRY_COMPARE_WITH_TIMEOUT(charWrittenSpy.size(), 0, 10000); entry = charChangedSpy[0]; first = entry[0].value<QLowEnergyCharacteristic>(); @@ -2725,8 +2725,8 @@ void tst_QLowEnergyController::tst_writeCharacteristicNoResponse() // we only expect one signal (the notification but not the write confirmation) // Wait at least a second for a potential second signals QTest::qWait(1000); - QTRY_COMPARE_WITH_TIMEOUT(charWrittenSpy.count(), 0, 10000); - QTRY_COMPARE_WITH_TIMEOUT(charChangedSpy.count(), 1, 10000); + QTRY_COMPARE_WITH_TIMEOUT(charWrittenSpy.size(), 0, 10000); + QTRY_COMPARE_WITH_TIMEOUT(charChangedSpy.size(), 1, 10000); entry = charChangedSpy[0]; first = entry[0].value<QLowEnergyCharacteristic>(); diff --git a/tests/auto/qndefmessage/tst_qndefmessage.cpp b/tests/auto/qndefmessage/tst_qndefmessage.cpp index 149ddbae..78bef726 100644 --- a/tests/auto/qndefmessage/tst_qndefmessage.cpp +++ b/tests/auto/qndefmessage/tst_qndefmessage.cpp @@ -533,7 +533,7 @@ void tst_QNdefMessage::parseSingleRecordMessage() QCOMPARE(textRecord.text(), parsedTextRecord.text()); QCOMPARE(textRecord.locale(), parsedTextRecord.locale()); - if (expectedData.count() == 2) { + if (expectedData.size() == 2) { QCOMPARE(parsedTextRecord.text(), expectedData.at(0).toString()); QCOMPARE(parsedTextRecord.locale(), expectedData.at(1).toString()); } @@ -543,7 +543,7 @@ void tst_QNdefMessage::parseSingleRecordMessage() QCOMPARE(uriRecord.uri(), parsedUriRecord.uri()); - if (expectedData.count() == 1) + if (expectedData.size() == 1) QCOMPARE(parsedUriRecord.uri(), expectedData.at(0).toUrl()); } else if (record.isRecordType<QNdefRecord>()) { QVERIFY(record.isEmpty()); diff --git a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp index 5367e747..54dc3a8f 100644 --- a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp +++ b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp @@ -114,7 +114,7 @@ void tst_QNearFieldManager::userInformation() const QString errorString("Failed to detect NFC targets"); manager.stopTargetDetection(errorString); - QCOMPARE(spy.count(), 2); + QCOMPARE(spy.size(), 2); QCOMPARE(spy.at(0).at(0).toString(), progressString); QCOMPARE(spy.at(1).at(0).toString(), errorString); } @@ -175,7 +175,7 @@ void tst_QNearFieldManager::targetDetected() manager.stopTargetDetection(); - QCOMPARE(detectionStoppedSpy.count(), 1); + QCOMPARE(detectionStoppedSpy.size(), 1); } QTEST_MAIN(tst_QNearFieldManager) diff --git a/tests/bttestui/btlocaldevice.cpp b/tests/bttestui/btlocaldevice.cpp index e4022ede..29289d3f 100644 --- a/tests/bttestui/btlocaldevice.cpp +++ b/tests/bttestui/btlocaldevice.cpp @@ -368,7 +368,7 @@ void BtLocalDevice::dumpServiceDiscovery() qDebug() << "Device Discovery active:" << deviceAgent->isActive(); qDebug() << "Error:" << deviceAgent->error() << deviceAgent->errorString(); const QList<QBluetoothDeviceInfo> list = deviceAgent->discoveredDevices(); - qDebug() << "Discovered Devices:" << list.count(); + qDebug() << "Discovered Devices:" << list.size(); for (const QBluetoothDeviceInfo &info : list) qDebug() << info.name() << info.address().toString() << info.rssi(); @@ -377,7 +377,7 @@ void BtLocalDevice::dumpServiceDiscovery() qDebug() << "Service Discovery active:" << serviceAgent->isActive(); qDebug() << "Error:" << serviceAgent->error() << serviceAgent->errorString(); const QList<QBluetoothServiceInfo> list = serviceAgent->discoveredServices(); - qDebug() << "Discovered Services:" << list.count(); + qDebug() << "Discovered Services:" << list.size(); for (const QBluetoothServiceInfo &i : list) { qDebug() << i.device().address().toString() << i.device().name() << i.serviceName(); @@ -748,7 +748,7 @@ void BtLocalDevice::dumpInformation() qDebug() << "###### default local device"; dumpLocalDevice(localDevice); const QList<QBluetoothHostInfo> list = QBluetoothLocalDevice::allDevices(); - qDebug() << "Found local devices: " << list.count(); + qDebug() << "Found local devices: " << list.size(); for (const QBluetoothHostInfo &info : list) { qDebug() << " " << info.address().toString() << " " <<info.name(); } diff --git a/tests/manual/qlowenergycontroller/tst_qlowenergycontroller_device.cpp b/tests/manual/qlowenergycontroller/tst_qlowenergycontroller_device.cpp index 7c8b67ec..32932f65 100644 --- a/tests/manual/qlowenergycontroller/tst_qlowenergycontroller_device.cpp +++ b/tests/manual/qlowenergycontroller/tst_qlowenergycontroller_device.cpp @@ -331,8 +331,8 @@ void tst_qlowenergycontroller_device::readWriteLargeCharacteristic() QSignalSpy readSpy(service.get(), &QLowEnergyService::characteristicRead); QSignalSpy writtenSpy(service.get(), &QLowEnergyService::characteristicWritten); - QCOMPARE(readSpy.count(), 0); - QCOMPARE(writtenSpy.count(), 0); + QCOMPARE(readSpy.size(), 0); + QCOMPARE(writtenSpy.size(), 0); // The service discovery skipped the values => check that the default value is all zeroes auto characteristic = service->characteristic(QBluetoothUuid(largeCharacteristicCharUuid)); @@ -342,7 +342,7 @@ void tst_qlowenergycontroller_device::readWriteLargeCharacteristic() // Read the characteristic value and verify it is the one the server-side sets (0x0b 0x00 ..) service->readCharacteristic(characteristic); - QTRY_COMPARE(readSpy.count(), 1); + QTRY_COMPARE(readSpy.size(), 1); qDebug() << "Large characteristic value after read:" << characteristic.value(); testArray = QByteArray(512, 0); testArray[0] = 0x0b; @@ -354,10 +354,10 @@ void tst_qlowenergycontroller_device::readWriteLargeCharacteristic() } service->writeCharacteristic(characteristic, testArray); QCOMPARE(service->error(), QLowEnergyService::ServiceError::NoError); - QTRY_COMPARE(writtenSpy.count(), 1); + QTRY_COMPARE(writtenSpy.size(), 1); service->readCharacteristic(characteristic); - QTRY_COMPARE(readSpy.count(), 2); + QTRY_COMPARE(readSpy.size(), 2); qDebug() << "Large characteristic value after write/read:" << characteristic.value(); QCOMPARE(characteristic.value(), testArray); } @@ -378,8 +378,8 @@ void tst_qlowenergycontroller_device::readDuringServiceDiscovery() QSignalSpy readSpy(service.get(), &QLowEnergyService::characteristicRead); QSignalSpy writtenSpy(service.get(), &QLowEnergyService::characteristicWritten); - QCOMPARE(readSpy.count(), 0); - QCOMPARE(writtenSpy.count(), 0); + QCOMPARE(readSpy.size(), 0); + QCOMPARE(writtenSpy.size(), 0); // Value that is initially set on the characteristic at the server-side (0x0b 0x00 ..) QByteArray testArray(512, 0); @@ -396,7 +396,7 @@ void tst_qlowenergycontroller_device::readDuringServiceDiscovery() // Check that the value from service discovery and explicit characteristic read match service->readCharacteristic(characteristic); - QTRY_COMPARE(readSpy.count(), 1); + QTRY_COMPARE(readSpy.size(), 1); qDebug() << "Large characteristic value after read:" << characteristic.value(); QCOMPARE(characteristic.value(), valueFromServiceDiscovery); @@ -406,10 +406,10 @@ void tst_qlowenergycontroller_device::readDuringServiceDiscovery() } service->writeCharacteristic(characteristic, testArray); QCOMPARE(service->error(), QLowEnergyService::ServiceError::NoError); - QTRY_COMPARE(writtenSpy.count(), 1); + QTRY_COMPARE(writtenSpy.size(), 1); service->readCharacteristic(characteristic); - QTRY_COMPARE(readSpy.count(), 2); + QTRY_COMPARE(readSpy.size(), 2); qDebug() << "Large characteristic value after write/read:" << characteristic.value(); QCOMPARE(characteristic.value(), testArray); } |