From fb73a565747d06faec7c47490c0c509a74ff08e3 Mon Sep 17 00:00:00 2001 From: Dmytro Poplavskiy Date: Mon, 6 Feb 2012 14:12:57 +1000 Subject: [PATCH] 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 +++++++++---------- .../qcamerawidgets/tst_qcamerawidgets.cpp | 19 ++++++++---------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp index 83b00a33..08bd953c 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); } diff --git a/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp b/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp index cf1f347c..45cf340a 100644 --- a/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp +++ b/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp @@ -145,10 +145,9 @@ void tst_QCameraWidgets::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(); @@ -160,7 +159,7 @@ void tst_QCameraWidgets::testCameraEncodingProperyChange() QCOMPARE(statusChangedSignal.count(), 0); camera.setCaptureMode(QCamera::CaptureStillImage); - QTest::qWait(10); + QTRY_COMPARE(camera.status(), QCamera::ActiveStatus); stateChangedSignal.clear(); statusChangedSignal.clear(); @@ -174,10 +173,9 @@ void tst_QCameraWidgets::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(); @@ -197,10 +195,9 @@ void tst_QCameraWidgets::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(); @@ -214,7 +211,7 @@ void tst_QCameraWidgets::testCameraEncodingProperyChange() QCOMPARE(stateChangedSignal.count(), 0); QCOMPARE(statusChangedSignal.count(), 1); - QTest::qWait(10); + QTRY_COMPARE(camera.status(), QCamera::ActiveStatus); mockCameraService->mockControl->m_propertyChangesSupported = true; //the changes to encoding settings,