From b2cebb6530fecedfa1facd8e7ff7020a4147b803 Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@digia.com>
Date: Tue, 1 Jul 2014 12:58:25 +0200
Subject: Add ability to abort server sockets via bttestui

This equalizes the behavior of the Close and Abort button. Abort will
disconnect the local client socket as well as all sockets which were
established via the listening server socket.

Change-Id: I68d3d7190641aab44612fa3fc00b38fdc31799a3
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
---
 tests/bttestui/btlocaldevice.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'tests/bttestui')

diff --git a/tests/bttestui/btlocaldevice.cpp b/tests/bttestui/btlocaldevice.cpp
index 251b6dfc..f08a175c 100644
--- a/tests/bttestui/btlocaldevice.cpp
+++ b/tests/bttestui/btlocaldevice.cpp
@@ -391,6 +391,12 @@ void BtLocalDevice::abortSocket()
         qDebug() << "###### Disconnecting socket";
         socket->abort();
     }
+
+    if (!serverSockets.isEmpty()) {
+        qDebug() << "###### Closing server sockets";
+        foreach (QBluetoothSocket *s, serverSockets)
+            s->abort();
+    }
 }
 
 void BtLocalDevice::socketConnected()
-- 
cgit v1.2.3


From 300d662579d9cf2d6a311fe73374bd75aebea2c5 Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@digia.com>
Date: Mon, 7 Jul 2014 11:20:52 +0200
Subject: Add code to test service discovery on specific remote device

Change-Id: I548d17928fb371ba7dbf2010efb6995bc6f5ff2d
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
---
 tests/bttestui/btlocaldevice.cpp | 20 ++++++++++++++++++++
 tests/bttestui/btlocaldevice.h   |  1 +
 tests/bttestui/main.qml          |  5 +++++
 3 files changed, 26 insertions(+)

(limited to 'tests/bttestui')

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
@@ -167,6 +167,11 @@ Rectangle {
                 buttonText: "StartFullSDisc"
                 onClicked: device.startServiceDiscovery(false)
             }
+            Button {
+                id: startRemoteSDiscBtn
+                buttonText: "StartRemSDisc"
+                onClicked: device.startTargettedServiceDiscovery()
+            }
             Button {
                 buttonText: "StopSDisc"
                 onClicked: device.stopServiceDiscovery();
-- 
cgit v1.2.3