diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-06-25 10:53:26 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-29 02:47:41 +0200 |
| commit | b0809c027c9fe2e49d37dff45aa4f03b0a4e0743 (patch) | |
| tree | d647951ecb69c9b39f004198d76fbc4972174549 /tests/auto/unit/qmediaobject/tst_qmediaobject.cpp | |
| parent | bba28afe559837321a2083b3ce046ab774a7ef6b (diff) | |
Rename availabilityError to availability.
It's perhaps clearer in the usual case.
Change-Id: Id3cef82ac83f8c9b538b3315281664ce1c6a2b96
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'tests/auto/unit/qmediaobject/tst_qmediaobject.cpp')
| -rw-r--r-- | tests/auto/unit/qmediaobject/tst_qmediaobject.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp index f249ab2e7..7157e825a 100644 --- a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp +++ b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp @@ -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); } } |