From e06c207c066b4a5b469945ae9a8a7cc79682103e Mon Sep 17 00:00:00 2001 From: Val Doroshchuk Date: Thu, 28 Mar 2019 13:21:32 +0100 Subject: 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 Reviewed-by: Andy Shaw --- tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp | 4 ++-- 1 file 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); -- cgit v1.2.3