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
2011-12-02 14:39:42 +10:00
committed by Qt by Nokia
parent 4c834365c6
commit 3171081d43
24 changed files with 411 additions and 1023 deletions

View File

@@ -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"