slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed QMediaServiceProvider parameter from media objects constructors.

Browse Source 
QMediaServiceProvider should be removed from the public API,
to provide media objects with a custom media service.

A protected QMediaPlayer/QCamera/QRadioTuner/etc constructor
with QMediaService* parameter is a cleaner and more
flexible solution.

Change-Id: I335cce4bbebe0e548c3df338f206e7be7c93c3dd
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2012-01-19 10:01:02 +10:00
committed by Qt by Nokia
parent adb2bd2cd4
commit a78a95ccd4
26 changed files with 309 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp
View File

@@ -87,6 +87,8 @@ void tst_QAudioRecorder::init()
mockMediaRecorderService = new MockMediaRecorderService(this, new MockMediaRecorderControl(this));
mockProvider = new MockMediaServiceProvider(mockMediaRecorderService);
audiosource = 0;
QMediaServiceProvider::setDefaultServiceProvider(mockProvider);
}
void tst_QAudioRecorder::cleanup()
@@ -102,7 +104,10 @@ void tst_QAudioRecorder::cleanup()
void tst_QAudioRecorder::testNullService()
{
mockProvider->service = 0;
QAudioRecorder source(0, mockProvider);
QAudioRecorder source;
QVERIFY(!source.isAvailable());
QCOMPARE(source.availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(source.audioInputs().size(), 0);
QCOMPARE(source.defaultAudioInput(), QString());
@@ -113,7 +118,10 @@ void tst_QAudioRecorder::testNullService()
void tst_QAudioRecorder::testNullControl()
{
mockMediaRecorderService->hasControls = false;
QAudioRecorder source(0, mockProvider);
QAudioRecorder source;
QVERIFY(!source.isAvailable());
QCOMPARE(source.availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(source.audioInputs().size(), 0);
QCOMPARE(source.defaultAudioInput(), QString());
@@ -129,7 +137,7 @@ void tst_QAudioRecorder::testNullControl()
void tst_QAudioRecorder::testAudioSource()
{
audiosource = new QAudioRecorder(0, mockProvider);
audiosource = new QAudioRecorder;
QCOMPARE(audiosource->mediaObject()->service(),(QMediaService *) mockMediaRecorderService);
}
@@ -146,7 +154,7 @@ void tst_QAudioRecorder::testOptions()
void tst_QAudioRecorder::testDevices()
{
audiosource = new QAudioRecorder(0,mockProvider);
audiosource = new QAudioRecorder;
QList<QString> devices = audiosource->audioInputs();
QVERIFY(devices.size() > 0);
QVERIFY(devices.at(0).compare("device1") == 0);
@@ -163,26 +171,16 @@ void tst_QAudioRecorder::testDevices()
void tst_QAudioRecorder::testAvailability()
{
MockMediaRecorderService service(this, new MockMediaRecorderControl(this));
service.hasControls = false;
MockMediaServiceProvider provider(&service);
QAudioRecorder source(0, &provider);
QAudioRecorder source;
QVERIFY(source.isAvailable() == false);
QVERIFY(source.availabilityError() == QtMultimedia::ServiceMissingError);
service.hasControls = true;
MockMediaServiceProvider provider2(&service);
QAudioRecorder source2(0, &provider2);
QVERIFY(source2.isAvailable() == true);
QVERIFY(source2.availabilityError() == QtMultimedia::NoError);
QVERIFY(source.isAvailable());
QCOMPARE(source.availabilityError(), QtMultimedia::NoError);
}
void tst_QAudioRecorder::testAvailableAudioInputChangedSignal()
{
// The availabilityChangedSignal is implemented in QAudioRecorder. SO using it to test the signal.
audiosource = new QAudioRecorder(0, mockProvider);
audiosource = new QAudioRecorder;
/* Spy the signal availableEndpointChanged and audioInputchanged */
QSignalSpy changed(mockMediaRecorderService->mockAudioEndpointSelector, SIGNAL(availableEndpointsChanged()));