QBluetoothServiceDiscoveryAgent - auto test on OS X

Enable this test back (removing 'insignificant') + modify a test to
make it pass if BT adapter is OFF.

Change-Id: Ia2951eeed75a6695ed9ac8fc803cb2ba6668e469
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

1 files changed, 9 insertions, 0 deletions

diff --git a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
index f9e7ef1a..341c6918 100644
--- a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
+++ b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
@@ -84,6 +84,7 @@ tst_QBluetoothServiceDiscoveryAgent::tst_QBluetoothServiceDiscoveryAgent()
     QLoggingCategory::setFilterRules(QStringLiteral("qt.bluetooth* = true"));
 
     // start Bluetooth if not started
+#ifndef Q_OS_OSX
     QBluetoothLocalDevice *device = new QBluetoothLocalDevice();
     localDeviceAvailable = device->isValid();
     if (localDeviceAvailable) {
@@ -92,6 +93,10 @@ tst_QBluetoothServiceDiscoveryAgent::tst_QBluetoothServiceDiscoveryAgent()
         QTest::qWait(1000);
     }
     delete device;
+#else
+    QBluetoothLocalDevice device;
+    localDeviceAvailable = QBluetoothLocalDevice().hostMode() != QBluetoothLocalDevice::HostPoweredOff;
+#endif
 
     qRegisterMetaType<QBluetoothDeviceInfo>("QBluetoothDeviceInfo");
     qRegisterMetaType<QBluetoothServiceInfo>("QBluetoothServiceInfo");
@@ -147,6 +152,10 @@ void tst_QBluetoothServiceDiscoveryAgent::initTestCase()
 
 void tst_QBluetoothServiceDiscoveryAgent::tst_invalidBtAddress()
 {
+#ifdef Q_OS_OSX
+    if (!localDeviceAvailable)
+        QSKIP("On OS X this test requires Bluetooth adapter in powered ON state");
+#endif
     QBluetoothServiceDiscoveryAgent *discoveryAgent = new QBluetoothServiceDiscoveryAgent(QBluetoothAddress("11:11:11:11:11:11"));
 
     QCOMPARE(discoveryAgent->error(), QBluetoothServiceDiscoveryAgent::InvalidBluetoothAdapterError);