From fb73a565747d06faec7c47490c0c509a74ff08e3 Mon Sep 17 00:00:00 2001 From: Dmytro Poplavskiy Date: Mon, 6 Feb 2012 14:12:57 +1000 Subject: Made camera unit tests more stable Replaced qWait() with QTRY_COMPARE() Change-Id: I951bd8ca1eaaf8d0fd7308a90f82afcdb0475819 Reviewed-by: Michael Goddard --- tests/auto/unit/qcamera/tst_qcamera.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'tests/auto/unit/qcamera/tst_qcamera.cpp') diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp index 83b00a338..08bd953c8 100644 --- a/tests/auto/unit/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/qcamera/tst_qcamera.cpp @@ -971,10 +971,9 @@ void tst_QCamera::testCameraEncodingProperyChange() stateChangedSignal.clear(); statusChangedSignal.clear(); - QTest::qWait(10); - QCOMPARE(camera.state(), QCamera::ActiveState); - QCOMPARE(camera.status(), QCamera::ActiveStatus); + QTRY_COMPARE(camera.status(), QCamera::ActiveStatus); + QCOMPARE(stateChangedSignal.count(), 0); QCOMPARE(statusChangedSignal.count(), 1); stateChangedSignal.clear(); @@ -986,7 +985,10 @@ void tst_QCamera::testCameraEncodingProperyChange() QCOMPARE(statusChangedSignal.count(), 0); camera.setCaptureMode(QCamera::CaptureStillImage); - QTest::qWait(10); + + QCOMPARE(camera.state(), QCamera::ActiveState); + QTRY_COMPARE(camera.status(), QCamera::ActiveStatus); + stateChangedSignal.clear(); statusChangedSignal.clear(); @@ -1000,10 +1002,9 @@ void tst_QCamera::testCameraEncodingProperyChange() stateChangedSignal.clear(); statusChangedSignal.clear(); - QTest::qWait(10); - QCOMPARE(camera.state(), QCamera::ActiveState); - QCOMPARE(camera.status(), QCamera::ActiveStatus); + QTRY_COMPARE(camera.status(), QCamera::ActiveStatus); + QCOMPARE(stateChangedSignal.count(), 0); QCOMPARE(statusChangedSignal.count(), 1); stateChangedSignal.clear(); @@ -1023,10 +1024,9 @@ void tst_QCamera::testCameraEncodingProperyChange() stateChangedSignal.clear(); statusChangedSignal.clear(); - QTest::qWait(10); - QCOMPARE(camera.state(), QCamera::ActiveState); - QCOMPARE(camera.status(), QCamera::ActiveStatus); + QTRY_COMPARE(camera.status(), QCamera::ActiveStatus); + QCOMPARE(stateChangedSignal.count(), 0); QCOMPARE(statusChangedSignal.count(), 1); } -- cgit v1.2.3