diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2012-02-08 11:54:11 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-08 04:38:16 +0100 |
commit | e241932c974f4b5e36052e4a37e718d9ec3c227b (patch) | |
tree | 741c280363e085a2477a4aae8ddd43f0897d2995 /tests/auto/unit/qcamera/tst_qcamera.cpp | |
parent | 6de7c3104006c3aa919a697bc94ec99a3f0c4140 (diff) |
Remove some more QTest::qWait(10) calls.
Since it seems to have changed slightly recently. Just use
QTRY_COMPARE instead.
Change-Id: I802c2e26acf5418bb5904fadd2a978a44fd9eb01
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'tests/auto/unit/qcamera/tst_qcamera.cpp')
-rw-r--r-- | tests/auto/unit/qcamera/tst_qcamera.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp index 08bd953c8..565a8c2c8 100644 --- a/tests/auto/unit/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/qcamera/tst_qcamera.cpp @@ -475,10 +475,7 @@ void tst_QCamera::testCameraCapture() imageCapture.capture(QString::fromLatin1("/dev/null")); - for (int i=0; i<100 && capturedSignal.isEmpty(); i++) - QTest::qWait(10); - - QCOMPARE(capturedSignal.size(), 1); + QTRY_COMPARE(capturedSignal.size(), 1); QCOMPARE(errorSignal.size(), 0); QCOMPARE(imageCapture.error(), QCameraImageCapture::NoError); } @@ -494,10 +491,7 @@ void tst_QCamera::testCameraCaptureMetadata() camera.start(); int id = imageCapture.capture(QString::fromLatin1("/dev/null")); - for (int i=0; i<100 && savedSignal.isEmpty(); i++) - QTest::qWait(10); - - QCOMPARE(savedSignal.size(), 1); + QTRY_COMPARE(savedSignal.size(), 1); QCOMPARE(metadataSignal.size(), 3); @@ -885,10 +879,7 @@ void tst_QCamera::testCameraLock() lockFailedSignal.clear(); lockStatusChangedSignal.clear(); - for (int i=0; i<200 && camera.lockStatus() == QCamera::Searching; i++) - QTest::qWait(10); - - QCOMPARE(camera.lockStatus(), QCamera::Locked); + QTRY_COMPARE(camera.lockStatus(), QCamera::Locked); QCOMPARE(lockedSignal.count(), 1); QCOMPARE(lockFailedSignal.count(), 0); QCOMPARE(lockStatusChangedSignal.count(), 1); |