summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorVal Doroshchuk <valentyn.doroshchuk@qt.io>2019-03-28 14:19:53 +0100
committerVaL Doroshchuk <valentyn.doroshchuk@qt.io>2019-04-03 09:17:53 +0000
commit49cd7b16b2ae77246da10993958a989753abecb8 (patch)
tree346a836836d73617c2aefb052013a9126fb48ad6 /tests/auto
parent110dd5b405ce4f8146da4430e3180833610712ad (diff)
Android: Fix tst_QCameraBackend to find FinalizingStatus
Fixes tst_QCameraBackend::testVideoRecording. Since QMediaRecorder::FinalizingStatus could be sent immediately, it is sane to wait for final QMediaRecorder::LoadedStatus only. But added a fix to check if the FinalizingStatus has been emitted. Task-number: QTBUG-73582 Change-Id: I63fc6b1951a712215ee5d982233924a79ac1c124 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Christian Strømme <christian.stromme@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
index f5a947a6e..b8d501c12 100644
--- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
+++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
@@ -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());