slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made camera unit tests more stable

Browse Source 
Replaced qWait() with QTRY_COMPARE()

Change-Id: I951bd8ca1eaaf8d0fd7308a90f82afcdb0475819
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2012-02-06 14:12:57 +10:00
committed by Qt by Nokia
parent 78ffd1bc18
commit fb73a56574
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/auto/unit/qcamera/tst_qcamera.cpp
View File

@@ -971,10 +971,9 @@ void tst_QCamera::testCameraEncodingProperyChange()
stateChangedSignal.clear(); stateChangedSignal.clear();
statusChangedSignal.clear(); statusChangedSignal.clear();
QTest::qWait(10);
QCOMPARE(camera.state(), QCamera::ActiveState); QCOMPARE(camera.state(), QCamera::ActiveState);
QCOMPARE(camera.status(), QCamera::ActiveStatus); QTRY_COMPARE(camera.status(), QCamera::ActiveStatus);
QCOMPARE(stateChangedSignal.count(), 0); QCOMPARE(stateChangedSignal.count(), 0);
QCOMPARE(statusChangedSignal.count(), 1); QCOMPARE(statusChangedSignal.count(), 1);
stateChangedSignal.clear(); stateChangedSignal.clear();
@@ -986,7 +985,10 @@ void tst_QCamera::testCameraEncodingProperyChange()
QCOMPARE(statusChangedSignal.count(), 0); QCOMPARE(statusChangedSignal.count(), 0);
camera.setCaptureMode(QCamera::CaptureStillImage); camera.setCaptureMode(QCamera::CaptureStillImage);
QTest::qWait(10);
QCOMPARE(camera.state(), QCamera::ActiveState);
QTRY_COMPARE(camera.status(), QCamera::ActiveStatus);
stateChangedSignal.clear(); stateChangedSignal.clear();
statusChangedSignal.clear(); statusChangedSignal.clear();
@@ -1000,10 +1002,9 @@ void tst_QCamera::testCameraEncodingProperyChange()
stateChangedSignal.clear(); stateChangedSignal.clear();
statusChangedSignal.clear(); statusChangedSignal.clear();
QTest::qWait(10);
QCOMPARE(camera.state(), QCamera::ActiveState); QCOMPARE(camera.state(), QCamera::ActiveState);
QCOMPARE(camera.status(), QCamera::ActiveStatus); QTRY_COMPARE(camera.status(), QCamera::ActiveStatus);
QCOMPARE(stateChangedSignal.count(), 0); QCOMPARE(stateChangedSignal.count(), 0);
QCOMPARE(statusChangedSignal.count(), 1); QCOMPARE(statusChangedSignal.count(), 1);
stateChangedSignal.clear(); stateChangedSignal.clear();
@@ -1023,10 +1024,9 @@ void tst_QCamera::testCameraEncodingProperyChange()
stateChangedSignal.clear(); stateChangedSignal.clear();
statusChangedSignal.clear(); statusChangedSignal.clear();
QTest::qWait(10);
QCOMPARE(camera.state(), QCamera::ActiveState); QCOMPARE(camera.state(), QCamera::ActiveState);
QCOMPARE(camera.status(), QCamera::ActiveStatus); QTRY_COMPARE(camera.status(), QCamera::ActiveStatus);
QCOMPARE(stateChangedSignal.count(), 0); QCOMPARE(stateChangedSignal.count(), 0);
QCOMPARE(statusChangedSignal.count(), 1); QCOMPARE(statusChangedSignal.count(), 1);
} }

19
tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp
View File

@@ -145,10 +145,9 @@ void tst_QCameraWidgets::testCameraEncodingProperyChange()
stateChangedSignal.clear(); stateChangedSignal.clear();
statusChangedSignal.clear(); statusChangedSignal.clear();
QTest::qWait(10);
QCOMPARE(camera.state(), QCamera::ActiveState); QCOMPARE(camera.state(), QCamera::ActiveState);
QCOMPARE(camera.status(), QCamera::ActiveStatus); QTRY_COMPARE(camera.status(), QCamera::ActiveStatus);
QCOMPARE(stateChangedSignal.count(), 0); QCOMPARE(stateChangedSignal.count(), 0);
QCOMPARE(statusChangedSignal.count(), 1); QCOMPARE(statusChangedSignal.count(), 1);
stateChangedSignal.clear(); stateChangedSignal.clear();
@@ -160,7 +159,7 @@ void tst_QCameraWidgets::testCameraEncodingProperyChange()
QCOMPARE(statusChangedSignal.count(), 0); QCOMPARE(statusChangedSignal.count(), 0);
camera.setCaptureMode(QCamera::CaptureStillImage); camera.setCaptureMode(QCamera::CaptureStillImage);
QTest::qWait(10); QTRY_COMPARE(camera.status(), QCamera::ActiveStatus);
stateChangedSignal.clear(); stateChangedSignal.clear();
statusChangedSignal.clear(); statusChangedSignal.clear();
@@ -174,10 +173,9 @@ void tst_QCameraWidgets::testCameraEncodingProperyChange()
stateChangedSignal.clear(); stateChangedSignal.clear();
statusChangedSignal.clear(); statusChangedSignal.clear();
QTest::qWait(10);
QCOMPARE(camera.state(), QCamera::ActiveState); QCOMPARE(camera.state(), QCamera::ActiveState);
QCOMPARE(camera.status(), QCamera::ActiveStatus); QTRY_COMPARE(camera.status(), QCamera::ActiveStatus);
QCOMPARE(stateChangedSignal.count(), 0); QCOMPARE(stateChangedSignal.count(), 0);
QCOMPARE(statusChangedSignal.count(), 1); QCOMPARE(statusChangedSignal.count(), 1);
stateChangedSignal.clear(); stateChangedSignal.clear();
@@ -197,10 +195,9 @@ void tst_QCameraWidgets::testCameraEncodingProperyChange()
stateChangedSignal.clear(); stateChangedSignal.clear();
statusChangedSignal.clear(); statusChangedSignal.clear();
QTest::qWait(10);
QCOMPARE(camera.state(), QCamera::ActiveState); QCOMPARE(camera.state(), QCamera::ActiveState);
QCOMPARE(camera.status(), QCamera::ActiveStatus); QTRY_COMPARE(camera.status(), QCamera::ActiveStatus);
QCOMPARE(stateChangedSignal.count(), 0); QCOMPARE(stateChangedSignal.count(), 0);
QCOMPARE(statusChangedSignal.count(), 1); QCOMPARE(statusChangedSignal.count(), 1);
stateChangedSignal.clear(); stateChangedSignal.clear();
@@ -214,7 +211,7 @@ void tst_QCameraWidgets::testCameraEncodingProperyChange()
QCOMPARE(stateChangedSignal.count(), 0); QCOMPARE(stateChangedSignal.count(), 0);
QCOMPARE(statusChangedSignal.count(), 1); QCOMPARE(statusChangedSignal.count(), 1);
QTest::qWait(10); QTRY_COMPARE(camera.status(), QCamera::ActiveStatus);
mockCameraService->mockControl->m_propertyChangesSupported = true; mockCameraService->mockControl->m_propertyChangesSupported = true;
//the changes to encoding settings, //the changes to encoding settings,