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

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);
}