diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-03 14:38:11 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-03 23:45:06 +0100 |
commit | 91371ffd3d00e10635f58d1e9efe8c1b3f467537 (patch) | |
tree | 50a6b7f885721b6db2c0a8fcbb2a547e216102fb /tests/auto/qbluetoothtransfermanager | |
parent | 3336383132b1aafeb74585d203e98e85811af55e (diff) |
QtConnectivity: Fix test crashes/asserts/hangs.
- Fix crash caused by uninitialized d-ptr in local device
default implementation (Windows).
- Fix crash caused by uninitialized d-ptr in local device
bluez implementation (Linux) if connection fails.
- Verify local device validity before d-ptr is accessed in
test
- Fix crash in QNdefNfcUriRecord::uri() in case
abbreviations[0] (==0) is accessed.
- Terminate wait loops
- Check signal spy before accessing first element.
- Fix compiler warnings.
Change-Id: I92d54b4dfcc05e8befb49f2bd72b60251641aa48
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'tests/auto/qbluetoothtransfermanager')
-rw-r--r-- | tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp b/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp index b14329f3..14d85617 100644 --- a/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp +++ b/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp @@ -135,11 +135,8 @@ void tst_QBluetoothTransferManager::initTestCase() sda->setUuidFilter(QBluetoothUuid(QString(ECHO_SERVICE_UUID))); sda->start(QBluetoothServiceDiscoveryAgent::MinimalDiscovery); - int connectTime = MaxConnectTime; - while (!done_discovery) { + for (int connectTime = MaxConnectTime; !done_discovery && connectTime > 0; connectTime -= 1000) QTest::qWait(1000); - connectTime -= 1000; - } sda->stop(); |