diff options
| author | Bartlomiej Moskal <bartlomiej.moskal@qt.io> | 2021-07-30 14:51:14 +0200 |
|---|---|---|
| committer | Bartlomiej Moskal <bartlomiej.moskal@qt.io> | 2021-08-02 07:45:56 +0000 |
| commit | 64ce7f9c63ca891425656a29fd59db869c91efd1 (patch) | |
| tree | 62fbf822355f75f4195886152f7f19f730db3de5 /tests | |
| parent | 9377bf2830b418d0cd8d267938a82802ada6f2d2 (diff) | |
Auto test fix after run on Android: qcamerabackend
Commit contains two fixes:
1. QCameraDevice is set to default since commit:
e045ee08c84fbc6d1c6837e34c30f88c09cd2cdb. That is why check for not
starting up camera (without setting device) need to be removed;
2. After commit 2f018aad29cebe4b4db3f69ff2d5e11f8ba2cad2 there was an
assertion in android cameraSession for starting preview (for not set
video output). Assertion is removed from code. Before testing for camera
start - video output is set;
Change-Id: I9931d49c8388c92f7159b302afe5e1f5e629e764
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index 17cde0802..224f8385f 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -33,6 +33,7 @@ #include <QtCore/qurl.h> #include <QtCore/qlocale.h> #include <QDebug> +#include <QVideoSink> #include <private/qplatformcamera_p.h> #include <private/qplatformimagecapture_p.h> @@ -174,10 +175,6 @@ void tst_QCameraBackend::testCameraStates() QCOMPARE(camera.isActive(), false); - // Camera should not startup with a null QCameraDevice as device - camera.start(); - QCOMPARE(camera.isActive(), false); - if (noCamera) QSKIP("No camera available"); camera.setCameraDevice(QMediaDevices::defaultVideoInput()); @@ -247,6 +244,8 @@ void tst_QCameraBackend::testCameraCapture() if (noCamera) QSKIP("No camera available"); + QVideoSink sink; + session.setVideoOutput(&sink); camera.start(); QTRY_VERIFY(imageCapture.isReadyForCapture()); |