Simplify QBluetoothTransferManager autotest

I don't think the service discovery in there does anything valuable.
Basically every device has a OPP service running.
Like this it is just time consuming and error-prone.

It would also be good to have a tool that automatically accepts the transfer on the testserver so that we can actually execute the test automatically.

Change-Id: I93b3bab32cecb8a3005cecb95a69a40813663e4d
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

1 files changed, 6 insertions, 66 deletions

diff --git a/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp b/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp
index 885b7f1e..fb2c1ad3 100644
--- a/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp
+++ b/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp
@@ -93,15 +93,8 @@ private slots:
 
     void tst_sendBuffer_data();
     void tst_sendBuffer();
-
-public slots:
-    void serviceDiscovered(const QBluetoothServiceInfo &info);
-    void finished();
-    void error(QBluetoothServiceDiscoveryAgent::Error error);
 private:
-    bool done_discovery;
     QBluetoothAddress remoteAddress;
-    QBluetoothAddress foundAddress;
 };
 
 tst_QBluetoothTransferManager::tst_QBluetoothTransferManager()
@@ -122,62 +115,16 @@ void tst_QBluetoothTransferManager::initTestCase()
         qWarning() << "Using remote device " << remote << " for testing. Ensure that the device is discoverable for pairing requests";
     } else {
         qWarning() << "Not using any remote device for testing. Set BT_TEST_DEVICE env to run manual tests involving a remote device";
+        QSKIP("Remote upload test not possible. Set BT_TEST_DEVICE");
     }
 
-
-
     if (!QBluetoothLocalDevice::allDevices().count())
         QSKIP("Skipping test due to missing Bluetooth device");
 
-    if (remoteAddress.isNull())
-        QSKIP("Remote upload test not possible. Set BT_TEST_DEVICE");
-
     // start Bluetooth if not started
     QBluetoothLocalDevice *device = new QBluetoothLocalDevice();
     device->powerOn();
     delete device;
-
-    // Go find an echo server for BTADDRESS
-    QBluetoothServiceDiscoveryAgent *sda = new QBluetoothServiceDiscoveryAgent(this);
-    connect(sda, SIGNAL(serviceDiscovered(QBluetoothServiceInfo)), this, SLOT(serviceDiscovered(QBluetoothServiceInfo)));
-    connect(sda, SIGNAL(error(QBluetoothServiceDiscoveryAgent::Error)), this, SLOT(error(QBluetoothServiceDiscoveryAgent::Error)));
-    connect(sda, SIGNAL(finished()), this, SLOT(finished()));
-
-    qDebug() << "Starting discovery";
-    done_discovery = false;
-
-    sda->setUuidFilter(QBluetoothUuid(QBluetoothUuid::ObexObjectPush));
-    sda->start(QBluetoothServiceDiscoveryAgent::MinimalDiscovery);
-
-    for (int connectTime = MaxConnectTime; !done_discovery && connectTime > 0; connectTime -= 1000)
-        QTest::qWait(1000);
-
-    sda->stop();
-
-    if (foundAddress.isNull())
-        QFAIL("Unable to find test service/device");
-
-    delete sda;
-}
-void tst_QBluetoothTransferManager::error(QBluetoothServiceDiscoveryAgent::Error error)
-{
-    qDebug() << "Received error" << error;
-    done_discovery = true;
-}
-
-void tst_QBluetoothTransferManager::finished()
-{
-    qDebug() << "Finished";
-    done_discovery = true;
-}
-
-void tst_QBluetoothTransferManager::serviceDiscovered(const QBluetoothServiceInfo &info)
-{
-    qDebug() << "Found: " << info.device().name() << info.device().address().toString() << info.serviceName();
-    if (info.device().address() == remoteAddress) {
-        foundAddress = remoteAddress;
-        done_discovery = true;
-    }
 }
 
 void tst_QBluetoothTransferManager::tst_construction()
@@ -256,12 +203,8 @@ void tst_QBluetoothTransferManager::tst_sendFile_data()
     QTest::addColumn<bool>("expectSuccess");
     QTest::addColumn<bool>("isInvalidFile");
 
-    if (foundAddress.isNull()) {
-        qDebug("Skipping send file test due to not finding remote device");
-    } else {
-        QTest::newRow("Push to remote test device") << foundAddress << true << false;
-        QTest::newRow("Push of non-existing file") << foundAddress << false << true;
-    }
+    QTest::newRow("Push to remote test device") << remoteAddress << true << false;
+    QTest::newRow("Push of non-existing file") << remoteAddress << false << true;
     QTest::newRow("Push to invalid address") << QBluetoothAddress() << false << false;
     QTest::newRow("Push to non-existend device") << QBluetoothAddress("11:22:33:44:55:66") << false << false;
 
@@ -339,13 +282,10 @@ void tst_QBluetoothTransferManager::tst_sendBuffer_data()
     QTest::addColumn<bool>("expectSuccess");
     QTest::addColumn<QByteArray>("data");
 
-    if (foundAddress.isNull())
-        qDebug("Skipping send file test due to not finding remote device");
-    else
-        QTest::newRow("Push to remote test device") << foundAddress << true <<
+    QTest::newRow("Push to remote test device") << remoteAddress << true <<
                         QByteArray("This is a very long byte arry which we are going to access via a QBuffer");                                                       ;
-    //QTest::newRow("Push to invalid address") << QBluetoothAddress() << false;
-    //QTest::newRow("Push to non-existend device") << QBluetoothAddress("11:22:33:44:55:66") << false;
+    QTest::newRow("Push to invalid address") << QBluetoothAddress() << false << QByteArray("test");
+    QTest::newRow("Push to non-existend device") << QBluetoothAddress("11:22:33:44:55:66") << false << QByteArray("test");
 }