diff options
| author | Val Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-03-28 13:21:32 +0100 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-04-02 07:21:15 +0000 |
| commit | e06c207c066b4a5b469945ae9a8a7cc79682103e (patch) | |
| tree | 49137d9e830ebb5b92e0423fcb6fc248577601e3 | |
| parent | 5f15380e7c807c8111c32fc9bcf53189a868d23c (diff) | |
Android: Fix tst_QCameraBackend to wait for imageCaptured
QCameraImageCapture::imageCaptured is also async and could be delivered
after QCameraImageCapture::imageSaved.
Fixes tst_QCameraBackend::testCameraCapture and tst_QCameraBackend::testCaptureToBuffer
Change-Id: I47ee22c39cd2570f20a3e75a80249ed16ca52d0e
Fixes: QTBUG-73582
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| -rw-r--r-- | tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index b568f38fc..f5a947a6e 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -378,7 +378,7 @@ void tst_QCameraBackend::testCameraCapture() QTRY_VERIFY(!savedSignal.isEmpty()); - QCOMPARE(capturedSignal.size(), 1); + QTRY_COMPARE(capturedSignal.size(), 1); QCOMPARE(capturedSignal.last().first().toInt(), id); QCOMPARE(errorSignal.size(), 0); QCOMPARE(imageCapture.error(), QCameraImageCapture::NoError); @@ -436,7 +436,7 @@ void tst_QCameraBackend::testCaptureToBuffer() QTRY_VERIFY(!imageAvailableSignal.isEmpty()); QVERIFY(errorSignal.isEmpty()); - QVERIFY(!capturedSignal.isEmpty()); + QTRY_VERIFY(!capturedSignal.isEmpty()); QVERIFY(!imageAvailableSignal.isEmpty()); QTest::qWait(2000); |