summaryrefslogtreecommitdiffstats
path: root/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp')
-rw-r--r--tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp15
1 files changed, 11 insertions, 4 deletions
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
index b568f38fc..b8d501c12 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);
@@ -672,9 +672,16 @@ void tst_QCameraBackend::testVideoRecording()
QTRY_COMPARE(recorder.status(), QMediaRecorder::RecordingStatus);
QCOMPARE(recorderStatusSignal.last().first().value<QMediaRecorder::Status>(), recorder.status());
QTest::qWait(5000);
+ recorderStatusSignal.clear();
recorder.stop();
- QCOMPARE(recorder.status(), QMediaRecorder::FinalizingStatus);
- QCOMPARE(recorderStatusSignal.last().first().value<QMediaRecorder::Status>(), recorder.status());
+ bool foundFinalizingStatus = false;
+ for (auto &list : recorderStatusSignal) {
+ if (list.contains(QVariant(QMediaRecorder::FinalizingStatus))) {
+ foundFinalizingStatus = true;
+ break;
+ }
+ }
+ QVERIFY(foundFinalizingStatus);
QTRY_COMPARE(recorder.status(), QMediaRecorder::LoadedStatus);
QCOMPARE(recorderStatusSignal.last().first().value<QMediaRecorder::Status>(), recorder.status());