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

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