diff options
author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-01-19 10:01:02 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-24 09:11:07 +0100 |
commit | a78a95ccd4c876bca7fe748c44c9744e828d375e (patch) | |
tree | 4a72285e10aab435682fb7cdbbc4e70432191b20 /tests/auto/unit/qradiodata | |
parent | adb2bd2cd4bb2b01b15f6213681654949f2c797c (diff) |
Removed QMediaServiceProvider parameter from media objects constructors.
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>
Diffstat (limited to 'tests/auto/unit/qradiodata')
-rw-r--r-- | tests/auto/unit/qradiodata/tst_qradiodata.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/auto/unit/qradiodata/tst_qradiodata.cpp b/tests/auto/unit/qradiodata/tst_qradiodata.cpp index 59fcedb64..cf6a7f13a 100644 --- a/tests/auto/unit/qradiodata/tst_qradiodata.cpp +++ b/tests/auto/unit/qradiodata/tst_qradiodata.cpp @@ -85,7 +85,8 @@ void tst_QRadioData::initTestCase() mock = new MockRadioDataControl(this); service = new MockMediaService(this, mock); provider = new MockMediaServiceProvider(service); - radio = new QRadioData(0,provider); + QMediaServiceProvider::setDefaultServiceProvider(provider); + radio = new QRadioData; QVERIFY(radio->service() != 0); QVERIFY(radio->isAvailable()); QVERIFY(radio->availabilityError() == QtMultimedia::NoError); @@ -105,8 +106,10 @@ void tst_QRadioData::testNullService() { const QPair<int, int> nullRange(0, 0); - MockMediaServiceProvider provider(0); - QRadioData radio(0, &provider); + MockMediaServiceProvider nullProvider(0); + QMediaServiceProvider::setDefaultServiceProvider(&nullProvider); + QRadioData radio; + QVERIFY(!radio.isAvailable()); QCOMPARE(radio.error(), QRadioData::ResourceError); QCOMPARE(radio.errorString(), QString()); @@ -125,7 +128,8 @@ void tst_QRadioData::testNullControl() MockMediaService service(0, 0); MockMediaServiceProvider provider(&service); - QRadioData radio(0, &provider); + QMediaServiceProvider::setDefaultServiceProvider(&provider); + QRadioData radio; QVERIFY(!radio.isAvailable()); QCOMPARE(radio.error(), QRadioData::ResourceError); QCOMPARE(radio.errorString(), QString()); |