Fix QCameraBackend::testCtorWithCameraDevice() test

The default constructor of QCamera should pick the default
camera.

Pick-to: 6.2
Change-Id: I847a2cc65470bf337da6f070d9abbaa3c478f055
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>

1 files changed, 24 insertions, 8 deletions

diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
index f4f0741c2..70f68e2ab 100644
--- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
+++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
@@ -150,21 +150,37 @@ void tst_QCameraBackend::testCameraDevice()
 
 void tst_QCameraBackend::testCtorWithCameraDevice()
 {
-    {
-        // loading an invalid CameraDevice should fail
-        QCamera camera(QCameraDevice{});
+    if (noCamera) {
+        // only verify that we get an error trying to create a camera
+        QCamera camera;
         QCOMPARE(camera.error(), QCamera::CameraError);
         QVERIFY(camera.cameraDevice().isNull());
-    }
 
-    if (noCamera)
         QSKIP("No camera available");
+    }
+
+    QCameraDevice defaultCamera = QMediaDevices::defaultVideoInput();
 
     {
-        QCameraDevice info = QMediaDevices::defaultVideoInput();
-        QCamera camera(info);
+        // should use default camera
+        QCamera camera;
         QCOMPARE(camera.error(), QCamera::NoError);
-        QCOMPARE(camera.cameraDevice(), info);
+        QVERIFY(!camera.cameraDevice().isNull());
+        QCOMPARE(camera.cameraDevice(), defaultCamera);
+    }
+
+    {
+        // should use default camera
+        QCamera camera(QCameraDevice{});
+        QCOMPARE(camera.error(), QCamera::NoError);
+        QVERIFY(!camera.cameraDevice().isNull());
+        QCOMPARE(camera.cameraDevice(), defaultCamera);
+    }
+
+    {
+        QCamera camera(defaultCamera);
+        QCOMPARE(camera.error(), QCamera::NoError);
+        QCOMPARE(camera.cameraDevice(), defaultCamera);
     }
     {
         QCameraDevice info = QMediaDevices::videoInputs().first();