1 files changed, 34 insertions, 63 deletions

diff --git a/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp b/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp
index c8f93330f..455586243 100644
--- a/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp
+++ b/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QtTest/QtTest>
 #include <QDebug>
@@ -33,42 +8,26 @@
 #include <qcameradevice.h>
 #include <qmediadevices.h>
 
-#include "qmockintegration_p.h"
-#include "qmockmediacapturesession.h"
+#include "qmockintegration.h"
 
 QT_USE_NAMESPACE
 
+Q_ENABLE_MOCK_MULTIMEDIA_PLUGIN
+
+using namespace Qt::Literals;
+
 class tst_QCameraDevice: public QObject
 {
     Q_OBJECT
 
-public slots:
-    void initTestCase();
-    void init();
-    void cleanup();
-
 private slots:
     void constructor();
     void defaultCamera();
     void availableCameras();
     void equality_operators();
-
-private:
-    QMockIntegration integration;
+    void qDebug_operator();
 };
 
-void tst_QCameraDevice::initTestCase()
-{
-}
-
-void tst_QCameraDevice::init()
-{
-}
-
-void tst_QCameraDevice::cleanup()
-{
-}
-
 void tst_QCameraDevice::constructor()
 {
     {
@@ -76,8 +35,8 @@ void tst_QCameraDevice::constructor()
         QCamera camera;
         QCameraDevice info(camera.cameraDevice());
         QVERIFY(!info.isNull());
-        QCOMPARE(info.id(), QStringLiteral("default"));
-        QCOMPARE(info.description(), QStringLiteral("defaultCamera"));
+        QCOMPARE(info.id(), u"default"_s);
+        QCOMPARE(info.description(), u"defaultCamera"_s);
         QCOMPARE(info.position(), QCameraDevice::UnspecifiedPosition);
     }
 
@@ -92,14 +51,14 @@ void tst_QCameraDevice::constructor()
     QCamera camera(info);
     QCOMPARE(info, camera.cameraDevice());
     QVERIFY(!info.isNull());
-    QCOMPARE(info.id(), QStringLiteral("back"));
-    QCOMPARE(info.description(), QStringLiteral("backCamera"));
+    QCOMPARE(info.id(), u"back"_s);
+    QCOMPARE(info.description(), u"backCamera"_s);
     QCOMPARE(info.position(), QCameraDevice::BackFace);
 
     QCameraDevice info2(info);
     QVERIFY(!info2.isNull());
-    QCOMPARE(info2.id(), QStringLiteral("back"));
-    QCOMPARE(info2.description(), QStringLiteral("backCamera"));
+    QCOMPARE(info2.id(), u"back"_s);
+    QCOMPARE(info2.description(), u"backCamera"_s);
     QCOMPARE(info2.position(), QCameraDevice::BackFace);
 }
 
@@ -108,8 +67,8 @@ void tst_QCameraDevice::defaultCamera()
     QCameraDevice info = QMediaDevices::defaultVideoInput();
 
     QVERIFY(!info.isNull());
-    QCOMPARE(info.id(), QStringLiteral("default"));
-    QCOMPARE(info.description(), QStringLiteral("defaultCamera"));
+    QCOMPARE(info.id(), u"default"_s);
+    QCOMPARE(info.description(), u"defaultCamera"_s);
     QCOMPARE(info.position(), QCameraDevice::UnspecifiedPosition);
 
     QCamera camera(info);
@@ -119,12 +78,12 @@ void tst_QCameraDevice::defaultCamera()
 void tst_QCameraDevice::availableCameras()
 {
     QList<QCameraDevice> cameras = QMediaDevices::videoInputs();
-    QCOMPARE(cameras.count(), 3);
+    QCOMPARE(cameras.size(), 3);
 
     QCameraDevice info = cameras.at(0);
     QVERIFY(!info.isNull());
-    QCOMPARE(info.id(), QStringLiteral("default"));
-    QCOMPARE(info.description(), QStringLiteral("defaultCamera"));
+    QCOMPARE(info.id(), u"default"_s);
+    QCOMPARE(info.description(), u"defaultCamera"_s);
     QCOMPARE(info.position(), QCameraDevice::UnspecifiedPosition);
 
     info = cameras.at(1);
@@ -133,11 +92,11 @@ void tst_QCameraDevice::availableCameras()
     QCOMPARE(info.description(), QStringLiteral("frontCamera"));
     QCOMPARE(info.position(), QCameraDevice::FrontFace);
 
-    QCOMPARE(cameras.count(), 3);
+    QCOMPARE(cameras.size(), 3);
     info = cameras.at(2);
     QVERIFY(!info.isNull());
-    QCOMPARE(info.id(), QStringLiteral("back"));
-    QCOMPARE(info.description(), QStringLiteral("backCamera"));
+    QCOMPARE(info.id(), u"back"_s);
+    QCOMPARE(info.description(), u"backCamera"_s);
     QCOMPARE(info.position(), QCameraDevice::BackFace);
 }
 
@@ -162,6 +121,18 @@ void tst_QCameraDevice::equality_operators()
     }
 }
 
+void tst_QCameraDevice::qDebug_operator()
+{
+    QString outputString;
+    QDebug debug(&outputString);
+    debug.nospace();
+
+    QCameraDevice defaultCamera = QMediaDevices::defaultVideoInput();
+    debug << defaultCamera;
+
+    QCOMPARE(outputString,
+             u"\"QCameraDevice(name=defaultCamera, id=default, position=UnspecifiedPosition)\" "_s);
+}
 
 QTEST_MAIN(tst_QCameraDevice)