diff options
| author | Mithra Pattison <mithra.pattison@nokia.com> | 2012-05-09 14:32:03 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-09 08:37:02 +0200 |
| commit | 48e4758a4662c73bdf700f591524fd1fc45bbf5d (patch) | |
| tree | 08d2015ef14ee44568648dbb6ae5a808fa166338 /tests | |
| parent | 79ba57afb98490305ecd43277c7ad2f50109e769 (diff) | |
Change timeout on qcamera capture tests to QTRY_VERIFY
Previous timeout was causing sporadic test failures
Change-Id: I9b30c0245e16838fafce6a4977d75aaddb6f5fdd
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp b/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp index 0cd1452f0..f93154551 100644 --- a/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp +++ b/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp @@ -205,8 +205,7 @@ void tst_QCameraImageCapture::isReadyForCapture() QVERIFY(imageCapture.isReadyForCapture() == false); camera.start(); imageCapture.capture(); - QTest::qWait(300); - QVERIFY(imageCapture.isReadyForCapture() == true); + QTRY_VERIFY(imageCapture.isReadyForCapture()); camera.stop(); } @@ -236,8 +235,7 @@ void tst_QCameraImageCapture::cancelCapture() QVERIFY(imageCapture.isReadyForCapture() == false); camera.start(); imageCapture.capture(); - QTest::qWait(300); - QVERIFY(imageCapture.isReadyForCapture() == true); + QTRY_VERIFY(imageCapture.isReadyForCapture()); QVERIFY(spy.count() == 1 && spy1.count() == 1); spy.clear(); spy1.clear(); @@ -247,8 +245,7 @@ void tst_QCameraImageCapture::cancelCapture() camera.start(); imageCapture.capture(); imageCapture.cancelCapture(); - QTest::qWait(300); - QVERIFY(imageCapture.isReadyForCapture() == true); + QTRY_VERIFY(imageCapture.isReadyForCapture()); QVERIFY(spy.count() == 0 && spy1.count() == 0); camera.stop(); } @@ -357,8 +354,7 @@ void tst_QCameraImageCapture::imageCaptured() QVERIFY(imageCapture.isReadyForCapture() == false); camera.start(); imageCapture.capture(); - QTest::qWait(300); - QVERIFY(imageCapture.isReadyForCapture() == true); + QTRY_VERIFY(imageCapture.isReadyForCapture()); QVERIFY(spy.count() == 1); QVERIFY(qvariant_cast<int>(spy.at(0).at(0)) > 0); @@ -378,8 +374,7 @@ void tst_QCameraImageCapture::imageExposed() QVERIFY(imageCapture.isReadyForCapture() == false); camera.start(); imageCapture.capture(); - QTest::qWait(300); - QVERIFY(imageCapture.isReadyForCapture() == true); + QTRY_VERIFY(imageCapture.isReadyForCapture()); QVERIFY(spy.count() == 1); QVERIFY(qvariant_cast<int>(spy.at(0).at(0)) > 0); @@ -397,8 +392,7 @@ void tst_QCameraImageCapture::imageSaved() QVERIFY(imageCapture.isReadyForCapture() == false); camera.start(); imageCapture.capture(QString::fromLatin1("/usr/share")); - QTest::qWait(300); - QVERIFY(imageCapture.isReadyForCapture() == true); + QTRY_VERIFY(imageCapture.isReadyForCapture()); QVERIFY(spy.count() == 1); QVERIFY(qvariant_cast<int>(spy.at(0).at(0)) > 0); |