summaryrefslogtreecommitdiffstats
path: root/tests/auto/qlowenergycharacteristic
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qlowenergycharacteristic')
-rw-r--r--tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp b/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp
index ffed9f6f..de77046e 100644
--- a/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp
+++ b/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp
@@ -75,7 +75,7 @@ private slots:
void tst_assignCompare();
private:
- QSet<QString> remoteLeDevices;
+ QList<QBluetoothDeviceInfo> remoteLeDevices;
QLowEnergyController *globalControl;
QLowEnergyService *globalService;
};
@@ -121,9 +121,10 @@ void tst_QLowEnergyCharacteristic::initTestCase()
// find first service with descriptor
QLowEnergyController *controller = 0;
- foreach (const QString &remoteDevice, remoteLeDevices.toList()) {
- controller = new QLowEnergyController(QBluetoothAddress(remoteDevice), this);
- qDebug() << "Connecting to" << remoteDevice;
+ foreach (const QBluetoothDeviceInfo &remoteDevice, remoteLeDevices) {
+ controller = new QLowEnergyController(remoteDevice, this);
+ qDebug() << "Connecting to" << remoteDevice.name()
+ << remoteDevice.address() << remoteDevice.deviceUuid();
controller->connectToDevice();
QTRY_IMPL(controller->state() != QLowEnergyController::ConnectingState,
20000);
@@ -158,7 +159,7 @@ void tst_QLowEnergyCharacteristic::initTestCase()
if (!ch.descriptors().isEmpty()) {
globalService = leService;
globalControl = controller;
- qWarning() << "Found service with descriptor" << remoteDevice
+ qWarning() << "Found service with descriptor" << remoteDevice.address()
<< globalService->serviceName() << globalService->serviceUuid();
break;
}
@@ -191,7 +192,7 @@ void tst_QLowEnergyCharacteristic::cleanupTestCase()
void tst_QLowEnergyCharacteristic::deviceDiscovered(const QBluetoothDeviceInfo &info)
{
if (info.coreConfigurations() & QBluetoothDeviceInfo::LowEnergyCoreConfiguration)
- remoteLeDevices.insert(info.address().toString());
+ remoteLeDevices.append(info);
}
void tst_QLowEnergyCharacteristic::tst_constructionDefault()