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

Rename availabilityError to availability.

Browse Source 
It's perhaps clearer in the usual case.

Change-Id: Id3cef82ac83f8c9b538b3315281664ce1c6a2b96
Reviewed-by: Ling Hu <ling.hu@nokia.com>
This commit is contained in:
Michael Goddard
2012-06-25 10:53:26 +10:00
committed by Qt by Nokia
parent bba28afe55
commit b0809c027c
44 changed files with 167 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/unit/qaudioprobe/tst_qaudioprobe.cpp
View File

@@ -104,7 +104,7 @@ void tst_QAudioProbe::testNullService()
recorder = new QAudioRecorder;
QVERIFY(!recorder->isAvailable());
QCOMPARE(recorder->availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(recorder->availability(), QtMultimedia::ServiceMissing);
QAudioProbe probe;
QVERIFY(!probe.isActive());
@@ -122,7 +122,7 @@ void tst_QAudioProbe::testNullControl()
recorder = new QAudioRecorder;
QVERIFY(!recorder->isAvailable());
QCOMPARE(recorder->availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(recorder->availability(), QtMultimedia::ServiceMissing);
QAudioProbe probe;
QVERIFY(!probe.isActive());

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

@@ -106,7 +106,7 @@ void tst_QAudioRecorder::testNullService()
QAudioRecorder source;
QVERIFY(!source.isAvailable());
QCOMPARE(source.availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(source.availability(), QtMultimedia::ServiceMissing);
QCOMPARE(source.audioInputs().size(), 0);
QCOMPARE(source.defaultAudioInput(), QString());
@@ -120,7 +120,7 @@ void tst_QAudioRecorder::testNullControl()
QAudioRecorder source;
QVERIFY(!source.isAvailable());
QCOMPARE(source.availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(source.availability(), QtMultimedia::ServiceMissing);
QCOMPARE(source.audioInputs().size(), 0);
QCOMPARE(source.defaultAudioInput(), QString());
@@ -163,7 +163,7 @@ void tst_QAudioRecorder::testAvailability()
QAudioRecorder source;
QVERIFY(source.isAvailable());
QCOMPARE(source.availabilityError(), QtMultimedia::NoError);
QCOMPARE(source.availability(), QtMultimedia::Available);
}
void tst_QAudioRecorder::testAvailableAudioInputChangedSignal()

4
tests/auto/unit/qcamera/tst_qcamera.cpp
View File

@@ -1233,7 +1233,7 @@ void tst_QCamera::testQCameraIsAvailable()
{
QCamera camera;
QVERIFY(camera.isAvailable());
QVERIFY(camera.availabilityError() == QtMultimedia::NoError);
QVERIFY(camera.availability() == QtMultimedia::Available);
}
void tst_QCamera::testQCameraIsNotAvailable()
@@ -1243,7 +1243,7 @@ void tst_QCamera::testQCameraIsNotAvailable()
QCOMPARE(camera.error(), QCamera::ServiceMissingError);
QVERIFY(!camera.isAvailable());
QCOMPARE(camera.availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(camera.availability(), QtMultimedia::ServiceMissing);
}
/* Test case for searchAndLock ( QCamera::LockTypes locks ) */

6
tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp
View File

@@ -312,7 +312,7 @@ void tst_QCameraImageCapture::errors()
imageCapture1.capture(QString::fromLatin1("/dev/null"));
QVERIFY(imageCapture1.error() == QCameraImageCapture::NotSupportedFeatureError);
QVERIFY2(!imageCapture1.errorString().isEmpty(), "Device does not support images capture");
QVERIFY(imageCapture1.availabilityError() == QtMultimedia::ServiceMissingError);
QVERIFY(imageCapture1.availability() == QtMultimedia::ServiceMissing);
provider->service = mockcameraservice;
@@ -321,12 +321,12 @@ void tst_QCameraImageCapture::errors()
QVERIFY(imageCapture.isAvailable() == true);
QVERIFY(imageCapture.error() == QCameraImageCapture::NoError);
QVERIFY(imageCapture.errorString().isEmpty());
QVERIFY(imageCapture.availabilityError() == QtMultimedia::NoError);
QVERIFY(imageCapture.availability() == QtMultimedia::Available);
imageCapture.capture();
QVERIFY(imageCapture.error() == QCameraImageCapture::NotReadyError);
QVERIFY2(!imageCapture.errorString().isEmpty(), "Could not capture in stopped state");
QVERIFY(imageCapture.availabilityError() == QtMultimedia::NoError);
QVERIFY(imageCapture.availability() == QtMultimedia::Available);
}
//MaemoAPI-1831:test error

34
tests/auto/unit/qmediaobject/tst_qmediaobject.cpp
View File

@@ -441,54 +441,54 @@ void tst_QMediaObject::availability()
{
QtTestMediaObject nullObject(0);
QCOMPARE(nullObject.isAvailable(), false);
QCOMPARE(nullObject.availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(nullObject.availability(), QtMultimedia::ServiceMissing);
}
{
QtTestMediaObjectService service;
QtTestMediaObject object(&service);
QCOMPARE(object.isAvailable(), true);
QCOMPARE(object.availabilityError(), QtMultimedia::NoError);
QCOMPARE(object.availability(), QtMultimedia::Available);
}
{
MockAvailabilityControl available(QtMultimedia::NoError);
MockAvailabilityControl available(QtMultimedia::Available);
QtTestMediaObjectService service(0, &available);
QtTestMediaObject object(&service);
QSignalSpy availabilitySpy(&object, SIGNAL(availabilityChanged(bool)));
QSignalSpy availabilityErrorSpy(&object, SIGNAL(availabilityChanged(bool)));
QSignalSpy availabilityStatusSpy(&object, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)));
QCOMPARE(object.isAvailable(), true);
QCOMPARE(object.availabilityError(), QtMultimedia::NoError);
QCOMPARE(object.availability(), QtMultimedia::Available);
available.setAvailability(QtMultimedia::BusyError);
available.setAvailability(QtMultimedia::Busy);
QCOMPARE(object.isAvailable(), false);
QCOMPARE(object.availabilityError(), QtMultimedia::BusyError);
QCOMPARE(object.availability(), QtMultimedia::Busy);
QCOMPARE(availabilitySpy.count(), 1);
QCOMPARE(availabilityErrorSpy.count(), 1);
QCOMPARE(availabilityStatusSpy.count(), 1);
available.setAvailability(QtMultimedia::NoError);
available.setAvailability(QtMultimedia::Available);
QCOMPARE(object.isAvailable(), true);
QCOMPARE(object.availabilityError(), QtMultimedia::NoError);
QCOMPARE(object.availability(), QtMultimedia::Available);
QCOMPARE(availabilitySpy.count(), 2);
QCOMPARE(availabilityErrorSpy.count(), 2);
QCOMPARE(availabilityStatusSpy.count(), 2);
}
{
MockAvailabilityControl available(QtMultimedia::BusyError);
MockAvailabilityControl available(QtMultimedia::Busy);
QtTestMediaObjectService service(0, &available);
QtTestMediaObject object(&service);
QSignalSpy availabilitySpy(&object, SIGNAL(availabilityChanged(bool)));
QSignalSpy availabilityErrorSpy(&object, SIGNAL(availabilityChanged(bool)));
QSignalSpy availabilityStatusSpy(&object, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)));
QCOMPARE(object.isAvailable(), false);
QCOMPARE(object.availabilityError(), QtMultimedia::BusyError);
QCOMPARE(object.availability(), QtMultimedia::Busy);
available.setAvailability(QtMultimedia::NoError);
available.setAvailability(QtMultimedia::Available);
QCOMPARE(object.isAvailable(), true);
QCOMPARE(object.availabilityError(), QtMultimedia::NoError);
QCOMPARE(object.availability(), QtMultimedia::Available);
QCOMPARE(availabilitySpy.count(), 1);
QCOMPARE(availabilityErrorSpy.count(), 1);
QCOMPARE(availabilityStatusSpy.count(), 1);
}
}

4
tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp
View File

@@ -222,7 +222,7 @@ void tst_QMediaPlayer::testNullService()
QCOMPARE(player.playbackRate(), qreal(0));
QCOMPARE(player.error(), QMediaPlayer::ServiceMissingError);
QCOMPARE(player.isAvailable(), false);
QCOMPARE(player.availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(player.availability(), QtMultimedia::ServiceMissing);
{
QFETCH_GLOBAL(QMediaContent, mediaContent);
@@ -501,7 +501,7 @@ void tst_QMediaPlayer::testErrorString()
void tst_QMediaPlayer::testIsAvailable()
{
QCOMPARE(player->isAvailable(), true);
QCOMPARE(player->availabilityError(), QtMultimedia::NoError);
QCOMPARE(player->availability(), QtMultimedia::Available);
}
void tst_QMediaPlayer::testService()

26
tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
View File

@@ -100,7 +100,7 @@ private slots:
void testAudioSettingsOperatorAssign();
void testAudioSettingsDestructor();
void testAvailabilityError();
void testAvailabilityStatus();
void testIsAvailable();
void testMediaObject();
void testEnum();
@@ -1113,14 +1113,14 @@ void tst_QMediaRecorder::testAudioSettingsDestructor()
delete audiosettings;
}
/* availabilityError() API test. */
void tst_QMediaRecorder::testAvailabilityError()
/* availability() API test. */
void tst_QMediaRecorder::testAvailabilityStatus()
{
{
MockMediaRecorderService service(0, 0);
MockMediaObject object(0, &service);
QMediaRecorder recorder(&object);
QCOMPARE(recorder.availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(recorder.availability(), QtMultimedia::ServiceMissing);
QCOMPARE(recorder.isAvailable(), false);
}
{
@@ -1129,7 +1129,7 @@ void tst_QMediaRecorder::testAvailabilityError()
service1.mockMetaDataControl->populateMetaData();
MockMediaObject object1(0, &service1);
QMediaRecorder recorder1(&object1);
QCOMPARE(recorder1.availabilityError(), QtMultimedia::NoError);
QCOMPARE(recorder1.availability(), QtMultimedia::Available);
QCOMPARE(recorder1.isAvailable(), true);
}
{
@@ -1139,29 +1139,29 @@ void tst_QMediaRecorder::testAvailabilityError()
MockMediaObject object1(0, &service1);
QMediaRecorder recorder1(&object1);
QCOMPARE(recorder1.availabilityError(), QtMultimedia::NoError);
QCOMPARE(recorder1.availability(), QtMultimedia::Available);
QCOMPARE(recorder1.isAvailable(), true);
}
{
MockMediaRecorderControl recorderControl(0);
MockAvailabilityControl availability(QtMultimedia::NoError);
MockAvailabilityControl availability(QtMultimedia::Available);
MockMediaRecorderService service1(0, &recorderControl, &availability);
service1.mockMetaDataControl->populateMetaData();
MockMediaObject object1(0, &service1);
QMediaRecorder recorder1(&object1);
QSignalSpy spy(&object1, SIGNAL(availabilityErrorChanged(QtMultimedia::AvailabilityError)));
QSignalSpy spy(&object1, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)));
QCOMPARE(recorder1.availabilityError(), QtMultimedia::NoError);
QCOMPARE(recorder1.availability(), QtMultimedia::Available);
QCOMPARE(recorder1.isAvailable(), true);
availability.setAvailability(QtMultimedia::BusyError);
QCOMPARE(recorder1.availabilityError(), QtMultimedia::BusyError);
availability.setAvailability(QtMultimedia::Busy);
QCOMPARE(recorder1.availability(), QtMultimedia::Busy);
QCOMPARE(recorder1.isAvailable(), false);
QCOMPARE(spy.count(), 1);
availability.setAvailability(QtMultimedia::NoError);
QCOMPARE(recorder1.availabilityError(), QtMultimedia::NoError);
availability.setAvailability(QtMultimedia::Available);
QCOMPARE(recorder1.availability(), QtMultimedia::Available);
QCOMPARE(recorder1.isAvailable(), true);
QCOMPARE(spy.count(), 2);
}

8
tests/auto/unit/qmultimedia_common/mockavailabilitycontrol.h
View File

@@ -50,18 +50,18 @@ class MockAvailabilityControl : public QMediaAvailabilityControl
Q_OBJECT
public:
MockAvailabilityControl(QtMultimedia::AvailabilityError available)
MockAvailabilityControl(QtMultimedia::AvailabilityStatus available)
: m_availability(available)
{
}
QtMultimedia::AvailabilityError availability() const
QtMultimedia::AvailabilityStatus availability() const
{
return m_availability;
}
void setAvailability(QtMultimedia::AvailabilityError availability)
void setAvailability(QtMultimedia::AvailabilityStatus availability)
{
if (m_availability != availability) {
m_availability = availability;
@@ -69,7 +69,7 @@ public:
}
}
QtMultimedia::AvailabilityError m_availability;
QtMultimedia::AvailabilityStatus m_availability;
};
#endif // MOCKAVAILABILITYCONTROL_H

4
tests/auto/unit/qradiodata/tst_qradiodata.cpp
View File

@@ -89,7 +89,7 @@ void tst_QRadioData::initTestCase()
{
qRegisterMetaType<QRadioData::ProgramType>("QRadioData::ProgramType");
mockAvailability = new MockAvailabilityControl(QtMultimedia::NoError);
mockAvailability = new MockAvailabilityControl(QtMultimedia::Available);
mockTuner = new MockRadioTunerControl(this);
mockData = new MockRadioDataControl(this);
@@ -105,7 +105,7 @@ void tst_QRadioData::initTestCase()
radio = new QRadioTuner;
radioData = radio->radioData();
QVERIFY(radioData->availabilityError() == QtMultimedia::NoError);
QVERIFY(radioData->availability() == QtMultimedia::Available);
}
void tst_QRadioData::cleanupTestCase()

8
tests/auto/unit/qradiotuner/tst_qradiotuner.cpp
View File

@@ -95,7 +95,7 @@ void tst_QRadioTuner::initTestCase()
qRegisterMetaType<QRadioTuner::Band>("QRadioTuner::Band");
mock = new MockRadioTunerControl(this);
mockAvailability = new MockAvailabilityControl(QtMultimedia::NoError);
mockAvailability = new MockAvailabilityControl(QtMultimedia::Available);
QMap<QString, QMediaControl *> map;
map.insert(QRadioTunerControl_iid, mock);
@@ -108,13 +108,13 @@ void tst_QRadioTuner::initTestCase()
radio = new QRadioTuner;
QVERIFY(radio->service() != 0);
QVERIFY(radio->isAvailable());
QVERIFY(radio->availabilityError() == QtMultimedia::NoError);
QVERIFY(radio->availability() == QtMultimedia::Available);
QSignalSpy stateSpy(radio, SIGNAL(stateChanged(QRadioTuner::State)));
QCOMPARE(radio->state(), QRadioTuner::StoppedState);
radio->start();
QVERIFY(radio->availabilityError() == QtMultimedia::NoError);
QVERIFY(radio->availability() == QtMultimedia::Available);
QCOMPARE(radio->state(), QRadioTuner::ActiveState);
QCOMPARE(stateSpy.count(), 1);
@@ -129,7 +129,7 @@ void tst_QRadioTuner::cleanupTestCase()
QSignalSpy stateSpy(radio, SIGNAL(stateChanged(QRadioTuner::State)));
radio->stop();
QVERIFY(radio->availabilityError() == QtMultimedia::NoError);
QVERIFY(radio->availability() == QtMultimedia::Available);
QCOMPARE(radio->state(), QRadioTuner::StoppedState);
QCOMPARE(stateSpy.count(), 1);

2
tests/auto/unit/qvideoprobe/tst_qvideoprobe.cpp
View File

@@ -116,7 +116,7 @@ void tst_QVideoProbe::testNullService()
player = new QMediaPlayer;
QVERIFY(!player->isAvailable());
QCOMPARE(player->availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(player->availability(), QtMultimedia::ServiceMissing);
QVideoProbe probe;
QVERIFY(!probe.isActive());