Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl

Change-Id: I6f5b5789b64c033f10223c2147ce7a312d868230

1 files changed, 23 insertions, 0 deletions

diff --git a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
index 94a065bc..52a0c8bd 100644
--- a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
+++ b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
@@ -64,6 +64,7 @@ private slots:
     void tst_invalidBtAddress();
     void tst_serviceDiscovery_data();
     void tst_serviceDiscovery();
+    void tst_serviceDiscoveryStop();
     void tst_serviceDiscoveryAdapters();
 
 private:
@@ -141,6 +142,28 @@ void tst_QBluetoothServiceDiscoveryAgent::initTestCase()
     }
 }
 
+void tst_QBluetoothServiceDiscoveryAgent::tst_serviceDiscoveryStop()
+{
+    if (!localDeviceAvailable)
+        QSKIP("This test requires Bluetooth adapter in powered ON state");
+
+    QBluetoothServiceDiscoveryAgent discoveryAgent;
+    QSignalSpy finishedSpy(&discoveryAgent, SIGNAL(finished()));
+    QSignalSpy canceledSpy(&discoveryAgent, SIGNAL(canceled()));
+
+    // Verify we get the correct signals on start-stop
+    discoveryAgent.start(QBluetoothServiceDiscoveryAgent::FullDiscovery);
+    QVERIFY(discoveryAgent.isActive());
+    discoveryAgent.stop();
+    QTRY_COMPARE(canceledSpy.count(), 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);
+}
+
+
 void tst_QBluetoothServiceDiscoveryAgent::tst_invalidBtAddress()
 {
 #ifdef Q_OS_OSX