diff options
| author | Andrew den Exter <andrew.den.exter@qinetic.com.au> | 2014-11-25 09:18:32 +1000 |
|---|---|---|
| committer | Andrew den Exter <andrew.den.exter@qinetic.com.au> | 2014-11-28 04:19:35 +0100 |
| commit | dc2fec1bd8974d695d9c22d4b958a73bbe9ff1a2 (patch) | |
| tree | 83cd04f31dc20eb2310b63c94a9dac7d369a42e1 /tests | |
| parent | 108dda7a90bd0f0337358b0db47ae55acd16dea6 (diff) | |
Allow supported camera locks to change after initialization.
A camera backend may not be able to report which locks it supports
until after it is loaded, so query support on demand instead of caching
the value available at construction time.
Change-Id: I56fb1adee980ebc2fa893da3c983a6dce26329c0
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/unit/qcamera/tst_qcamera.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp index 48260ca94..6d3979dfc 100644 --- a/tests/auto/unit/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/qcamera/tst_qcamera.cpp @@ -344,13 +344,13 @@ void tst_QCamera::testSimpleCameraLock() QSignalSpy lockStatusChangedSignal(&camera, SIGNAL(lockStatusChanged(QCamera::LockStatus,QCamera::LockChangeReason))); camera.searchAndLock(); - QCOMPARE(camera.lockStatus(), QCamera::Locked); - QCOMPARE(camera.lockStatus(QCamera::LockExposure), QCamera::Locked); - QCOMPARE(camera.lockStatus(QCamera::LockFocus), QCamera::Locked); - QCOMPARE(camera.lockStatus(QCamera::LockWhiteBalance), QCamera::Locked); - QCOMPARE(lockedSignal.count(), 1); + QCOMPARE(camera.lockStatus(), QCamera::Unlocked); + QCOMPARE(camera.lockStatus(QCamera::LockExposure), QCamera::Unlocked); + QCOMPARE(camera.lockStatus(QCamera::LockFocus), QCamera::Unlocked); + QCOMPARE(camera.lockStatus(QCamera::LockWhiteBalance), QCamera::Unlocked); + QCOMPARE(lockedSignal.count(), 0); QCOMPARE(lockFailedSignal.count(), 0); - QCOMPARE(lockStatusChangedSignal.count(), 1); + QCOMPARE(lockStatusChangedSignal.count(), 0); lockedSignal.clear(); lockFailedSignal.clear(); @@ -364,7 +364,7 @@ void tst_QCamera::testSimpleCameraLock() QCOMPARE(lockedSignal.count(), 0); QCOMPARE(lockFailedSignal.count(), 0); - QCOMPARE(lockStatusChangedSignal.count(), 1); + QCOMPARE(lockStatusChangedSignal.count(), 0); } void tst_QCamera::testSimpleCaptureDestination() @@ -1264,18 +1264,18 @@ void tst_QCamera::testRequestedLocks() camera.unlock(); camera.searchAndLock(QCamera::LockWhiteBalance); - QCOMPARE(camera.requestedLocks(),QCamera::LockWhiteBalance); + QCOMPARE(camera.requestedLocks(),QCamera::NoLock); camera.unlock(); camera.searchAndLock(QCamera::LockExposure |QCamera::LockFocus ); QCOMPARE(camera.requestedLocks(),QCamera::LockExposure |QCamera::LockFocus ); camera.searchAndLock(QCamera::LockWhiteBalance); - QCOMPARE(camera.requestedLocks(),QCamera::LockExposure |QCamera::LockFocus|QCamera::LockWhiteBalance ); + QCOMPARE(camera.requestedLocks(),QCamera::LockExposure |QCamera::LockFocus); camera.unlock(QCamera::LockExposure); - QCOMPARE(camera.requestedLocks(),QCamera::LockFocus|QCamera::LockWhiteBalance ); + QCOMPARE(camera.requestedLocks(),QCamera::LockFocus); camera.unlock(QCamera::LockFocus); camera.searchAndLock(QCamera::LockExposure |QCamera::LockWhiteBalance ); - QCOMPARE(camera.requestedLocks(),QCamera::LockExposure|QCamera::LockWhiteBalance ); + QCOMPARE(camera.requestedLocks(),QCamera::LockExposure); } /* Test case for supportedLocks() */ |