diff options
Diffstat (limited to 'tests/auto/unit/multimediawidgets/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp')
| -rw-r--r-- | tests/auto/unit/multimediawidgets/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp | 66 |
1 files changed, 7 insertions, 59 deletions
diff --git a/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp b/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp index a8fafc86b..e0f23d477 100644 --- a/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp +++ b/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp @@ -1,32 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -//TESTED_COMPONENT=src/multimedia +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QtTest> #include <QtCore/qdebug.h> @@ -38,47 +11,22 @@ #include <private/qplatformmediaplayer_p.h> #include "qvideosink.h" -#include "qmockintegration_p.h" +#include "qmockintegration.h" QT_USE_NAMESPACE +Q_ENABLE_MOCK_MULTIMEDIA_PLUGIN + class tst_QMediaPlayerWidgets: public QObject { Q_OBJECT -public slots: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); - private slots: void testSetVideoOutput(); void testSetVideoOutputNoService(); void testSetVideoOutputNoControl(); - -private: - QMockIntegration *mockIntegration; }; -void tst_QMediaPlayerWidgets::initTestCase() -{ - mockIntegration = new QMockIntegration; -} - -void tst_QMediaPlayerWidgets::cleanupTestCase() -{ - delete mockIntegration; -} - -void tst_QMediaPlayerWidgets::init() -{ -} - -void tst_QMediaPlayerWidgets::cleanup() -{ -} - void tst_QMediaPlayerWidgets::testSetVideoOutput() { QVideoWidget widget; @@ -128,9 +76,9 @@ void tst_QMediaPlayerWidgets::testSetVideoOutputNoService() QGraphicsVideoItem item; QVideoSink surface; - mockIntegration->setFlags(QMockIntegration::NoPlayerInterface); + QMockIntegration::instance()->setFlags(QMockIntegration::NoPlayerInterface); QMediaPlayer player; - mockIntegration->setFlags({}); + QMockIntegration::instance()->setFlags({}); player.setVideoOutput(&widget); |