diff options
Diffstat (limited to 'tests/auto/unit')
12 files changed, 41 insertions, 41 deletions
diff --git a/tests/auto/unit/multimedia.pro b/tests/auto/unit/multimedia.pro index f909a3b5f..309d41255 100644 --- a/tests/auto/unit/multimedia.pro +++ b/tests/auto/unit/multimedia.pro @@ -25,7 +25,7 @@ SUBDIRS += \ qmetadatawritercontrol \ qradiodata \ qradiotuner \ - qvideoencodercontrol \ + qvideoencodersettingscontrol \ qvideoframe \ qvideosurfaceformat \ qwavedecoder \ diff --git a/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp b/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp index 878b03a53..676fb6611 100644 --- a/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp +++ b/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp @@ -45,9 +45,9 @@ #include <qaudioformat.h> #include <qaudiorecorder.h> -#include <qaudioencodercontrol.h> +#include <qaudioencodersettingscontrol.h> #include <qmediarecordercontrol.h> -#include <qaudioendpointselector.h> +#include <qaudioendpointselectorcontrol.h> #include <qaudiodeviceinfo.h> #include <qaudioinput.h> #include <qmediaobject.h> diff --git a/tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp b/tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp index ba4d579f2..58e70e23d 100644 --- a/tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp +++ b/tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp @@ -48,10 +48,10 @@ #include <qmediarecordercontrol.h> #include <qmediarecorder.h> #include <qmetadatawritercontrol.h> -#include <qaudioendpointselector.h> -#include <qaudioencodercontrol.h> +#include <qaudioendpointselectorcontrol.h> +#include <qaudioencodersettingscontrol.h> #include <qmediacontainercontrol.h> -#include <qvideoencodercontrol.h> +#include <qvideoencodersettingscontrol.h> #include <qaudioformat.h> #include "mockmediacontainercontrol.h" diff --git a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp index 977037dd8..f249ab2e7 100644 --- a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp +++ b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp @@ -48,7 +48,7 @@ #include <qmediaobject.h> #include <qmediaservice.h> #include <qmetadatareadercontrol.h> -#include <qaudioendpointselector.h> +#include <qaudioendpointselectorcontrol.h> #include "mockmediarecorderservice.h" #include "mockmediaserviceprovider.h" diff --git a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp index 99ea5d7b5..10409038d 100644 --- a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp +++ b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp @@ -49,10 +49,10 @@ #include <qmediarecordercontrol.h> #include <qmediarecorder.h> #include <qmetadatawritercontrol.h> -#include <qaudioendpointselector.h> -#include <qaudioencodercontrol.h> +#include <qaudioendpointselectorcontrol.h> +#include <qaudioencodersettingscontrol.h> #include <qmediacontainercontrol.h> -#include <qvideoencodercontrol.h> +#include <qvideoencodersettingscontrol.h> #include <qaudioformat.h> #include "mockmediarecorderservice.h" @@ -114,13 +114,13 @@ private slots: void testVideoSettingsDestructor(); private: - QAudioEncoderControl* encode; - QAudioEndpointSelector* audio; + QAudioEncoderSettingsControl* encode; + QAudioEndpointSelectorControl* audio; MockMediaObject *object; MockMediaRecorderService*service; MockMediaRecorderControl *mock; QMediaRecorder *capture; - QVideoEncoderControl* videoEncode; + QVideoEncoderSettingsControl* videoEncode; }; void tst_QMediaRecorder::initTestCase() @@ -133,9 +133,9 @@ void tst_QMediaRecorder::initTestCase() object = new MockMediaObject(this, service); capture = new QMediaRecorder(object); - audio = qobject_cast<QAudioEndpointSelector*>(service->requestControl(QAudioEndpointSelector_iid)); - encode = qobject_cast<QAudioEncoderControl*>(service->requestControl(QAudioEncoderControl_iid)); - videoEncode = qobject_cast<QVideoEncoderControl*>(service->requestControl(QVideoEncoderControl_iid)); + audio = qobject_cast<QAudioEndpointSelectorControl*>(service->requestControl(QAudioEndpointSelectorControl_iid)); + encode = qobject_cast<QAudioEncoderSettingsControl*>(service->requestControl(QAudioEncoderSettingsControl_iid)); + videoEncode = qobject_cast<QVideoEncoderSettingsControl*>(service->requestControl(QVideoEncoderSettingsControl_iid)); } void tst_QMediaRecorder::cleanupTestCase() diff --git a/tests/auto/unit/qmediaservice/tst_qmediaservice.cpp b/tests/auto/unit/qmediaservice/tst_qmediaservice.cpp index 2b497791c..09c4ba1d5 100644 --- a/tests/auto/unit/qmediaservice/tst_qmediaservice.cpp +++ b/tests/auto/unit/qmediaservice/tst_qmediaservice.cpp @@ -43,7 +43,7 @@ #include <QtTest/QtTest> -#include <qvideodevicecontrol.h> +#include <qvideodeviceselectorcontrol.h> #include <qmediacontrol.h> #include <qmediaservice.h> diff --git a/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h b/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h index 7fb83e396..ffe1800b9 100644 --- a/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h @@ -42,14 +42,14 @@ #ifndef MOCKAUDIOENCODERCONTROL_H #define MOCKAUDIOENCODERCONTROL_H -#include "qaudioencodercontrol.h" +#include "qaudioencodersettingscontrol.h" -class MockAudioEncoderControl : public QAudioEncoderControl +class MockAudioEncoderControl : public QAudioEncoderSettingsControl { Q_OBJECT public: MockAudioEncoderControl(QObject *parent): - QAudioEncoderControl(parent) + QAudioEncoderSettingsControl(parent) { m_codecs << "audio/pcm" << "audio/mpeg"; m_descriptions << "Pulse Code Modulation" << "mp3 format"; diff --git a/tests/auto/unit/qmultimedia_common/mockaudioendpointselector.h b/tests/auto/unit/qmultimedia_common/mockaudioendpointselector.h index ef20b3a46..34b584b3f 100644 --- a/tests/auto/unit/qmultimedia_common/mockaudioendpointselector.h +++ b/tests/auto/unit/qmultimedia_common/mockaudioendpointselector.h @@ -42,14 +42,14 @@ #ifndef MOCKAUDIOENDPOINTSELECTOR_H #define MOCKAUDIOENDPOINTSELECTOR_H -#include "qaudioendpointselector.h" +#include "qaudioendpointselectorcontrol.h" -class MockAudioEndpointSelector : public QAudioEndpointSelector +class MockAudioEndpointSelector : public QAudioEndpointSelectorControl { Q_OBJECT public: MockAudioEndpointSelector(QObject *parent): - QAudioEndpointSelector(parent) + QAudioEndpointSelectorControl(parent) { m_names << "device1" << "device2" << "device3"; m_descriptions << "dev1 comment" << "dev2 comment" << "dev3 comment"; diff --git a/tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h b/tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h index f642c43a6..09218893e 100644 --- a/tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h +++ b/tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h @@ -73,15 +73,15 @@ public: QMediaControl* requestControl(const char *name) { - if (hasControls && qstrcmp(name,QAudioEncoderControl_iid) == 0) + if (hasControls && qstrcmp(name,QAudioEncoderSettingsControl_iid) == 0) return mockAudioEncoderControl; - if (hasControls && qstrcmp(name,QAudioEndpointSelector_iid) == 0) + if (hasControls && qstrcmp(name,QAudioEndpointSelectorControl_iid) == 0) return mockAudioEndpointSelector; if (hasControls && qstrcmp(name,QMediaRecorderControl_iid) == 0) return mockControl; if (hasControls && qstrcmp(name,QMediaContainerControl_iid) == 0) return mockFormatControl; - if (hasControls && qstrcmp(name,QVideoEncoderControl_iid) == 0) + if (hasControls && qstrcmp(name,QVideoEncoderSettingsControl_iid) == 0) return mockVideoEncoderControl; if (hasControls && qstrcmp(name, QMetaDataWriterControl_iid) == 0) return mockMetaDataControl; @@ -98,10 +98,10 @@ public: } QMediaControl *mockControl; - QAudioEndpointSelector *mockAudioEndpointSelector; - QAudioEncoderControl *mockAudioEncoderControl; + QAudioEndpointSelectorControl *mockAudioEndpointSelector; + QAudioEncoderSettingsControl *mockAudioEncoderControl; QMediaContainerControl *mockFormatControl; - QVideoEncoderControl *mockVideoEncoderControl; + QVideoEncoderSettingsControl *mockVideoEncoderControl; MockMetaDataWriterControl *mockMetaDataControl; MockAvailabilityControl *mockAvailabilityControl; MockAudioProbeControl *mockAudioProbeControl; diff --git a/tests/auto/unit/qmultimedia_common/mockvideoencodercontrol.h b/tests/auto/unit/qmultimedia_common/mockvideoencodercontrol.h index 1e756d389..e9f9744f1 100644 --- a/tests/auto/unit/qmultimedia_common/mockvideoencodercontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockvideoencodercontrol.h @@ -42,14 +42,14 @@ #ifndef MOCKVIDEOENCODERCONTROL_H #define MOCKVIDEOENCODERCONTROL_H -#include "qvideoencodercontrol.h" +#include "qvideoencodersettingscontrol.h" -class MockVideoEncoderControl : public QVideoEncoderControl +class MockVideoEncoderControl : public QVideoEncoderSettingsControl { Q_OBJECT public: MockVideoEncoderControl(QObject *parent): - QVideoEncoderControl(parent) + QVideoEncoderSettingsControl(parent) { m_videoCodecs << "video/3gpp" << "video/H264"; m_sizes << QSize(320,240) << QSize(640,480); diff --git a/tests/auto/unit/qvideoencodercontrol/qvideoencodercontrol.pro b/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro index ad14a25af..891985221 100644 --- a/tests/auto/unit/qvideoencodercontrol/qvideoencodercontrol.pro +++ b/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro @@ -1,9 +1,9 @@ CONFIG += testcase -TARGET = tst_qvideoencodercontrol +TARGET = tst_qvideoencodersettingscontrol QT += multimedia-private testlib CONFIG += no_private_qt_headers_warning SOURCES += \ - tst_qvideoencodercontrol.cpp + tst_qvideoencodersettingscontrol.cpp diff --git a/tests/auto/unit/qvideoencodercontrol/tst_qvideoencodercontrol.cpp b/tests/auto/unit/qvideoencodersettingscontrol/tst_qvideoencodersettingscontrol.cpp index 3df6d05fd..059f2c725 100644 --- a/tests/auto/unit/qvideoencodercontrol/tst_qvideoencodercontrol.cpp +++ b/tests/auto/unit/qvideoencodersettingscontrol/tst_qvideoencodersettingscontrol.cpp @@ -42,13 +42,13 @@ //TESTED_COMPONENT=src/multimedia #include <QtTest/QtTest> -#include "qvideoencodercontrol.h" -class MyVideEncoderControl: public QVideoEncoderControl +#include "qvideoencodersettingscontrol.h" +class MyVideEncoderControl: public QVideoEncoderSettingsControl { Q_OBJECT public: - MyVideEncoderControl(QObject *parent = 0 ):QVideoEncoderControl(parent) + MyVideEncoderControl(QObject *parent = 0 ):QVideoEncoderSettingsControl(parent) { } @@ -99,20 +99,20 @@ public: } }; -class tst_QVideoEncoderControl: public QObject +class tst_QVideoEncoderSettingsControl: public QObject { Q_OBJECT private slots: void constructor(); }; -void tst_QVideoEncoderControl::constructor() +void tst_QVideoEncoderSettingsControl::constructor() { QObject parent; MyVideEncoderControl control(&parent); } -QTEST_MAIN(tst_QVideoEncoderControl) -#include "tst_qvideoencodercontrol.moc" +QTEST_MAIN(tst_QVideoEncoderSettingsControl) +#include "tst_qvideoencodersettingscontrol.moc" |