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

Remove some more QTest::qWait(10) calls.

Browse Source 
Since it seems to have changed slightly recently.  Just use
QTRY_COMPARE instead.

Change-Id: I802c2e26acf5418bb5904fadd2a978a44fd9eb01
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2012-02-08 11:54:11 +10:00
committed by Qt by Nokia
parent 6de7c31040
commit e241932c97
3 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -475,10 +475,7 @@ void tst_QCamera::testCameraCapture()
imageCapture.capture(QString::fromLatin1("/dev/null")); imageCapture.capture(QString::fromLatin1("/dev/null"));
for (int i=0; i<100 && capturedSignal.isEmpty(); i++) QTRY_COMPARE(capturedSignal.size(), 1);
QTest::qWait(10);
QCOMPARE(capturedSignal.size(), 1);
QCOMPARE(errorSignal.size(), 0); QCOMPARE(errorSignal.size(), 0);
QCOMPARE(imageCapture.error(), QCameraImageCapture::NoError); QCOMPARE(imageCapture.error(), QCameraImageCapture::NoError);
} }
@@ -494,10 +491,7 @@ void tst_QCamera::testCameraCaptureMetadata()
camera.start(); camera.start();
int id = imageCapture.capture(QString::fromLatin1("/dev/null")); int id = imageCapture.capture(QString::fromLatin1("/dev/null"));
for (int i=0; i<100 && savedSignal.isEmpty(); i++) QTRY_COMPARE(savedSignal.size(), 1);
QTest::qWait(10);
QCOMPARE(savedSignal.size(), 1);
QCOMPARE(metadataSignal.size(), 3); QCOMPARE(metadataSignal.size(), 3);
@@ -885,10 +879,7 @@ void tst_QCamera::testCameraLock()
lockFailedSignal.clear(); lockFailedSignal.clear();
lockStatusChangedSignal.clear(); lockStatusChangedSignal.clear();
for (int i=0; i<200 && camera.lockStatus() == QCamera::Searching; i++) QTRY_COMPARE(camera.lockStatus(), QCamera::Locked);
QTest::qWait(10);
QCOMPARE(camera.lockStatus(), QCamera::Locked);
QCOMPARE(lockedSignal.count(), 1); QCOMPARE(lockedSignal.count(), 1);
QCOMPARE(lockFailedSignal.count(), 0); QCOMPARE(lockFailedSignal.count(), 0);
QCOMPARE(lockStatusChangedSignal.count(), 1); QCOMPARE(lockStatusChangedSignal.count(), 1);

6
tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
View File

@@ -718,8 +718,7 @@ void tst_QMediaRecorder::testSettingsApplied()
//the settings are applied in the next event loop //the settings are applied in the next event loop
QMediaRecorder recorder(&object); QMediaRecorder recorder(&object);
QCOMPARE(recorderControl.m_settingAppliedCount, 0); QCOMPARE(recorderControl.m_settingAppliedCount, 0);
QTest::qWait(10); QTRY_COMPARE(recorderControl.m_settingAppliedCount, 1);
QCOMPARE(recorderControl.m_settingAppliedCount, 1);
QVideoEncoderSettings videoSettings; QVideoEncoderSettings videoSettings;
videoSettings.setResolution(640,480); videoSettings.setResolution(640,480);
@@ -732,8 +731,7 @@ void tst_QMediaRecorder::testSettingsApplied()
recorder.setContainerFormat("mkv"); recorder.setContainerFormat("mkv");
QCOMPARE(recorderControl.m_settingAppliedCount, 1); QCOMPARE(recorderControl.m_settingAppliedCount, 1);
QTest::qWait(10); QTRY_COMPARE(recorderControl.m_settingAppliedCount, 2);
QCOMPARE(recorderControl.m_settingAppliedCount, 2);
//encoder settings are applied before recording if changed //encoder settings are applied before recording if changed
audioSettings.setQuality(QtMultimedia::VeryHighQuality); audioSettings.setQuality(QtMultimedia::VeryHighQuality);

5
tests/auto/unit/qvideowidget/tst_qvideowidget.cpp
View File

@@ -1554,10 +1554,7 @@ void tst_QVideoWidget::paintRendererControl()
QCOMPARE(surface->isActive(), true); QCOMPARE(surface->isActive(), true);
QCOMPARE(surface->isReady(), false); QCOMPARE(surface->isReady(), false);
//wait up to 2 seconds for the frame to be presented QTRY_COMPARE(surface->isReady(), true);
for (int i=0; i<200 && !surface->isReady(); i++)
QTest::qWait(10);
QCOMPARE(surface->isActive(), true); QCOMPARE(surface->isActive(), true);
QCOMPARE(surface->isReady(), true); QCOMPARE(surface->isReady(), true);
} }