Cleanup multimedia unit tests.
Use QTEST_MAIN or QTEST_GUILESS_MAIN instead of equivalent custom main() functions. Also collapse each test into a single source file, in line with most other autotests. Change-Id: I38c7b6a9eb0ff1c9b8ac44de7d5f40d6ac6c46ea Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Jason McDonald
committed by
Qt by Nokia
Qt by Nokia
parent
4c834365c6
commit
3171081d43
@@ -1,53 +0,0 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** All rights reserved.
|
||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||
**
|
||||
** This file is part of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
** This file may be used under the terms of the GNU Lesser General Public
|
||||
** License version 2.1 as published by the Free Software Foundation and
|
||||
** appearing in the file LICENSE.LGPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU Lesser
|
||||
** General Public License version 2.1 requirements will be met:
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU General
|
||||
** Public License version 3.0 as published by the Free Software Foundation
|
||||
** and appearing in the file LICENSE.GPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU General
|
||||
** Public License version 3.0 requirements will be met:
|
||||
** http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
** Other Usage
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
#include <QtCore/qcoreapplication.h>
|
||||
#include <QtTest/QtTest>
|
||||
|
||||
#include "tst_qradiodata.h"
|
||||
|
||||
int main(int argc, char**argv)
|
||||
{
|
||||
QCoreApplication app(argc,argv);
|
||||
int ret;
|
||||
tst_QRadioData test_api;
|
||||
ret = QTest::qExec(&test_api, argc, argv);
|
||||
return ret;
|
||||
}
|
||||
@@ -1,11 +1,7 @@
|
||||
CONFIG += testcase
|
||||
CONFIG += testcase no_private_qt_headers_warning
|
||||
TARGET = tst_qradiodata
|
||||
|
||||
QT += multimedia-private testlib
|
||||
CONFIG += no_private_qt_headers_warning
|
||||
|
||||
HEADERS += tst_qradiodata.h
|
||||
SOURCES += main.cpp tst_qradiodata.cpp
|
||||
SOURCES += tst_qradiodata.cpp
|
||||
|
||||
include (../qmultimedia_common/mock.pri)
|
||||
include (../qmultimedia_common/mockradio.pri)
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
** All rights reserved.
|
||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||
**
|
||||
** This file is part of the Qt Toolkit.
|
||||
** This file is part of the test suite of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
@@ -41,10 +41,43 @@
|
||||
|
||||
//TESTED_COMPONENT=src/multimedia
|
||||
|
||||
#include "tst_qradiodata.h"
|
||||
#include <QtTest/QtTest>
|
||||
#include <QDebug>
|
||||
#include <QTimer>
|
||||
|
||||
#include <qmediaobject.h>
|
||||
#include <qmediacontrol.h>
|
||||
#include <qmediaservice.h>
|
||||
#include <qradiodatacontrol.h>
|
||||
#include <qradiodata.h>
|
||||
|
||||
#include "mockmediaserviceprovider.h"
|
||||
#include "mockmediaservice.h"
|
||||
#include "mockradiodatacontrol.h"
|
||||
|
||||
QT_USE_NAMESPACE
|
||||
|
||||
class tst_QRadioData: public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public slots:
|
||||
void initTestCase();
|
||||
void cleanupTestCase();
|
||||
|
||||
private slots:
|
||||
void testNullService();
|
||||
void testNullControl();
|
||||
void testAlternativeFrequencies();
|
||||
void testRadioDataUpdates();
|
||||
|
||||
private:
|
||||
MockRadioDataControl *mock;
|
||||
MockMediaService *service;
|
||||
MockMediaServiceProvider *provider;
|
||||
QRadioData *radio;
|
||||
};
|
||||
|
||||
void tst_QRadioData::initTestCase()
|
||||
{
|
||||
qRegisterMetaType<QRadioData::ProgramType>("QRadioData::ProgramType");
|
||||
@@ -146,3 +179,6 @@ void tst_QRadioData::testRadioDataUpdates()
|
||||
QCOMPARE(radio->stationId(), QString("Mock Programme Identification"));
|
||||
QCOMPARE(radio->stationName(), QString("Mock Programme Service"));
|
||||
}
|
||||
|
||||
QTEST_GUILESS_MAIN(tst_QRadioData)
|
||||
#include "tst_qradiodata.moc"
|
||||
|
||||
@@ -1,80 +0,0 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** All rights reserved.
|
||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||
**
|
||||
** This file is part of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
** This file may be used under the terms of the GNU Lesser General Public
|
||||
** License version 2.1 as published by the Free Software Foundation and
|
||||
** appearing in the file LICENSE.LGPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU Lesser
|
||||
** General Public License version 2.1 requirements will be met:
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU General
|
||||
** Public License version 3.0 as published by the Free Software Foundation
|
||||
** and appearing in the file LICENSE.GPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU General
|
||||
** Public License version 3.0 requirements will be met:
|
||||
** http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
** Other Usage
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
#ifndef TST_QRADIODATA_H
|
||||
#define TST_QRADIODATA_H
|
||||
|
||||
#include <QtTest/QtTest>
|
||||
#include <QDebug>
|
||||
#include <QTimer>
|
||||
|
||||
#include <qmediaobject.h>
|
||||
#include <qmediacontrol.h>
|
||||
#include <qmediaservice.h>
|
||||
#include <qradiodatacontrol.h>
|
||||
#include <qradiodata.h>
|
||||
|
||||
#include "mockmediaserviceprovider.h"
|
||||
#include "mockmediaservice.h"
|
||||
#include "mockradiodatacontrol.h"
|
||||
|
||||
QT_USE_NAMESPACE
|
||||
|
||||
class tst_QRadioData: public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public slots:
|
||||
void initTestCase();
|
||||
void cleanupTestCase();
|
||||
|
||||
private slots:
|
||||
void testNullService();
|
||||
void testNullControl();
|
||||
void testAlternativeFrequencies();
|
||||
void testRadioDataUpdates();
|
||||
|
||||
private:
|
||||
MockRadioDataControl *mock;
|
||||
MockMediaService *service;
|
||||
MockMediaServiceProvider *provider;
|
||||
QRadioData *radio;
|
||||
};
|
||||
#endif
|
||||
Reference in New Issue
Block a user