diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2013-10-10 12:09:55 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-11 13:11:52 +0200 |
commit | 8155679b01ec523d877bcb1d6d019b3b555befaa (patch) | |
tree | cdacff719274d632bc02011a6deb9cd142226f74 /tests | |
parent | 42bd6c83b19f789821c4fde414f1ef457dce120d (diff) |
Improve handling of invalid Bt address by QBluetoothTransferManager
Some minor unit test improvements
Task-number: QTBUG-33801
Change-Id: Idc98bf8928ced0f9e01b24668edf7c32172d2fd1
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp b/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp index 5c9ea9f0..885b7f1e 100644 --- a/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp +++ b/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp @@ -276,7 +276,7 @@ void tst_QBluetoothTransferManager::tst_sendFile() QBluetoothLocalDevice dev; if (expectSuccess) { dev.requestPairing(deviceAddress, QBluetoothLocalDevice::Paired); - QTest::qWait(2000); + QTest::qWait(5000); QCOMPARE(dev.pairingStatus(deviceAddress), QBluetoothLocalDevice::Paired); } @@ -289,8 +289,7 @@ void tst_QBluetoothTransferManager::tst_sendFile() fileHandle = QFINDTESTDATA("testfile.txt"); QVERIFY(!fileHandle.isEmpty()); } else { - fileHandle = QFINDTESTDATA("arbitraryFileName.txt"); //file doesn't exist - QVERIFY(fileHandle.isEmpty()); + fileHandle = ("arbitraryFileName.txt"); //file doesn't exist } QFile f(fileHandle); QCOMPARE(f.exists(), !isInvalidFile); @@ -311,8 +310,8 @@ void tst_QBluetoothTransferManager::tst_sendFile() const int maxWaitTime = 20 * 1000; //20s for (int time = 0; time<maxWaitTime && (finishedSpy.count()==0); - time+=10000) { - QTest::qWait(10000); //if interval + time+=1000) { + QTest::qWait(1000); //if interval } QVERIFY(finishedSpy.count()>0); |