diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2014-07-07 11:20:52 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@digia.com> | 2014-07-15 20:39:43 +0200 |
commit | 300d662579d9cf2d6a311fe73374bd75aebea2c5 (patch) | |
tree | 2ba40a052b2ab7b408d25a08296d7e842515a463 | |
parent | fd85f6fc28061fd162cdc41dbe5c9c70e066c34b (diff) | |
download | qtconnectivity-300d662579d9cf2d6a311fe73374bd75aebea2c5.tar.gz |
Add code to test service discovery on specific remote device
Change-Id: I548d17928fb371ba7dbf2010efb6995bc6f5ff2d
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
-rw-r--r-- | tests/bttestui/btlocaldevice.cpp | 20 | ||||
-rw-r--r-- | tests/bttestui/btlocaldevice.h | 1 | ||||
-rw-r--r-- | tests/bttestui/main.qml | 5 |
3 files changed, 26 insertions, 0 deletions
diff --git a/tests/bttestui/btlocaldevice.cpp b/tests/bttestui/btlocaldevice.cpp index f08a175c..8c85599f 100644 --- a/tests/bttestui/btlocaldevice.cpp +++ b/tests/bttestui/btlocaldevice.cpp @@ -256,6 +256,8 @@ void BtLocalDevice::stopDiscovery() void BtLocalDevice::startServiceDiscovery(bool isMinimalDiscovery) { if (serviceAgent) { + serviceAgent->setRemoteAddress(QBluetoothAddress()); + qDebug() << "###### Starting service discovery process"; serviceAgent->start(isMinimalDiscovery ? QBluetoothServiceDiscoveryAgent::MinimalDiscovery @@ -263,6 +265,24 @@ void BtLocalDevice::startServiceDiscovery(bool isMinimalDiscovery) } } +void BtLocalDevice::startTargettedServiceDiscovery() +{ + if (serviceAgent) { + const QBluetoothAddress baddr(BTCHAT_DEVICE_ADDR); + qDebug() << "###### Starting service discovery on" + << baddr.toString(); + if (baddr.isNull()) + return; + + if (!serviceAgent->setRemoteAddress(baddr)) { + qWarning() << "###### Cannot set remote address. Aborting"; + return; + } + + serviceAgent->start(); + } +} + void BtLocalDevice::stopServiceDiscovery() { if (serviceAgent) { diff --git a/tests/bttestui/btlocaldevice.h b/tests/bttestui/btlocaldevice.h index 759599b7..01d9b0df 100644 --- a/tests/bttestui/btlocaldevice.h +++ b/tests/bttestui/btlocaldevice.h @@ -87,6 +87,7 @@ public slots: //QBluetoothServiceDiscoveryAgent void startServiceDiscovery(bool isMinimalDiscovery); + void startTargettedServiceDiscovery(); void stopServiceDiscovery(); void serviceDiscovered(const QBluetoothServiceInfo &info); void serviceDiscoveryFinished(); diff --git a/tests/bttestui/main.qml b/tests/bttestui/main.qml index d53aa4e1..93d943f2 100644 --- a/tests/bttestui/main.qml +++ b/tests/bttestui/main.qml @@ -168,6 +168,11 @@ Rectangle { onClicked: device.startServiceDiscovery(false) } Button { + id: startRemoteSDiscBtn + buttonText: "StartRemSDisc" + onClicked: device.startTargettedServiceDiscovery() + } + Button { buttonText: "StopSDisc" onClicked: device.stopServiceDiscovery(); } |