diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-02-06 14:12:57 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-06 05:35:06 +0100 |
| commit | fb73a565747d06faec7c47490c0c509a74ff08e3 (patch) | |
| tree | 504c26d103f95db80fda720300f575af94a31baf /tests | |
| parent | 78ffd1bc18ecaf5c989187f89fba82dd53503ecc (diff) | |
Made camera unit tests more stable
Replaced qWait() with QTRY_COMPARE()
Change-Id: I951bd8ca1eaaf8d0fd7308a90f82afcdb0475819
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/unit/qcamera/tst_qcamera.cpp | 20 | ||||
| -rw-r--r-- | tests/auto/unit/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 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); } diff --git a/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp b/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp index cf1f347c5..45cf340a1 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, |