diff options
author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-01-18 14:46:58 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-19 03:56:45 +0100 |
commit | 69cef0c24c1f6500d6047ae9c093fda26cf203a6 (patch) | |
tree | 364a7e22759f574ef502bed240b7764b261edd56 /tests/auto/unit | |
parent | 8c74e5e7e7a5654f1af670b6d40f98e736d1f7d9 (diff) |
Replaced QAudioCaptureSource with QAudioRecorder.
QAudioCaptureSource name is confusing, it's essentially an audio
recording service but it's not evident from API.
QAudioRecorder replaces QAudioCaptureSource+QMediaRecorder combination.
Change-Id: I0082d766fc0d1b8d5ecbfc527f13e715add730c8
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'tests/auto/unit')
-rw-r--r-- | tests/auto/unit/multimedia.pro | 2 | ||||
-rw-r--r-- | tests/auto/unit/qaudiocapturesource/qaudiocapturesource.pro | 11 | ||||
-rw-r--r-- | tests/auto/unit/qaudiorecorder/qaudiorecorder.pro | 10 | ||||
-rw-r--r-- | tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp (renamed from tests/auto/unit/qaudiocapturesource/tst_qaudiocapturesource.cpp) | 61 | ||||
-rw-r--r-- | tests/auto/unit/qmediaobject/tst_qmediaobject.cpp | 26 | ||||
-rw-r--r-- | tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp | 2 |
6 files changed, 43 insertions, 69 deletions
diff --git a/tests/auto/unit/multimedia.pro b/tests/auto/unit/multimedia.pro index aab830f86..8cebc34a8 100644 --- a/tests/auto/unit/multimedia.pro +++ b/tests/auto/unit/multimedia.pro @@ -3,7 +3,7 @@ TEMPLATE = subdirs SUBDIRS += \ qabstractvideobuffer \ qabstractvideosurface \ - qaudiocapturesource \ + qaudiorecorder \ qaudioformat \ qaudionamespace \ qcamera \ diff --git a/tests/auto/unit/qaudiocapturesource/qaudiocapturesource.pro b/tests/auto/unit/qaudiocapturesource/qaudiocapturesource.pro deleted file mode 100644 index 1d0c2e294..000000000 --- a/tests/auto/unit/qaudiocapturesource/qaudiocapturesource.pro +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG += testcase -TARGET = tst_qaudiocapturesource - -QT += multimedia-private testlib -CONFIG += no_private_qt_headers_warning - -SOURCES += tst_qaudiocapturesource.cpp - -include (../qmultimedia_common/mockrecorder.pri) -include (../qmultimedia_common/mock.pri) - diff --git a/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro b/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro new file mode 100644 index 000000000..ccb5531e7 --- /dev/null +++ b/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro @@ -0,0 +1,10 @@ +CONFIG += testcase no_private_qt_headers_warning +TARGET = tst_qaudiorecorder + +QT += multimedia-private testlib + +SOURCES += tst_qaudiorecorder.cpp + +include (../qmultimedia_common/mock.pri) +include (../qmultimedia_common/mockrecorder.pri) + diff --git a/tests/auto/unit/qaudiocapturesource/tst_qaudiocapturesource.cpp b/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp index e8c4400a0..461a0bc76 100644 --- a/tests/auto/unit/qaudiocapturesource/tst_qaudiocapturesource.cpp +++ b/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp @@ -44,7 +44,7 @@ #include <qaudioformat.h> -#include <qaudiocapturesource.h> +#include <qaudiorecorder.h> #include <qaudioencodercontrol.h> #include <qmediarecordercontrol.h> #include <qaudioendpointselector.h> @@ -59,13 +59,13 @@ QT_USE_NAMESPACE -class tst_QAudioCaptureSource: public QObject +class tst_QAudioRecorder: public QObject { Q_OBJECT public slots: - void initTestCase(); - void cleanupTestCase(); + void init(); + void cleanup(); private slots: //void testNullService(); @@ -77,28 +77,29 @@ private slots: void testAvailableAudioInputChangedSignal(); private: - QAudioCaptureSource *audiosource; + QAudioRecorder *audiosource; MockMediaRecorderService *mockMediaRecorderService; MockMediaServiceProvider *mockProvider; }; -void tst_QAudioCaptureSource::initTestCase() +void tst_QAudioRecorder::init() { - mockMediaRecorderService = new MockMediaRecorderService; + mockMediaRecorderService = new MockMediaRecorderService(this, new MockMediaRecorderControl(this)); mockProvider = new MockMediaServiceProvider(mockMediaRecorderService); } -void tst_QAudioCaptureSource::cleanupTestCase() +void tst_QAudioRecorder::cleanup() { delete audiosource; delete mockProvider; audiosource = 0; + mockProvider = 0; } /* -void tst_QAudioCaptureSource::testNullService() +void tst_QAudioRecorder::testNullService() { MockProvider provider(0); - QAudioCaptureSource source(0, &provider); + QAudioRecorder source(0, &provider); QCOMPARE(source.audioInputs().size(), 0); QCOMPARE(source.defaultAudioInput(), QString()); @@ -106,12 +107,12 @@ void tst_QAudioCaptureSource::testNullService() } */ /* -void tst_QAudioCaptureSource::testNullControl() +void tst_QAudioRecorder::testNullControl() { MockRecorderService service; service.hasAudioDeviceControl = false; MockProvider provider(&service); - QAudioCaptureSource source(0, &provider); + QAudioRecorder source(0, &provider); QCOMPARE(source.audioInputs().size(), 0); QCOMPARE(source.defaultAudioInput(), QString()); @@ -125,14 +126,14 @@ void tst_QAudioCaptureSource::testNullControl() QCOMPARE(deviceNameSpy.count(), 0); } */ -void tst_QAudioCaptureSource::testAudioSource() +void tst_QAudioRecorder::testAudioSource() { - audiosource = new QAudioCaptureSource(0, mockProvider); + audiosource = new QAudioRecorder(0, mockProvider); - QCOMPARE(audiosource->service(),(QMediaService *) mockMediaRecorderService); + QCOMPARE(audiosource->mediaObject()->service(),(QMediaService *) mockMediaRecorderService); } -void tst_QAudioCaptureSource::testOptions() +void tst_QAudioRecorder::testOptions() { const QString codec(QLatin1String("audio/mpeg")); @@ -142,45 +143,45 @@ void tst_QAudioCaptureSource::testOptions() QVERIFY(mockMediaRecorderService->mockAudioEncoderControl->encodingOption(codec, options.first()).toInt() == 8000); } -void tst_QAudioCaptureSource::testDevices() +void tst_QAudioRecorder::testDevices() { - audiosource = new QAudioCaptureSource(0,mockProvider); + audiosource = new QAudioRecorder(0,mockProvider); QList<QString> devices = audiosource->audioInputs(); QVERIFY(devices.size() > 0); QVERIFY(devices.at(0).compare("device1") == 0); - QVERIFY(audiosource->audioDescription("device1").compare("dev1 comment") == 0); + QVERIFY(audiosource->audioInputDescription("device1").compare("dev1 comment") == 0); QVERIFY(audiosource->defaultAudioInput() == "device1"); QVERIFY(audiosource->isAvailable() == true); - QSignalSpy checkSignal(audiosource, SIGNAL(activeAudioInputChanged(QString))); + QSignalSpy checkSignal(audiosource, SIGNAL(audioInputChanged(QString))); audiosource->setAudioInput("device2"); - QVERIFY(audiosource->activeAudioInput().compare("device2") == 0); + QVERIFY(audiosource->audioInput().compare("device2") == 0); QVERIFY(checkSignal.count() == 1); QVERIFY(audiosource->isAvailable() == true); } -void tst_QAudioCaptureSource::testAvailability() +void tst_QAudioRecorder::testAvailability() { - MockMediaRecorderService service; + MockMediaRecorderService service(this, new MockMediaRecorderControl(this)); service.hasControls = false; MockMediaServiceProvider provider(&service); - QAudioCaptureSource source(0, &provider); + QAudioRecorder source(0, &provider); QVERIFY(source.isAvailable() == false); QVERIFY(source.availabilityError() == QtMultimedia::ServiceMissingError); service.hasControls = true; MockMediaServiceProvider provider2(&service); - QAudioCaptureSource source2(0, &provider2); + QAudioRecorder source2(0, &provider2); QVERIFY(source2.isAvailable() == true); QVERIFY(source2.availabilityError() == QtMultimedia::NoError); } -void tst_QAudioCaptureSource::testAvailableAudioInputChangedSignal() +void tst_QAudioRecorder::testAvailableAudioInputChangedSignal() { - // The availabilityChangedSignal is implemented in QAudioCaptureSource. SO using it to test the signal. - audiosource = new QAudioCaptureSource(0, mockProvider); + // The availabilityChangedSignal is implemented in QAudioRecorder. SO using it to test the signal. + audiosource = new QAudioRecorder(0, mockProvider); /* Spy the signal availableEndpointChanged and audioInputchanged */ QSignalSpy changed(mockMediaRecorderService->mockAudioEndpointSelector, SIGNAL(availableEndpointsChanged())); @@ -199,6 +200,6 @@ void tst_QAudioCaptureSource::testAvailableAudioInputChangedSignal() QVERIFY(audioInputchange.count() == 1); } -QTEST_MAIN(tst_QAudioCaptureSource) +QTEST_GUILESS_MAIN(tst_QAudioRecorder) -#include "tst_qaudiocapturesource.moc" +#include "tst_qaudiorecorder.moc" diff --git a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp index 48f87c931..8de0e8554 100644 --- a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp +++ b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp @@ -48,7 +48,6 @@ #include <qmediaobject.h> #include <qmediaservice.h> #include <qmetadatareadercontrol.h> -#include <qaudiocapturesource.h> #include <qaudioendpointselector.h> #include "mockmediarecorderservice.h" @@ -103,7 +102,6 @@ private slots: void extendedMetaData(); void service(); - void availabilityChangedSignal(); private: void setupNotifyTests(); @@ -474,30 +472,6 @@ void tst_QMediaObject::availability() QtTestMediaObject mediaObject2; QMediaService *service2 = mediaObject2.service(); QVERIFY(service2 == NULL); - } - - void tst_QMediaObject::availabilityChangedSignal() - { - // The availabilityChangedSignal is implemented in QAudioCaptureSource. So using it to test the signal. - MockMediaRecorderService *mockAudioSourceService = new MockMediaRecorderService; - MockMediaServiceProvider *mockProvider = new MockMediaServiceProvider(mockAudioSourceService); - QAudioCaptureSource *audiosource = new QAudioCaptureSource(0, mockProvider); - - QSignalSpy spy(audiosource, SIGNAL(availabilityChanged(bool))); - - // Add the end points and verify if the availablity changed signal emitted with argument true. - QMetaObject::invokeMethod(mockAudioSourceService->mockAudioEndpointSelector, "addEndpoints"); - QVERIFY(spy.count() == 1); - bool available = qvariant_cast<bool>(spy.at(0).at(0)); - QVERIFY(available == true); - - spy.clear(); - - // Remove all endpoints and verify if the signal is emitted with argument false. - QMetaObject::invokeMethod(mockAudioSourceService->mockAudioEndpointSelector, "removeEndpoints"); - QVERIFY(spy.count() == 1); - available = qvariant_cast<bool>(spy.at(0).at(0)); - QVERIFY(available == false); } QTEST_GUILESS_MAIN(tst_QMediaObject) diff --git a/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp b/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp index a68aab23c..339d24c22 100644 --- a/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp +++ b/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp @@ -51,7 +51,7 @@ #include <qmediaobject.h> #include <qmediaservice.h> #include <qmediaplayer.h> -#include <qaudiocapturesource.h> +#include <qaudiorecorder.h> QT_USE_NAMESPACE class MockMediaService : public QMediaService |