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

Change timeout on qcamera capture tests to QTRY_VERIFY

Browse Source 
Previous timeout was causing sporadic test failures

Change-Id: I9b30c0245e16838fafce6a4977d75aaddb6f5fdd
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
This commit is contained in:
Mithra Pattison
2012-05-09 14:32:03 +10:00
committed by Qt by Nokia
parent 79ba57afb9
commit 48e4758a46
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp
View File

@@ -205,8 +205,7 @@ void tst_QCameraImageCapture::isReadyForCapture()
QVERIFY(imageCapture.isReadyForCapture() == false); QVERIFY(imageCapture.isReadyForCapture() == false);
camera.start(); camera.start();
imageCapture.capture(); imageCapture.capture();
QTest::qWait(300); QTRY_VERIFY(imageCapture.isReadyForCapture());
QVERIFY(imageCapture.isReadyForCapture() == true);
camera.stop(); camera.stop();
} }
@@ -236,8 +235,7 @@ void tst_QCameraImageCapture::cancelCapture()
QVERIFY(imageCapture.isReadyForCapture() == false); QVERIFY(imageCapture.isReadyForCapture() == false);
camera.start(); camera.start();
imageCapture.capture(); imageCapture.capture();
QTest::qWait(300); QTRY_VERIFY(imageCapture.isReadyForCapture());
QVERIFY(imageCapture.isReadyForCapture() == true);
QVERIFY(spy.count() == 1 && spy1.count() == 1); QVERIFY(spy.count() == 1 && spy1.count() == 1);
spy.clear(); spy.clear();
spy1.clear(); spy1.clear();
@@ -247,8 +245,7 @@ void tst_QCameraImageCapture::cancelCapture()
camera.start(); camera.start();
imageCapture.capture(); imageCapture.capture();
imageCapture.cancelCapture(); imageCapture.cancelCapture();
QTest::qWait(300); QTRY_VERIFY(imageCapture.isReadyForCapture());
QVERIFY(imageCapture.isReadyForCapture() == true);
QVERIFY(spy.count() == 0 && spy1.count() == 0); QVERIFY(spy.count() == 0 && spy1.count() == 0);
camera.stop(); camera.stop();
} }
@@ -357,8 +354,7 @@ void tst_QCameraImageCapture::imageCaptured()
QVERIFY(imageCapture.isReadyForCapture() == false); QVERIFY(imageCapture.isReadyForCapture() == false);
camera.start(); camera.start();
imageCapture.capture(); imageCapture.capture();
QTest::qWait(300); QTRY_VERIFY(imageCapture.isReadyForCapture());
QVERIFY(imageCapture.isReadyForCapture() == true);
QVERIFY(spy.count() == 1); QVERIFY(spy.count() == 1);
QVERIFY(qvariant_cast<int>(spy.at(0).at(0)) > 0); QVERIFY(qvariant_cast<int>(spy.at(0).at(0)) > 0);
@@ -378,8 +374,7 @@ void tst_QCameraImageCapture::imageExposed()
QVERIFY(imageCapture.isReadyForCapture() == false); QVERIFY(imageCapture.isReadyForCapture() == false);
camera.start(); camera.start();
imageCapture.capture(); imageCapture.capture();
QTest::qWait(300); QTRY_VERIFY(imageCapture.isReadyForCapture());
QVERIFY(imageCapture.isReadyForCapture() == true);
QVERIFY(spy.count() == 1); QVERIFY(spy.count() == 1);
QVERIFY(qvariant_cast<int>(spy.at(0).at(0)) > 0); QVERIFY(qvariant_cast<int>(spy.at(0).at(0)) > 0);
@@ -397,8 +392,7 @@ void tst_QCameraImageCapture::imageSaved()
QVERIFY(imageCapture.isReadyForCapture() == false); QVERIFY(imageCapture.isReadyForCapture() == false);
camera.start(); camera.start();
imageCapture.capture(QString::fromLatin1("/usr/share")); imageCapture.capture(QString::fromLatin1("/usr/share"));
QTest::qWait(300); QTRY_VERIFY(imageCapture.isReadyForCapture());
QVERIFY(imageCapture.isReadyForCapture() == true);
QVERIFY(spy.count() == 1); QVERIFY(spy.count() == 1);
QVERIFY(qvariant_cast<int>(spy.at(0).at(0)) > 0); QVERIFY(qvariant_cast<int>(spy.at(0).at(0)) > 0);