diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index affd4e3d..2c368ea2 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,12 +1,4 @@ -TEMPLATE = subdirs - -SUBDIRS += multimedia.pro -contains(QT_CONFIG,multimediawidgets): SUBDIRS += multimediawidgets.pro - -# These autotests consist of things such as static code checks -# which require that the autotest is run on the same machine -# doing the build - i.e. cross-compilation is not allowed. -win32|mac|linux-g++* { - # NOTE: Disabled until we have established which tests fall into this category - # !contains(QT_CONFIG,embedded):!maemo5:!maemo6:SUBDIRS+=host.pro -} +TEMPLATE=subdirs +SUBDIRS += \ + unit \ + integration diff --git a/tests/auto/integration/integration.pro b/tests/auto/integration/integration.pro new file mode 100644 index 00000000..c61fbd4e --- /dev/null +++ b/tests/auto/integration/integration.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs + +SUBDIRS += multimedia.pro diff --git a/tests/auto/integration/multimedia.pro b/tests/auto/integration/multimedia.pro new file mode 100644 index 00000000..f09ce941 --- /dev/null +++ b/tests/auto/integration/multimedia.pro @@ -0,0 +1,9 @@ + +TEMPLATE = subdirs +SUBDIRS += \ + qaudioinput \ + qaudiooutput \ + qmediaplayerbackend \ + qcamerabackend \ + qsoundeffect + diff --git a/tests/auto/qaudioinput/qaudioinput.pro b/tests/auto/integration/qaudioinput/qaudioinput.pro similarity index 100% rename from tests/auto/qaudioinput/qaudioinput.pro rename to tests/auto/integration/qaudioinput/qaudioinput.pro diff --git a/tests/auto/qaudioinput/tst_qaudioinput.cpp b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp similarity index 100% rename from tests/auto/qaudioinput/tst_qaudioinput.cpp rename to tests/auto/integration/qaudioinput/tst_qaudioinput.cpp diff --git a/tests/auto/qaudioinput/wavheader.cpp b/tests/auto/integration/qaudioinput/wavheader.cpp similarity index 100% rename from tests/auto/qaudioinput/wavheader.cpp rename to tests/auto/integration/qaudioinput/wavheader.cpp diff --git a/tests/auto/qaudioinput/wavheader.h b/tests/auto/integration/qaudioinput/wavheader.h similarity index 100% rename from tests/auto/qaudioinput/wavheader.h rename to tests/auto/integration/qaudioinput/wavheader.h diff --git a/tests/auto/qaudiooutput/qaudiooutput.pro b/tests/auto/integration/qaudiooutput/qaudiooutput.pro similarity index 100% rename from tests/auto/qaudiooutput/qaudiooutput.pro rename to tests/auto/integration/qaudiooutput/qaudiooutput.pro diff --git a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp similarity index 100% rename from tests/auto/qaudiooutput/tst_qaudiooutput.cpp rename to tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp diff --git a/tests/auto/qaudiooutput/wavheader.cpp b/tests/auto/integration/qaudiooutput/wavheader.cpp similarity index 100% rename from tests/auto/qaudiooutput/wavheader.cpp rename to tests/auto/integration/qaudiooutput/wavheader.cpp diff --git a/tests/auto/qaudiooutput/wavheader.h b/tests/auto/integration/qaudiooutput/wavheader.h similarity index 100% rename from tests/auto/qaudiooutput/wavheader.h rename to tests/auto/integration/qaudiooutput/wavheader.h diff --git a/tests/auto/qcamerabackend/qcamerabackend.pro b/tests/auto/integration/qcamerabackend/qcamerabackend.pro similarity index 100% rename from tests/auto/qcamerabackend/qcamerabackend.pro rename to tests/auto/integration/qcamerabackend/qcamerabackend.pro diff --git a/tests/auto/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp similarity index 100% rename from tests/auto/qcamerabackend/tst_qcamerabackend.cpp rename to tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp diff --git a/tests/auto/qmediaplayerbackend/qmediaplayerbackend.pro b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro similarity index 100% rename from tests/auto/qmediaplayerbackend/qmediaplayerbackend.pro rename to tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro diff --git a/tests/auto/qmediaplayerbackend/testdata/test.wav b/tests/auto/integration/qmediaplayerbackend/testdata/test.wav similarity index 100% rename from tests/auto/qmediaplayerbackend/testdata/test.wav rename to tests/auto/integration/qmediaplayerbackend/testdata/test.wav diff --git a/tests/auto/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp similarity index 100% rename from tests/auto/qmediaplayerbackend/tst_qmediaplayerbackend.cpp rename to tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp diff --git a/tests/auto/qsoundeffect/qsoundeffect.pro b/tests/auto/integration/qsoundeffect/qsoundeffect.pro similarity index 100% rename from tests/auto/qsoundeffect/qsoundeffect.pro rename to tests/auto/integration/qsoundeffect/qsoundeffect.pro diff --git a/tests/auto/qsoundeffect/test.wav b/tests/auto/integration/qsoundeffect/test.wav similarity index 100% rename from tests/auto/qsoundeffect/test.wav rename to tests/auto/integration/qsoundeffect/test.wav diff --git a/tests/auto/qsoundeffect/tst_qsoundeffect.cpp b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp similarity index 100% rename from tests/auto/qsoundeffect/tst_qsoundeffect.cpp rename to tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp diff --git a/tests/auto/qmediastreamscontrol/qmediastreamscontrol.pro b/tests/auto/qmediastreamscontrol/qmediastreamscontrol.pro deleted file mode 100644 index d2716719..00000000 --- a/tests/auto/qmediastreamscontrol/qmediastreamscontrol.pro +++ /dev/null @@ -1,10 +0,0 @@ -CONFIG += testcase -TARGET = tst_qmediastreamscontrol - -QT += multimedia-private testlib -CONFIG += no_private_qt_headers_warning - -SOURCES += \ - tst_qmediastreamscontrol.cpp - -include(../multimedia_common.pri) diff --git a/tests/auto/qmediastreamscontrol/tst_qmediastreamscontrol.cpp b/tests/auto/qmediastreamscontrol/tst_qmediastreamscontrol.cpp deleted file mode 100644 index d7286918..00000000 --- a/tests/auto/qmediastreamscontrol/tst_qmediastreamscontrol.cpp +++ /dev/null @@ -1,408 +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 test suite 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$ -** -****************************************************************************/ - -//TESTED_COMPONENT=src/multimedia - -#include -#include -#include - - -#include -#include - -#include - -#include -#include - -QT_USE_NAMESPACE - - -#define WAIT_FOR_CONDITION(a,e) \ - for (int _i = 0; _i < 500; _i += 1) { \ - if ((a) == (e)) break; \ - QTest::qWait(10);} - -class tst_qmediastreamscontrol : public QObject -{ - Q_OBJECT - -public: - tst_qmediastreamscontrol(); - -private Q_SLOTS: - void initTestCase(); - void cleanupTestCase(); - void control_iid(); - void control(); - void isActive(); - void streamCount(); - void streamsChanged(); - void metadata(); -}; - - - -class mediaStatusList : public QObject, public QList -{ - Q_OBJECT -public slots: - void mediaStatus(QMediaStreamsControl::StreamType status) { - append(status); - } - -public: - mediaStatusList(QObject *obj, const char *aSignal) - : QObject() - { - QObject::connect(obj, aSignal, this, SLOT(mediaStatus(QMediaStreamsControl::StreamType))); - } -}; - -class QtTestMediaStreamsControl: public QMediaStreamsControl -{ -public: - QtTestMediaStreamsControl(QObject *parent = 0) - : QMediaStreamsControl(parent) - { - } - - int streamCount() - { - QList m_stype; - - return streams.count(); - } - void setStreamCount(int count) - { - streams.resize(count); - } - - StreamType streamType(int index) - { - return streams.at(index).type; - } - void setStreamType(int index, StreamType type) - { - streams[index].type = type; - } - - QVariant metaData(int index, QtMultimedia::MetaData key) - { - QtMultimedia::MetaData keys = key; - return keys; - } - - void setMetaData(int index, QtMultimedia::MetaData key, const QVariant &value) - { - streams[index].metaData.insert(key, value); - } - - bool isActive(int index) - { - return streams.at(index).active; - } - void setActive(int index, bool state) - { - streams[index].active = state; - } - - void setAudioOnlyContent() - { - mediaContent = audioOnlyContent; - - m_player->setMedia(*mediaContent); - } - - void setVideoOnlyContent() - { - mediaContent = videoOnlyContent; - duration = 60000; - - m_player->setMedia(*mediaContent); - } - - void setAudioVideoContent() - { - if (mediaContent == audioVideoContent) - { - mediaContent = audioVideoAltContent; - duration = 101840; - } - else - { - mediaContent = audioVideoContent; - duration = 141000; - } - - m_player->setMedia(*mediaContent); - } - - void setStreamingContent() - { - mediaContent = streamingContent; - - m_player->setMedia(*mediaContent); - } - - - -public: - struct Stream - { - Stream() : type(UnknownStream), active(false) {} - StreamType type; - QMap metaData; - bool active; - }; - - QVector streams; - QMediaContent* audioOnlyContent; - QMediaContent* videoOnlyContent; - QMediaContent* audioVideoContent; - QMediaContent* audioVideoAltContent; - QMediaContent* mediaContent; - QMediaContent* streamingContent; - - qint64 duration; - QMediaPlayer *m_player; - QVideoWidget *m_widget; - QWidget *m_windowWidget; - - -}; - -class QTestMediaStreamsControlA : public QMediaControl -{ - Q_OBJECT -}; - -#define QTestMediaStreamsControlA_iid "com.nokia.QTestMediaStreamsControlA" -Q_MEDIA_DECLARE_CONTROL(QTestMediaStreamsControlA, QTestMediaStreamsControlA_iid) - -class QTestMediaStreamsControlB : public QMediaControl -{ - Q_OBJECT -public: - QTestMediaStreamsControlB() - : QMediaControl(0) - ,ctrlA(0) - ,ctrlB(0) - ,ctrlC(0) {} - - bool isActive(int stream) - { - return 1; - } - - int ctrlA; - int ctrlB; - int ctrlC; -}; - -#define QTestMediaStreamsControlB_iid "com.nokia.QTestMediaStreamsControlB" -Q_MEDIA_DECLARE_CONTROL(QTestMediaStreamsControlB, QTestMediaStreamsControlB_iid) - - -class QTestMediaStreamsControlC : public QMediaControl -{ - Q_OBJECT -}; - -#define QTestMediaStreamsControlC_iid "com.nokia.QTestMediaStreamsControlC" -Q_MEDIA_DECLARE_CONTROL(QTestMediaStreamsControlC, QTestMediaStreamsControlC_iid) // Yes A. - -class QTestMediaStreamsControlD : public QMediaControl -{ - Q_OBJECT -}; - -#define QTestMediaStreamsControlD_iid "com.nokia.QTestMediaStreamsControlD" -Q_MEDIA_DECLARE_CONTROL(QTestMediaStreamsControlD, QTestMediaStreamsControlD_iid) - - -class QtTestMediaService : public QMediaService -{ - Q_OBJECT -public: - QtTestMediaService() - : QMediaService(0) - , refA(0) - , refB(0) - , refC(0) - { - } - - QMediaControl *requestControl(const char *name) - { - if (strcmp(name, QTestMediaStreamsControlA_iid) == 0) { - refA += 1; - - return &controlA; - } else if (strcmp(name, QTestMediaStreamsControlB_iid) == 0) { - refB += 1; - - return &controlB; - } else if (strcmp(name, QTestMediaStreamsControlC_iid) == 0) { - refA += 1; - - return &controlA; - } else { - return 0; - } - } - - void releaseControl(QMediaControl *control) - { - if (control == &controlA) - refA -= 1; - else if (control == &controlB) - refB -= 1; - else if (control == &controlC) - refC -= 1; - } - - using QMediaService::requestControl; - - int refA; - int refB; - int refC; - QTestMediaStreamsControlA controlA; - QTestMediaStreamsControlB controlB; - QTestMediaStreamsControlC controlC; -}; - - -tst_qmediastreamscontrol::tst_qmediastreamscontrol() -{ -} - -void tst_qmediastreamscontrol::initTestCase() -{ -} - -void tst_qmediastreamscontrol::cleanupTestCase() -{ -} - -void tst_qmediastreamscontrol::control_iid() -{ - - // Default implementation. - QCOMPARE(qmediacontrol_iid(), QTestMediaStreamsControlA_iid); - - // Partial template. - QVERIFY(qstrcmp(qmediacontrol_iid(), QTestMediaStreamsControlA_iid) == 0); -} - -void tst_qmediastreamscontrol::control() -{ - QtTestMediaService *service = new QtTestMediaService(); - QMediaStreamsControl *control = qobject_cast - (service->requestControl("com.nokia.Qt.MediaStreamsControl/1.0")); - // QCOMPARE(control,service->controlA.objectName()); - QTestMediaStreamsControlA *controlA = (QTestMediaStreamsControlA *)service->requestControl("controlA"); - // QCOMPARE(controlA,service->controlA); - QVERIFY(service->requestControl()); - - service->releaseControl(controlA); - delete service; -} - -void tst_qmediastreamscontrol::isActive() -{ - QTestMediaStreamsControlB ser; - QVERIFY(ser.isActive(1)); - QtTestMediaStreamsControl m_active; - //setActive - m_active.setActive(1,1); - QVERIFY(m_active.isActive(1)); - //set InActive - m_active.setActive(2,0); - QVERIFY(!m_active.isActive(0)); -} - -//Returns the number of media streams. -void tst_qmediastreamscontrol::streamCount() -{ - QtTestMediaStreamsControl m_cnt; - m_cnt.setStreamType(0,QMediaStreamsControl::UnknownStream); - m_cnt.setStreamType(1,QMediaStreamsControl::VideoStream); - m_cnt.setStreamType(2,QMediaStreamsControl::AudioStream); - m_cnt.setStreamType(3,QMediaStreamsControl::SubPictureStream); - m_cnt.setStreamType(4,QMediaStreamsControl::DataStream); - m_cnt.setStreamCount(5); - QVERIFY(m_cnt.streamCount() == m_cnt.streams.count()); -} - -//The signal is emitted when the available streams list is changed. -void tst_qmediastreamscontrol::streamsChanged() -{ - QMediaPlayer *m_player = new QMediaPlayer(0); - QMediaStreamsControl* m_streamControl = (QMediaStreamsControl*) - (m_player->service()->requestControl(QTestMediaStreamsControlA_iid)); - - QMediaContent videoOnlyContent; - - m_player->setMedia(videoOnlyContent); - if (m_streamControl) { - QSignalSpy m_strm_lst_chgSpy(m_streamControl,SIGNAL(streamsChanged())); - QVERIFY(m_strm_lst_chgSpy.isValid()); - QVERIFY(m_strm_lst_chgSpy.isEmpty()); - WAIT_FOR_CONDITION(m_player->mediaStatus(),QMediaPlayer::LoadedMedia); - QVERIFY(m_streamControl->streamCount() == 1); - QVERIFY(m_strm_lst_chgSpy.count() == 1); - } - - delete m_player; - m_player = NULL; -} - -void tst_qmediastreamscontrol::metadata() -{ - QtTestMediaStreamsControl m_metadata; - m_metadata.metaData(1,QtMultimedia::AlbumArtist); - qDebug() << m_metadata.metaData(1,QtMultimedia::AlbumArtist); -} -QTEST_MAIN(tst_qmediastreamscontrol); - -#include "tst_qmediastreamscontrol.moc" diff --git a/tests/auto/qvideodevicecontrol/qvideodevicecontrol.pro b/tests/auto/qvideodevicecontrol/qvideodevicecontrol.pro deleted file mode 100644 index 29bd81fa..00000000 --- a/tests/auto/qvideodevicecontrol/qvideodevicecontrol.pro +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG += testcase -TARGET = tst_qvideodevicecontrol - -QT += multimedia-private testlib -CONFIG += no_private_qt_headers_warning - -SOURCES += tst_qvideodevicecontrol.cpp diff --git a/tests/auto/qvideodevicecontrol/tst_qvideodevicecontrol.cpp b/tests/auto/qvideodevicecontrol/tst_qvideodevicecontrol.cpp deleted file mode 100644 index 59d2546b..00000000 --- a/tests/auto/qvideodevicecontrol/tst_qvideodevicecontrol.cpp +++ /dev/null @@ -1,110 +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 test suite 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$ -** -****************************************************************************/ - -//TESTED_COMPONENT=src/multimedia - -#include -#include "qvideodevicecontrol.h" -class TestClass: public QVideoDeviceControl -{ - Q_OBJECT - -public: - TestClass(QObject *parent = 0 ):QVideoDeviceControl(parent) - { - - } - - ~TestClass(){} - - virtual int deviceCount() const { return 0; } - - QString deviceName(int index) const - { - QString str; - return str; - } - - QString deviceDescription(int index) const - { - QString str; - return str; - } - - QIcon deviceIcon(int index) const - { - QIcon icon; - return icon; - } - - int defaultDevice() const { return 0; } - int selectedDevice() const { return 0; } - - public Q_SLOTS: - void setSelectedDevice(int index) - { - emit devicesChanged(); - emit selectedDeviceChanged(index); - emit selectedDeviceChanged("abc"); - } -}; - - -class tst_QVideoDeviceControl : public QObject -{ - Q_OBJECT -public: - tst_QVideoDeviceControl(){} - ~tst_QVideoDeviceControl(){} - -private slots: - void testQVideoDeviceControl(); -}; - -//MaemoAPI-1859:QVideoDeviceControl constructor -void tst_QVideoDeviceControl::testQVideoDeviceControl() -{ - TestClass *testClass = new TestClass(this); - QVERIFY(testClass != NULL); -} - -QTEST_MAIN(tst_QVideoDeviceControl) -#include "tst_qvideodevicecontrol.moc" diff --git a/tests/auto/multimedia.pro b/tests/auto/unit/multimedia.pro similarity index 62% rename from tests/auto/multimedia.pro rename to tests/auto/unit/multimedia.pro index 339884be..4dbe2b9a 100644 --- a/tests/auto/multimedia.pro +++ b/tests/auto/unit/multimedia.pro @@ -6,53 +6,36 @@ SUBDIRS += \ qaudiocapturesource \ qaudiodeviceinfo \ qaudioformat \ - qaudioinput \ qaudionamespace \ - qaudiooutput \ + qcamera \ + qcameraimagecapture \ qmediabindableinterface \ qmediacontainercontrol \ qmediacontent \ - qmediaplayerbackend \ + qmediaobject \ + qmediaplayer \ qmediaplaylistnavigator \ qmediarecorder \ qmediaresource \ qmediaservice \ qmediatimerange \ - qradiotuner \ - qradiodata \ - qvideoframe \ - qvideosurfaceformat \ qmetadatareadercontrol \ qmetadatawritercontrol \ - qmediaplayer \ - qcameraimagecapture \ - qmediaobject \ - qcamera \ - qcamerabackend \ + qradiodata \ + qradiotuner \ + qvideoencodercontrol \ + qvideoframe \ + qvideosurfaceformat \ qwavedecoder -# These is disabled until intent is clearer -# qvideodevicecontrol \ -# qvideoencodercontrol \ - -# This is a commment for the mock backend directory so that maketestselftest -# doesn't believe it's an untested directory -# qmultimedia_common - - # Tests depending on private interfaces should only be built if # these interfaces are exported. contains (QT_CONFIG, private_tests) { + # These depend on controlling the set of plugins loaded (in qmediapluginloader) SUBDIRS += \ + qdeclarativeaudio \ qmediaplaylist \ qmediapluginloader \ qmediaimageviewer \ qmediaserviceprovider - - contains (QT_CONFIG, declarative) { - # All the declarative tests depend on private interfaces - SUBDIRS += \ - qsoundeffect \ - qdeclarativeaudio - } } diff --git a/tests/auto/multimediawidgets.pro b/tests/auto/unit/multimediawidgets.pro similarity index 60% rename from tests/auto/multimediawidgets.pro rename to tests/auto/unit/multimediawidgets.pro index 5a55ecc3..0105e3ed 100644 --- a/tests/auto/multimediawidgets.pro +++ b/tests/auto/unit/multimediawidgets.pro @@ -5,10 +5,6 @@ SUBDIRS += \ qcamerawidgets \ qmediaplayerwidgets \ -# This is a commment for the mock backend directory so that maketestselftest -# doesn't believe it's an untested directory -# qmultimedia_common - # Tests depending on private interfaces should only be built if # these interfaces are exported. contains (QT_CONFIG, private_tests) { @@ -17,9 +13,5 @@ contains (QT_CONFIG, private_tests) { qpaintervideosurface \ qmediaimageviewerwidgets \ qvideowidget \ - - contains (QT_CONFIG, declarative) { - disabled:SUBDIRS += qdeclarativevideo - } } diff --git a/tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro b/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro similarity index 100% rename from tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro rename to tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro diff --git a/tests/auto/qabstractvideobuffer/tst_qabstractvideobuffer.cpp b/tests/auto/unit/qabstractvideobuffer/tst_qabstractvideobuffer.cpp similarity index 100% rename from tests/auto/qabstractvideobuffer/tst_qabstractvideobuffer.cpp rename to tests/auto/unit/qabstractvideobuffer/tst_qabstractvideobuffer.cpp diff --git a/tests/auto/qabstractvideosurface/qabstractvideosurface.pro b/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro similarity index 100% rename from tests/auto/qabstractvideosurface/qabstractvideosurface.pro rename to tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro diff --git a/tests/auto/qabstractvideosurface/tst_qabstractvideosurface.cpp b/tests/auto/unit/qabstractvideosurface/tst_qabstractvideosurface.cpp similarity index 100% rename from tests/auto/qabstractvideosurface/tst_qabstractvideosurface.cpp rename to tests/auto/unit/qabstractvideosurface/tst_qabstractvideosurface.cpp diff --git a/tests/auto/qaudiocapturesource/qaudiocapturesource.pro b/tests/auto/unit/qaudiocapturesource/qaudiocapturesource.pro similarity index 100% rename from tests/auto/qaudiocapturesource/qaudiocapturesource.pro rename to tests/auto/unit/qaudiocapturesource/qaudiocapturesource.pro diff --git a/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp b/tests/auto/unit/qaudiocapturesource/tst_qaudiocapturesource.cpp similarity index 100% rename from tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp rename to tests/auto/unit/qaudiocapturesource/tst_qaudiocapturesource.cpp diff --git a/tests/auto/qaudiodeviceinfo/qaudiodeviceinfo.pro b/tests/auto/unit/qaudiodeviceinfo/qaudiodeviceinfo.pro similarity index 100% rename from tests/auto/qaudiodeviceinfo/qaudiodeviceinfo.pro rename to tests/auto/unit/qaudiodeviceinfo/qaudiodeviceinfo.pro diff --git a/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp b/tests/auto/unit/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp similarity index 100% rename from tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp rename to tests/auto/unit/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp diff --git a/tests/auto/qaudioformat/qaudioformat.pro b/tests/auto/unit/qaudioformat/qaudioformat.pro similarity index 100% rename from tests/auto/qaudioformat/qaudioformat.pro rename to tests/auto/unit/qaudioformat/qaudioformat.pro diff --git a/tests/auto/qaudioformat/tst_qaudioformat.cpp b/tests/auto/unit/qaudioformat/tst_qaudioformat.cpp similarity index 100% rename from tests/auto/qaudioformat/tst_qaudioformat.cpp rename to tests/auto/unit/qaudioformat/tst_qaudioformat.cpp diff --git a/tests/auto/qaudionamespace/qaudionamespace.pro b/tests/auto/unit/qaudionamespace/qaudionamespace.pro similarity index 100% rename from tests/auto/qaudionamespace/qaudionamespace.pro rename to tests/auto/unit/qaudionamespace/qaudionamespace.pro diff --git a/tests/auto/qaudionamespace/tst_qaudionamespace.cpp b/tests/auto/unit/qaudionamespace/tst_qaudionamespace.cpp similarity index 100% rename from tests/auto/qaudionamespace/tst_qaudionamespace.cpp rename to tests/auto/unit/qaudionamespace/tst_qaudionamespace.cpp diff --git a/tests/auto/qcamera/qcamera.pro b/tests/auto/unit/qcamera/qcamera.pro similarity index 86% rename from tests/auto/qcamera/qcamera.pro rename to tests/auto/unit/qcamera/qcamera.pro index c6975456..095349d8 100644 --- a/tests/auto/qcamera/qcamera.pro +++ b/tests/auto/unit/qcamera/qcamera.pro @@ -8,5 +8,3 @@ include (../qmultimedia_common/mock.pri) include (../qmultimedia_common/mockcamera.pri) SOURCES += tst_qcamera.cpp - -maemo*:CONFIG += insignificant_test diff --git a/tests/auto/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp similarity index 100% rename from tests/auto/qcamera/tst_qcamera.cpp rename to tests/auto/unit/qcamera/tst_qcamera.cpp diff --git a/tests/auto/qcameraimagecapture/qcameraimagecapture.pro b/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro similarity index 100% rename from tests/auto/qcameraimagecapture/qcameraimagecapture.pro rename to tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro diff --git a/tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp b/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp similarity index 100% rename from tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp rename to tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp diff --git a/tests/auto/qcameraviewfinder/qcameraviewfinder.pro b/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro similarity index 100% rename from tests/auto/qcameraviewfinder/qcameraviewfinder.pro rename to tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro diff --git a/tests/auto/qcameraviewfinder/tst_qcameraviewfinder.cpp b/tests/auto/unit/qcameraviewfinder/tst_qcameraviewfinder.cpp similarity index 100% rename from tests/auto/qcameraviewfinder/tst_qcameraviewfinder.cpp rename to tests/auto/unit/qcameraviewfinder/tst_qcameraviewfinder.cpp diff --git a/tests/auto/qcamerawidgets/qcamerawidgets.pro b/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro similarity index 100% rename from tests/auto/qcamerawidgets/qcamerawidgets.pro rename to tests/auto/unit/qcamerawidgets/qcamerawidgets.pro diff --git a/tests/auto/qcamerawidgets/tst_qcamerawidgets.cpp b/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp similarity index 100% rename from tests/auto/qcamerawidgets/tst_qcamerawidgets.cpp rename to tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp diff --git a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro similarity index 100% rename from tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro rename to tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro diff --git a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp similarity index 100% rename from tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp rename to tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp diff --git a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro similarity index 100% rename from tests/auto/qdeclarativevideo/qdeclarativevideo.pro rename to tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro diff --git a/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp b/tests/auto/unit/qdeclarativevideo/tst_qdeclarativevideo.cpp similarity index 100% rename from tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp rename to tests/auto/unit/qdeclarativevideo/tst_qdeclarativevideo.cpp diff --git a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro b/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro similarity index 100% rename from tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro rename to tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro diff --git a/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp b/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp similarity index 100% rename from tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp rename to tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp diff --git a/tests/auto/qmediabindableinterface/qmediabindableinterface.pro b/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro similarity index 100% rename from tests/auto/qmediabindableinterface/qmediabindableinterface.pro rename to tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro diff --git a/tests/auto/qmediabindableinterface/tst_qmediabindableinterface.cpp b/tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp similarity index 100% rename from tests/auto/qmediabindableinterface/tst_qmediabindableinterface.cpp rename to tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp diff --git a/tests/auto/qmediacontainercontrol/qmediacontainercontrol.pro b/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro similarity index 100% rename from tests/auto/qmediacontainercontrol/qmediacontainercontrol.pro rename to tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro diff --git a/tests/auto/qmediacontainercontrol/tst_qmediacontainercontrol.cpp b/tests/auto/unit/qmediacontainercontrol/tst_qmediacontainercontrol.cpp similarity index 100% rename from tests/auto/qmediacontainercontrol/tst_qmediacontainercontrol.cpp rename to tests/auto/unit/qmediacontainercontrol/tst_qmediacontainercontrol.cpp diff --git a/tests/auto/qmediacontent/qmediacontent.pro b/tests/auto/unit/qmediacontent/qmediacontent.pro similarity index 100% rename from tests/auto/qmediacontent/qmediacontent.pro rename to tests/auto/unit/qmediacontent/qmediacontent.pro diff --git a/tests/auto/qmediacontent/tst_qmediacontent.cpp b/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp similarity index 100% rename from tests/auto/qmediacontent/tst_qmediacontent.cpp rename to tests/auto/unit/qmediacontent/tst_qmediacontent.cpp diff --git a/tests/auto/qmediaimageviewer/images.qrc b/tests/auto/unit/qmediaimageviewer/images.qrc similarity index 100% rename from tests/auto/qmediaimageviewer/images.qrc rename to tests/auto/unit/qmediaimageviewer/images.qrc diff --git a/tests/auto/qmediaimageviewer/images/coverart.png b/tests/auto/unit/qmediaimageviewer/images/coverart.png similarity index 100% rename from tests/auto/qmediaimageviewer/images/coverart.png rename to tests/auto/unit/qmediaimageviewer/images/coverart.png diff --git a/tests/auto/qmediaimageviewer/images/image.jpg b/tests/auto/unit/qmediaimageviewer/images/image.jpg similarity index 100% rename from tests/auto/qmediaimageviewer/images/image.jpg rename to tests/auto/unit/qmediaimageviewer/images/image.jpg diff --git a/tests/auto/qmediaimageviewer/images/image.png b/tests/auto/unit/qmediaimageviewer/images/image.png similarity index 100% rename from tests/auto/qmediaimageviewer/images/image.png rename to tests/auto/unit/qmediaimageviewer/images/image.png diff --git a/tests/auto/qmediaimageviewer/images/invalid.png b/tests/auto/unit/qmediaimageviewer/images/invalid.png similarity index 100% rename from tests/auto/qmediaimageviewer/images/invalid.png rename to tests/auto/unit/qmediaimageviewer/images/invalid.png diff --git a/tests/auto/qmediaimageviewer/images/poster.png b/tests/auto/unit/qmediaimageviewer/images/poster.png similarity index 100% rename from tests/auto/qmediaimageviewer/images/poster.png rename to tests/auto/unit/qmediaimageviewer/images/poster.png diff --git a/tests/auto/qmediaimageviewer/qmediaimageviewer.pro b/tests/auto/unit/qmediaimageviewer/qmediaimageviewer.pro similarity index 100% rename from tests/auto/qmediaimageviewer/qmediaimageviewer.pro rename to tests/auto/unit/qmediaimageviewer/qmediaimageviewer.pro diff --git a/tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp b/tests/auto/unit/qmediaimageviewer/tst_qmediaimageviewer.cpp similarity index 100% rename from tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp rename to tests/auto/unit/qmediaimageviewer/tst_qmediaimageviewer.cpp diff --git a/tests/auto/qmediaimageviewerwidgets/images.qrc b/tests/auto/unit/qmediaimageviewerwidgets/images.qrc similarity index 100% rename from tests/auto/qmediaimageviewerwidgets/images.qrc rename to tests/auto/unit/qmediaimageviewerwidgets/images.qrc diff --git a/tests/auto/qmediaimageviewerwidgets/images/image.png b/tests/auto/unit/qmediaimageviewerwidgets/images/image.png similarity index 100% rename from tests/auto/qmediaimageviewerwidgets/images/image.png rename to tests/auto/unit/qmediaimageviewerwidgets/images/image.png diff --git a/tests/auto/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro b/tests/auto/unit/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro similarity index 100% rename from tests/auto/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro rename to tests/auto/unit/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro diff --git a/tests/auto/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp b/tests/auto/unit/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp similarity index 100% rename from tests/auto/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp rename to tests/auto/unit/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp diff --git a/tests/auto/qmediaobject/main.cpp b/tests/auto/unit/qmediaobject/main.cpp similarity index 100% rename from tests/auto/qmediaobject/main.cpp rename to tests/auto/unit/qmediaobject/main.cpp diff --git a/tests/auto/qmediaobject/qmediaobject.pro b/tests/auto/unit/qmediaobject/qmediaobject.pro similarity index 100% rename from tests/auto/qmediaobject/qmediaobject.pro rename to tests/auto/unit/qmediaobject/qmediaobject.pro diff --git a/tests/auto/qmediaobject/tst_qmediaobject.cpp b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp similarity index 100% rename from tests/auto/qmediaobject/tst_qmediaobject.cpp rename to tests/auto/unit/qmediaobject/tst_qmediaobject.cpp diff --git a/tests/auto/qmediaobject/tst_qmediaobject.h b/tests/auto/unit/qmediaobject/tst_qmediaobject.h similarity index 100% rename from tests/auto/qmediaobject/tst_qmediaobject.h rename to tests/auto/unit/qmediaobject/tst_qmediaobject.h diff --git a/tests/auto/qmediaplayer/main.cpp b/tests/auto/unit/qmediaplayer/main.cpp similarity index 100% rename from tests/auto/qmediaplayer/main.cpp rename to tests/auto/unit/qmediaplayer/main.cpp diff --git a/tests/auto/qmediaplayer/qmediaplayer.pro b/tests/auto/unit/qmediaplayer/qmediaplayer.pro similarity index 100% rename from tests/auto/qmediaplayer/qmediaplayer.pro rename to tests/auto/unit/qmediaplayer/qmediaplayer.pro diff --git a/tests/auto/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp similarity index 100% rename from tests/auto/qmediaplayer/tst_qmediaplayer.cpp rename to tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp diff --git a/tests/auto/qmediaplayer/tst_qmediaplayer.h b/tests/auto/unit/qmediaplayer/tst_qmediaplayer.h similarity index 100% rename from tests/auto/qmediaplayer/tst_qmediaplayer.h rename to tests/auto/unit/qmediaplayer/tst_qmediaplayer.h diff --git a/tests/auto/qmediaplayerwidgets/main.cpp b/tests/auto/unit/qmediaplayerwidgets/main.cpp similarity index 100% rename from tests/auto/qmediaplayerwidgets/main.cpp rename to tests/auto/unit/qmediaplayerwidgets/main.cpp diff --git a/tests/auto/qmediaplayerwidgets/qmediaplayerwidgets.pro b/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro similarity index 100% rename from tests/auto/qmediaplayerwidgets/qmediaplayerwidgets.pro rename to tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro diff --git a/tests/auto/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp b/tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp similarity index 100% rename from tests/auto/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp rename to tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp diff --git a/tests/auto/qmediaplayerwidgets/tst_qmediaplayerwidgets.h b/tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.h similarity index 100% rename from tests/auto/qmediaplayerwidgets/tst_qmediaplayerwidgets.h rename to tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.h diff --git a/tests/auto/qmediaplaylist/qmediaplaylist.pro b/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro similarity index 83% rename from tests/auto/qmediaplaylist/qmediaplaylist.pro rename to tests/auto/unit/qmediaplaylist/qmediaplaylist.pro index d0283438..c6b28a7c 100644 --- a/tests/auto/qmediaplaylist/qmediaplaylist.pro +++ b/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro @@ -1,9 +1,6 @@ CONFIG += testcase TARGET = tst_qmediaplaylist -# temporarily blacklist test because is fails miserably -CONFIG += insignificant_test - include (../qmultimedia_common/mockplaylist.pri) QT += multimedia-private testlib diff --git a/tests/auto/qmediaplaylist/testdata/test.m3u b/tests/auto/unit/qmediaplaylist/testdata/test.m3u similarity index 100% rename from tests/auto/qmediaplaylist/testdata/test.m3u rename to tests/auto/unit/qmediaplaylist/testdata/test.m3u diff --git a/tests/auto/qmediaplaylist/testdata/testfile b/tests/auto/unit/qmediaplaylist/testdata/testfile similarity index 100% rename from tests/auto/qmediaplaylist/testdata/testfile rename to tests/auto/unit/qmediaplaylist/testdata/testfile diff --git a/tests/auto/qmediaplaylist/testdata/testfile2#suffix b/tests/auto/unit/qmediaplaylist/testdata/testfile2#suffix similarity index 100% rename from tests/auto/qmediaplaylist/testdata/testfile2#suffix rename to tests/auto/unit/qmediaplaylist/testdata/testfile2#suffix diff --git a/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp similarity index 98% rename from tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp rename to tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp index e2002435..91c4dda5 100644 --- a/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp +++ b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp @@ -368,13 +368,13 @@ void tst_QMediaPlaylist::saveAndLoad() QVERIFY(playlist.error() != QMediaPlaylist::NoError); QVERIFY(!playlist.errorString().isEmpty()); - res = playlist.save(QUrl(QLatin1String("tmp.unsupported_format")), "unsupported_format"); + res = playlist.save(QUrl::fromLocalFile(QLatin1String("tmp.unsupported_format")), "unsupported_format"); QVERIFY(!res); QVERIFY(playlist.error() != QMediaPlaylist::NoError); QVERIFY(!playlist.errorString().isEmpty()); errorSignal.clear(); - playlist.load(QUrl(QLatin1String("tmp.unsupported_format")), "unsupported_format"); + playlist.load(QUrl::fromLocalFile(QLatin1String("tmp.unsupported_format")), "unsupported_format"); QCOMPARE(errorSignal.size(), 1); QVERIFY(playlist.error() == QMediaPlaylist::FormatNotSupportedError); QVERIFY(!playlist.errorString().isEmpty()); @@ -393,12 +393,12 @@ void tst_QMediaPlaylist::saveAndLoad() QCOMPARE(playlist.media(0), playlist2.media(0)); QCOMPARE(playlist.media(1), playlist2.media(1)); QCOMPARE(playlist.media(3), playlist2.media(3)); - res = playlist.save(QUrl(QLatin1String("tmp.m3u")), "m3u"); + res = playlist.save(QUrl::fromLocalFile(QLatin1String("tmp.m3u")), "m3u"); QVERIFY(res); playlist2.clear(); QVERIFY(playlist2.isEmpty()); - playlist2.load(QUrl(QLatin1String("tmp.m3u")), "m3u"); + playlist2.load(QUrl::fromLocalFile(QLatin1String("tmp.m3u")), "m3u"); QCOMPARE(playlist.error(), QMediaPlaylist::NoError); QCOMPARE(playlist.mediaCount(), playlist2.mediaCount()); @@ -488,7 +488,7 @@ void tst_QMediaPlaylist::shuffle() QList contentList; for (int i=0; i<100; i++) { - QMediaContent content(QUrl(QString::number(i))); + QMediaContent content(QUrl::fromLocalFile(QString::number(i))); contentList.append(content); playlist.addMedia(content); } @@ -561,7 +561,7 @@ void tst_QMediaPlaylist::readOnlyPlaylist() QCOMPARE(playlist.mediaCount(), 3); errorSignal.clear(); - playlist.load(QUrl(QLatin1String("tmp.m3u")), "m3u"); + playlist.load(QUrl::fromLocalFile(QLatin1String("tmp.m3u")), "m3u"); QCOMPARE(errorSignal.size(), 1); QCOMPARE(playlist.error(), QMediaPlaylist::AccessDeniedError); diff --git a/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro b/tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro similarity index 100% rename from tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro rename to tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro diff --git a/tests/auto/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp b/tests/auto/unit/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp similarity index 100% rename from tests/auto/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp rename to tests/auto/unit/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp diff --git a/tests/auto/qmediapluginloader/qmediapluginloader.pro b/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro similarity index 100% rename from tests/auto/qmediapluginloader/qmediapluginloader.pro rename to tests/auto/unit/qmediapluginloader/qmediapluginloader.pro diff --git a/tests/auto/qmediapluginloader/tst_qmediapluginloader.cpp b/tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp similarity index 100% rename from tests/auto/qmediapluginloader/tst_qmediapluginloader.cpp rename to tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp diff --git a/tests/auto/qmediarecorder/main.cpp b/tests/auto/unit/qmediarecorder/main.cpp similarity index 100% rename from tests/auto/qmediarecorder/main.cpp rename to tests/auto/unit/qmediarecorder/main.cpp diff --git a/tests/auto/qmediarecorder/qmediarecorder.pro b/tests/auto/unit/qmediarecorder/qmediarecorder.pro similarity index 100% rename from tests/auto/qmediarecorder/qmediarecorder.pro rename to tests/auto/unit/qmediarecorder/qmediarecorder.pro diff --git a/tests/auto/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp similarity index 100% rename from tests/auto/qmediarecorder/tst_qmediarecorder.cpp rename to tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp diff --git a/tests/auto/qmediarecorder/tst_qmediarecorder.h b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.h similarity index 100% rename from tests/auto/qmediarecorder/tst_qmediarecorder.h rename to tests/auto/unit/qmediarecorder/tst_qmediarecorder.h diff --git a/tests/auto/qmediaresource/qmediaresource.pro b/tests/auto/unit/qmediaresource/qmediaresource.pro similarity index 100% rename from tests/auto/qmediaresource/qmediaresource.pro rename to tests/auto/unit/qmediaresource/qmediaresource.pro diff --git a/tests/auto/qmediaresource/tst_qmediaresource.cpp b/tests/auto/unit/qmediaresource/tst_qmediaresource.cpp similarity index 100% rename from tests/auto/qmediaresource/tst_qmediaresource.cpp rename to tests/auto/unit/qmediaresource/tst_qmediaresource.cpp diff --git a/tests/auto/qmediaservice/qmediaservice.pro b/tests/auto/unit/qmediaservice/qmediaservice.pro similarity index 100% rename from tests/auto/qmediaservice/qmediaservice.pro rename to tests/auto/unit/qmediaservice/qmediaservice.pro diff --git a/tests/auto/qmediaservice/tst_qmediaservice.cpp b/tests/auto/unit/qmediaservice/tst_qmediaservice.cpp similarity index 100% rename from tests/auto/qmediaservice/tst_qmediaservice.cpp rename to tests/auto/unit/qmediaservice/tst_qmediaservice.cpp diff --git a/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro b/tests/auto/unit/qmediaserviceprovider/qmediaserviceprovider.pro similarity index 100% rename from tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro rename to tests/auto/unit/qmediaserviceprovider/qmediaserviceprovider.pro diff --git a/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp b/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp similarity index 100% rename from tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp rename to tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp diff --git a/tests/auto/qmediatimerange/qmediatimerange.pro b/tests/auto/unit/qmediatimerange/qmediatimerange.pro similarity index 100% rename from tests/auto/qmediatimerange/qmediatimerange.pro rename to tests/auto/unit/qmediatimerange/qmediatimerange.pro diff --git a/tests/auto/qmediatimerange/tst_qmediatimerange.cpp b/tests/auto/unit/qmediatimerange/tst_qmediatimerange.cpp similarity index 100% rename from tests/auto/qmediatimerange/tst_qmediatimerange.cpp rename to tests/auto/unit/qmediatimerange/tst_qmediatimerange.cpp diff --git a/tests/auto/qmetadatareadercontrol/qmetadatareadercontrol.pro b/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro similarity index 100% rename from tests/auto/qmetadatareadercontrol/qmetadatareadercontrol.pro rename to tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro diff --git a/tests/auto/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp b/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp similarity index 100% rename from tests/auto/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp rename to tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp diff --git a/tests/auto/qmetadatawritercontrol/qmetadatawritercontrol.pro b/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro similarity index 100% rename from tests/auto/qmetadatawritercontrol/qmetadatawritercontrol.pro rename to tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro diff --git a/tests/auto/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp b/tests/auto/unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp similarity index 100% rename from tests/auto/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp rename to tests/auto/unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp diff --git a/tests/auto/qmultimedia_common/mock.pri b/tests/auto/unit/qmultimedia_common/mock.pri similarity index 100% rename from tests/auto/qmultimedia_common/mock.pri rename to tests/auto/unit/qmultimedia_common/mock.pri diff --git a/tests/auto/qmultimedia_common/mockaudioencodercontrol.h b/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockaudioencodercontrol.h rename to tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h diff --git a/tests/auto/qmultimedia_common/mockaudioendpointselector.h b/tests/auto/unit/qmultimedia_common/mockaudioendpointselector.h similarity index 100% rename from tests/auto/qmultimedia_common/mockaudioendpointselector.h rename to tests/auto/unit/qmultimedia_common/mockaudioendpointselector.h diff --git a/tests/auto/qmultimedia_common/mockcamera.pri b/tests/auto/unit/qmultimedia_common/mockcamera.pri similarity index 100% rename from tests/auto/qmultimedia_common/mockcamera.pri rename to tests/auto/unit/qmultimedia_common/mockcamera.pri diff --git a/tests/auto/qmultimedia_common/mockcameracapturebuffercontrol.h b/tests/auto/unit/qmultimedia_common/mockcameracapturebuffercontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockcameracapturebuffercontrol.h rename to tests/auto/unit/qmultimedia_common/mockcameracapturebuffercontrol.h diff --git a/tests/auto/qmultimedia_common/mockcameracapturedestinationcontrol.h b/tests/auto/unit/qmultimedia_common/mockcameracapturedestinationcontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockcameracapturedestinationcontrol.h rename to tests/auto/unit/qmultimedia_common/mockcameracapturedestinationcontrol.h diff --git a/tests/auto/qmultimedia_common/mockcameracontrol.h b/tests/auto/unit/qmultimedia_common/mockcameracontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockcameracontrol.h rename to tests/auto/unit/qmultimedia_common/mockcameracontrol.h diff --git a/tests/auto/qmultimedia_common/mockcameraexposurecontrol.h b/tests/auto/unit/qmultimedia_common/mockcameraexposurecontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockcameraexposurecontrol.h rename to tests/auto/unit/qmultimedia_common/mockcameraexposurecontrol.h diff --git a/tests/auto/qmultimedia_common/mockcameraflashcontrol.h b/tests/auto/unit/qmultimedia_common/mockcameraflashcontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockcameraflashcontrol.h rename to tests/auto/unit/qmultimedia_common/mockcameraflashcontrol.h diff --git a/tests/auto/qmultimedia_common/mockcamerafocuscontrol.h b/tests/auto/unit/qmultimedia_common/mockcamerafocuscontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockcamerafocuscontrol.h rename to tests/auto/unit/qmultimedia_common/mockcamerafocuscontrol.h diff --git a/tests/auto/qmultimedia_common/mockcameraimagecapturecontrol.h b/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockcameraimagecapturecontrol.h rename to tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h diff --git a/tests/auto/qmultimedia_common/mockcameraimageprocessingcontrol.h b/tests/auto/unit/qmultimedia_common/mockcameraimageprocessingcontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockcameraimageprocessingcontrol.h rename to tests/auto/unit/qmultimedia_common/mockcameraimageprocessingcontrol.h diff --git a/tests/auto/qmultimedia_common/mockcameralockscontrol.h b/tests/auto/unit/qmultimedia_common/mockcameralockscontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockcameralockscontrol.h rename to tests/auto/unit/qmultimedia_common/mockcameralockscontrol.h diff --git a/tests/auto/qmultimedia_common/mockcameraservice.h b/tests/auto/unit/qmultimedia_common/mockcameraservice.h similarity index 100% rename from tests/auto/qmultimedia_common/mockcameraservice.h rename to tests/auto/unit/qmultimedia_common/mockcameraservice.h diff --git a/tests/auto/qmultimedia_common/mockcontainer.pri b/tests/auto/unit/qmultimedia_common/mockcontainer.pri similarity index 100% rename from tests/auto/qmultimedia_common/mockcontainer.pri rename to tests/auto/unit/qmultimedia_common/mockcontainer.pri diff --git a/tests/auto/qmultimedia_common/mockimageencodercontrol.h b/tests/auto/unit/qmultimedia_common/mockimageencodercontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockimageencodercontrol.h rename to tests/auto/unit/qmultimedia_common/mockimageencodercontrol.h diff --git a/tests/auto/qmultimedia_common/mockmediacontainercontrol.h b/tests/auto/unit/qmultimedia_common/mockmediacontainercontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockmediacontainercontrol.h rename to tests/auto/unit/qmultimedia_common/mockmediacontainercontrol.h diff --git a/tests/auto/qmultimedia_common/mockmedianetworkaccesscontrol.h b/tests/auto/unit/qmultimedia_common/mockmedianetworkaccesscontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockmedianetworkaccesscontrol.h rename to tests/auto/unit/qmultimedia_common/mockmedianetworkaccesscontrol.h diff --git a/tests/auto/qmultimedia_common/mockmediaobject.h b/tests/auto/unit/qmultimedia_common/mockmediaobject.h similarity index 100% rename from tests/auto/qmultimedia_common/mockmediaobject.h rename to tests/auto/unit/qmultimedia_common/mockmediaobject.h diff --git a/tests/auto/qmultimedia_common/mockmediaplayercontrol.h b/tests/auto/unit/qmultimedia_common/mockmediaplayercontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockmediaplayercontrol.h rename to tests/auto/unit/qmultimedia_common/mockmediaplayercontrol.h diff --git a/tests/auto/qmultimedia_common/mockmediaplayerservice.h b/tests/auto/unit/qmultimedia_common/mockmediaplayerservice.h similarity index 100% rename from tests/auto/qmultimedia_common/mockmediaplayerservice.h rename to tests/auto/unit/qmultimedia_common/mockmediaplayerservice.h diff --git a/tests/auto/qmultimedia_common/mockmediaplaylistcontrol.h b/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockmediaplaylistcontrol.h rename to tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h diff --git a/tests/auto/qmultimedia_common/mockmediaplaylistsourcecontrol.h b/tests/auto/unit/qmultimedia_common/mockmediaplaylistsourcecontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockmediaplaylistsourcecontrol.h rename to tests/auto/unit/qmultimedia_common/mockmediaplaylistsourcecontrol.h diff --git a/tests/auto/qmultimedia_common/mockmediarecordercontrol.h b/tests/auto/unit/qmultimedia_common/mockmediarecordercontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockmediarecordercontrol.h rename to tests/auto/unit/qmultimedia_common/mockmediarecordercontrol.h diff --git a/tests/auto/qmultimedia_common/mockmediarecorderservice.h b/tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h similarity index 100% rename from tests/auto/qmultimedia_common/mockmediarecorderservice.h rename to tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h diff --git a/tests/auto/qmultimedia_common/mockmediaservice.h b/tests/auto/unit/qmultimedia_common/mockmediaservice.h similarity index 100% rename from tests/auto/qmultimedia_common/mockmediaservice.h rename to tests/auto/unit/qmultimedia_common/mockmediaservice.h diff --git a/tests/auto/qmultimedia_common/mockmediaserviceprovider.h b/tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h similarity index 100% rename from tests/auto/qmultimedia_common/mockmediaserviceprovider.h rename to tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h diff --git a/tests/auto/qmultimedia_common/mockmediastreamscontrol.h b/tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockmediastreamscontrol.h rename to tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h diff --git a/tests/auto/qmultimedia_common/mockmetadatareadercontrol.h b/tests/auto/unit/qmultimedia_common/mockmetadatareadercontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockmetadatareadercontrol.h rename to tests/auto/unit/qmultimedia_common/mockmetadatareadercontrol.h diff --git a/tests/auto/qmultimedia_common/mockmetadatawritercontrol.h b/tests/auto/unit/qmultimedia_common/mockmetadatawritercontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockmetadatawritercontrol.h rename to tests/auto/unit/qmultimedia_common/mockmetadatawritercontrol.h diff --git a/tests/auto/qmultimedia_common/mockplayer.pri b/tests/auto/unit/qmultimedia_common/mockplayer.pri similarity index 100% rename from tests/auto/qmultimedia_common/mockplayer.pri rename to tests/auto/unit/qmultimedia_common/mockplayer.pri diff --git a/tests/auto/qmultimedia_common/mockplaylist.pri b/tests/auto/unit/qmultimedia_common/mockplaylist.pri similarity index 100% rename from tests/auto/qmultimedia_common/mockplaylist.pri rename to tests/auto/unit/qmultimedia_common/mockplaylist.pri diff --git a/tests/auto/qmultimedia_common/mockplaylistservice.h b/tests/auto/unit/qmultimedia_common/mockplaylistservice.h similarity index 100% rename from tests/auto/qmultimedia_common/mockplaylistservice.h rename to tests/auto/unit/qmultimedia_common/mockplaylistservice.h diff --git a/tests/auto/qmultimedia_common/mockradio.pri b/tests/auto/unit/qmultimedia_common/mockradio.pri similarity index 100% rename from tests/auto/qmultimedia_common/mockradio.pri rename to tests/auto/unit/qmultimedia_common/mockradio.pri diff --git a/tests/auto/qmultimedia_common/mockradiodatacontrol.h b/tests/auto/unit/qmultimedia_common/mockradiodatacontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockradiodatacontrol.h rename to tests/auto/unit/qmultimedia_common/mockradiodatacontrol.h diff --git a/tests/auto/qmultimedia_common/mockradiotunercontrol.h b/tests/auto/unit/qmultimedia_common/mockradiotunercontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockradiotunercontrol.h rename to tests/auto/unit/qmultimedia_common/mockradiotunercontrol.h diff --git a/tests/auto/qmultimedia_common/mockreadonlyplaylistprovider.h b/tests/auto/unit/qmultimedia_common/mockreadonlyplaylistprovider.h similarity index 100% rename from tests/auto/qmultimedia_common/mockreadonlyplaylistprovider.h rename to tests/auto/unit/qmultimedia_common/mockreadonlyplaylistprovider.h diff --git a/tests/auto/qmultimedia_common/mockrecorder.pri b/tests/auto/unit/qmultimedia_common/mockrecorder.pri similarity index 100% rename from tests/auto/qmultimedia_common/mockrecorder.pri rename to tests/auto/unit/qmultimedia_common/mockrecorder.pri diff --git a/tests/auto/qmultimedia_common/mockvideo.pri b/tests/auto/unit/qmultimedia_common/mockvideo.pri similarity index 100% rename from tests/auto/qmultimedia_common/mockvideo.pri rename to tests/auto/unit/qmultimedia_common/mockvideo.pri diff --git a/tests/auto/qmultimedia_common/mockvideoencodercontrol.h b/tests/auto/unit/qmultimedia_common/mockvideoencodercontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockvideoencodercontrol.h rename to tests/auto/unit/qmultimedia_common/mockvideoencodercontrol.h diff --git a/tests/auto/qmultimedia_common/mockvideorenderercontrol.h b/tests/auto/unit/qmultimedia_common/mockvideorenderercontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockvideorenderercontrol.h rename to tests/auto/unit/qmultimedia_common/mockvideorenderercontrol.h diff --git a/tests/auto/qmultimedia_common/mockvideosurface.h b/tests/auto/unit/qmultimedia_common/mockvideosurface.h similarity index 100% rename from tests/auto/qmultimedia_common/mockvideosurface.h rename to tests/auto/unit/qmultimedia_common/mockvideosurface.h diff --git a/tests/auto/qmultimedia_common/mockvideowindowcontrol.h b/tests/auto/unit/qmultimedia_common/mockvideowindowcontrol.h similarity index 100% rename from tests/auto/qmultimedia_common/mockvideowindowcontrol.h rename to tests/auto/unit/qmultimedia_common/mockvideowindowcontrol.h diff --git a/tests/auto/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro similarity index 100% rename from tests/auto/qpaintervideosurface/qpaintervideosurface.pro rename to tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro diff --git a/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp similarity index 100% rename from tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp rename to tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp diff --git a/tests/auto/qradiodata/main.cpp b/tests/auto/unit/qradiodata/main.cpp similarity index 100% rename from tests/auto/qradiodata/main.cpp rename to tests/auto/unit/qradiodata/main.cpp diff --git a/tests/auto/qradiodata/qradiodata.pro b/tests/auto/unit/qradiodata/qradiodata.pro similarity index 100% rename from tests/auto/qradiodata/qradiodata.pro rename to tests/auto/unit/qradiodata/qradiodata.pro diff --git a/tests/auto/qradiodata/tst_qradiodata.cpp b/tests/auto/unit/qradiodata/tst_qradiodata.cpp similarity index 100% rename from tests/auto/qradiodata/tst_qradiodata.cpp rename to tests/auto/unit/qradiodata/tst_qradiodata.cpp diff --git a/tests/auto/qradiodata/tst_qradiodata.h b/tests/auto/unit/qradiodata/tst_qradiodata.h similarity index 100% rename from tests/auto/qradiodata/tst_qradiodata.h rename to tests/auto/unit/qradiodata/tst_qradiodata.h diff --git a/tests/auto/qradiotuner/main.cpp b/tests/auto/unit/qradiotuner/main.cpp similarity index 100% rename from tests/auto/qradiotuner/main.cpp rename to tests/auto/unit/qradiotuner/main.cpp diff --git a/tests/auto/qradiotuner/qradiotuner.pro b/tests/auto/unit/qradiotuner/qradiotuner.pro similarity index 100% rename from tests/auto/qradiotuner/qradiotuner.pro rename to tests/auto/unit/qradiotuner/qradiotuner.pro diff --git a/tests/auto/qradiotuner/tst_qradiotuner.cpp b/tests/auto/unit/qradiotuner/tst_qradiotuner.cpp similarity index 100% rename from tests/auto/qradiotuner/tst_qradiotuner.cpp rename to tests/auto/unit/qradiotuner/tst_qradiotuner.cpp diff --git a/tests/auto/qradiotuner/tst_qradiotuner.h b/tests/auto/unit/qradiotuner/tst_qradiotuner.h similarity index 100% rename from tests/auto/qradiotuner/tst_qradiotuner.h rename to tests/auto/unit/qradiotuner/tst_qradiotuner.h diff --git a/tests/auto/qvideoencodercontrol/qvideoencodercontrol.pro b/tests/auto/unit/qvideoencodercontrol/qvideoencodercontrol.pro similarity index 100% rename from tests/auto/qvideoencodercontrol/qvideoencodercontrol.pro rename to tests/auto/unit/qvideoencodercontrol/qvideoencodercontrol.pro diff --git a/tests/auto/qvideoencodercontrol/tst_qvideoencodercontrol.cpp b/tests/auto/unit/qvideoencodercontrol/tst_qvideoencodercontrol.cpp similarity index 100% rename from tests/auto/qvideoencodercontrol/tst_qvideoencodercontrol.cpp rename to tests/auto/unit/qvideoencodercontrol/tst_qvideoencodercontrol.cpp diff --git a/tests/auto/qvideoframe/qvideoframe.pro b/tests/auto/unit/qvideoframe/qvideoframe.pro similarity index 100% rename from tests/auto/qvideoframe/qvideoframe.pro rename to tests/auto/unit/qvideoframe/qvideoframe.pro diff --git a/tests/auto/qvideoframe/tst_qvideoframe.cpp b/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp similarity index 100% rename from tests/auto/qvideoframe/tst_qvideoframe.cpp rename to tests/auto/unit/qvideoframe/tst_qvideoframe.cpp diff --git a/tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro b/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro similarity index 100% rename from tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro rename to tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro diff --git a/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp b/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp similarity index 100% rename from tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp rename to tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp diff --git a/tests/auto/qvideowidget/qvideowidget.pro b/tests/auto/unit/qvideowidget/qvideowidget.pro similarity index 100% rename from tests/auto/qvideowidget/qvideowidget.pro rename to tests/auto/unit/qvideowidget/qvideowidget.pro diff --git a/tests/auto/qvideowidget/tst_qvideowidget.cpp b/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp similarity index 100% rename from tests/auto/qvideowidget/tst_qvideowidget.cpp rename to tests/auto/unit/qvideowidget/tst_qvideowidget.cpp diff --git a/tests/auto/qwavedecoder/data/corrupt_datadesc_1_16_8000.le.wav b/tests/auto/unit/qwavedecoder/data/corrupt_datadesc_1_16_8000.le.wav similarity index 100% rename from tests/auto/qwavedecoder/data/corrupt_datadesc_1_16_8000.le.wav rename to tests/auto/unit/qwavedecoder/data/corrupt_datadesc_1_16_8000.le.wav diff --git a/tests/auto/qwavedecoder/data/corrupt_fmtdesc_1_16_8000.le.wav b/tests/auto/unit/qwavedecoder/data/corrupt_fmtdesc_1_16_8000.le.wav similarity index 100% rename from tests/auto/qwavedecoder/data/corrupt_fmtdesc_1_16_8000.le.wav rename to tests/auto/unit/qwavedecoder/data/corrupt_fmtdesc_1_16_8000.le.wav diff --git a/tests/auto/qwavedecoder/data/corrupt_fmtstring_1_16_8000.le.wav b/tests/auto/unit/qwavedecoder/data/corrupt_fmtstring_1_16_8000.le.wav similarity index 100% rename from tests/auto/qwavedecoder/data/corrupt_fmtstring_1_16_8000.le.wav rename to tests/auto/unit/qwavedecoder/data/corrupt_fmtstring_1_16_8000.le.wav diff --git a/tests/auto/qwavedecoder/data/empty.wav b/tests/auto/unit/qwavedecoder/data/empty.wav similarity index 100% rename from tests/auto/qwavedecoder/data/empty.wav rename to tests/auto/unit/qwavedecoder/data/empty.wav diff --git a/tests/auto/qwavedecoder/data/gendata.sh b/tests/auto/unit/qwavedecoder/data/gendata.sh similarity index 100% rename from tests/auto/qwavedecoder/data/gendata.sh rename to tests/auto/unit/qwavedecoder/data/gendata.sh diff --git a/tests/auto/qwavedecoder/data/isawav_1_16_44100_le.wav b/tests/auto/unit/qwavedecoder/data/isawav_1_16_44100_le.wav similarity index 100% rename from tests/auto/qwavedecoder/data/isawav_1_16_44100_le.wav rename to tests/auto/unit/qwavedecoder/data/isawav_1_16_44100_le.wav diff --git a/tests/auto/qwavedecoder/data/isawav_1_16_8000_le.wav b/tests/auto/unit/qwavedecoder/data/isawav_1_16_8000_le.wav similarity index 100% rename from tests/auto/qwavedecoder/data/isawav_1_16_8000_le.wav rename to tests/auto/unit/qwavedecoder/data/isawav_1_16_8000_le.wav diff --git a/tests/auto/qwavedecoder/data/isawav_1_32_44100_le.wav b/tests/auto/unit/qwavedecoder/data/isawav_1_32_44100_le.wav similarity index 100% rename from tests/auto/qwavedecoder/data/isawav_1_32_44100_le.wav rename to tests/auto/unit/qwavedecoder/data/isawav_1_32_44100_le.wav diff --git a/tests/auto/qwavedecoder/data/isawav_1_32_8000_le.wav b/tests/auto/unit/qwavedecoder/data/isawav_1_32_8000_le.wav similarity index 100% rename from tests/auto/qwavedecoder/data/isawav_1_32_8000_le.wav rename to tests/auto/unit/qwavedecoder/data/isawav_1_32_8000_le.wav diff --git a/tests/auto/qwavedecoder/data/isawav_1_8_44100.wav b/tests/auto/unit/qwavedecoder/data/isawav_1_8_44100.wav similarity index 100% rename from tests/auto/qwavedecoder/data/isawav_1_8_44100.wav rename to tests/auto/unit/qwavedecoder/data/isawav_1_8_44100.wav diff --git a/tests/auto/qwavedecoder/data/isawav_1_8_8000.wav b/tests/auto/unit/qwavedecoder/data/isawav_1_8_8000.wav similarity index 100% rename from tests/auto/qwavedecoder/data/isawav_1_8_8000.wav rename to tests/auto/unit/qwavedecoder/data/isawav_1_8_8000.wav diff --git a/tests/auto/qwavedecoder/data/isawav_2_16_44100_be.wav b/tests/auto/unit/qwavedecoder/data/isawav_2_16_44100_be.wav similarity index 100% rename from tests/auto/qwavedecoder/data/isawav_2_16_44100_be.wav rename to tests/auto/unit/qwavedecoder/data/isawav_2_16_44100_be.wav diff --git a/tests/auto/qwavedecoder/data/isawav_2_16_8000_be.wav b/tests/auto/unit/qwavedecoder/data/isawav_2_16_8000_be.wav similarity index 100% rename from tests/auto/qwavedecoder/data/isawav_2_16_8000_be.wav rename to tests/auto/unit/qwavedecoder/data/isawav_2_16_8000_be.wav diff --git a/tests/auto/qwavedecoder/data/isawav_2_32_44100_be.wav b/tests/auto/unit/qwavedecoder/data/isawav_2_32_44100_be.wav similarity index 100% rename from tests/auto/qwavedecoder/data/isawav_2_32_44100_be.wav rename to tests/auto/unit/qwavedecoder/data/isawav_2_32_44100_be.wav diff --git a/tests/auto/qwavedecoder/data/isawav_2_32_8000_be.wav b/tests/auto/unit/qwavedecoder/data/isawav_2_32_8000_be.wav similarity index 100% rename from tests/auto/qwavedecoder/data/isawav_2_32_8000_be.wav rename to tests/auto/unit/qwavedecoder/data/isawav_2_32_8000_be.wav diff --git a/tests/auto/qwavedecoder/data/isawav_2_8_44100.wav b/tests/auto/unit/qwavedecoder/data/isawav_2_8_44100.wav similarity index 100% rename from tests/auto/qwavedecoder/data/isawav_2_8_44100.wav rename to tests/auto/unit/qwavedecoder/data/isawav_2_8_44100.wav diff --git a/tests/auto/qwavedecoder/data/isawav_2_8_8000.wav b/tests/auto/unit/qwavedecoder/data/isawav_2_8_8000.wav similarity index 100% rename from tests/auto/qwavedecoder/data/isawav_2_8_8000.wav rename to tests/auto/unit/qwavedecoder/data/isawav_2_8_8000.wav diff --git a/tests/auto/qwavedecoder/data/nosampledata.wav b/tests/auto/unit/qwavedecoder/data/nosampledata.wav similarity index 100% rename from tests/auto/qwavedecoder/data/nosampledata.wav rename to tests/auto/unit/qwavedecoder/data/nosampledata.wav diff --git a/tests/auto/qwavedecoder/data/notawav.wav b/tests/auto/unit/qwavedecoder/data/notawav.wav similarity index 100% rename from tests/auto/qwavedecoder/data/notawav.wav rename to tests/auto/unit/qwavedecoder/data/notawav.wav diff --git a/tests/auto/qwavedecoder/data/onebyte.wav b/tests/auto/unit/qwavedecoder/data/onebyte.wav similarity index 100% rename from tests/auto/qwavedecoder/data/onebyte.wav rename to tests/auto/unit/qwavedecoder/data/onebyte.wav diff --git a/tests/auto/qwavedecoder/qwavedecoder.pro b/tests/auto/unit/qwavedecoder/qwavedecoder.pro similarity index 63% rename from tests/auto/qwavedecoder/qwavedecoder.pro rename to tests/auto/unit/qwavedecoder/qwavedecoder.pro index db3f264e..7428c5c3 100644 --- a/tests/auto/qwavedecoder/qwavedecoder.pro +++ b/tests/auto/unit/qwavedecoder/qwavedecoder.pro @@ -1,7 +1,7 @@ TARGET = tst_qwavedecoder -HEADERS += ../../../src/multimedia/effects/qwavedecoder_p.h +HEADERS += $$QT.multimedia.sources/effects/qwavedecoder_p.h SOURCES += tst_qwavedecoder.cpp \ - ../../../src/multimedia/effects/qwavedecoder_p.cpp + $$QT.multimedia.sources/effects/qwavedecoder_p.cpp QT += multimedia-private testlib network CONFIG += no_private_qt_headers_warning testcase diff --git a/tests/auto/qwavedecoder/tst_qwavedecoder.cpp b/tests/auto/unit/qwavedecoder/tst_qwavedecoder.cpp similarity index 100% rename from tests/auto/qwavedecoder/tst_qwavedecoder.cpp rename to tests/auto/unit/qwavedecoder/tst_qwavedecoder.cpp diff --git a/tests/auto/unit/unit.pro b/tests/auto/unit/unit.pro new file mode 100644 index 00000000..1043abf0 --- /dev/null +++ b/tests/auto/unit/unit.pro @@ -0,0 +1,4 @@ +TEMPLATE = subdirs + +SUBDIRS += multimedia.pro +contains(QT_CONFIG,multimediawidgets): SUBDIRS += multimediawidgets.pro