diff options
author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-01-12 16:27:34 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-17 00:58:30 +0100 |
commit | 53d71baed324d43bf5bac1fd50fc2eb4764b3857 (patch) | |
tree | d60dc8f9829959a555ad071e19a0d15b2d251339 /tests | |
parent | a6268601c907c56555ae42668e983a447c0da2eb (diff) |
Changed QCamera::captureMode property to QFlags
This enables the expression of extra camera modes like
viewfinder only or capture during video recording.
Change-Id: Ie02fdeef5eb7fd6fc2f133c1afb0141e37c22b06
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp | 12 | ||||
-rw-r--r-- | tests/auto/unit/qcamera/tst_qcamera.cpp | 10 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockcameracontrol.h | 8 |
3 files changed, 15 insertions, 15 deletions
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index 23bfa511a..64d8b2221 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -233,7 +233,7 @@ void tst_QCameraBackend::testCaptureMode() QSignalSpy errorSignal(&camera, SIGNAL(error(QCamera::Error))); QSignalSpy stateChangedSignal(&camera, SIGNAL(stateChanged(QCamera::State))); - QSignalSpy captureModeSignal(&camera, SIGNAL(captureModeChanged(QCamera::CaptureMode))); + QSignalSpy captureModeSignal(&camera, SIGNAL(captureModeChanged(QCamera::CaptureModes))); QCOMPARE(camera.captureMode(), QCamera::CaptureStillImage); @@ -246,7 +246,7 @@ void tst_QCameraBackend::testCaptureMode() camera.setCaptureMode(QCamera::CaptureVideo); QCOMPARE(camera.captureMode(), QCamera::CaptureVideo); QTRY_COMPARE(captureModeSignal.size(), 1); - QCOMPARE(captureModeSignal.last().first().value<QCamera::CaptureMode>(), QCamera::CaptureVideo); + QCOMPARE(captureModeSignal.last().first().value<QCamera::CaptureModes>(), QCamera::CaptureVideo); captureModeSignal.clear(); camera.load(); @@ -257,12 +257,12 @@ void tst_QCameraBackend::testCaptureMode() //it should be possible to switch capture mode in Loaded state camera.setCaptureMode(QCamera::CaptureStillImage); QTRY_COMPARE(captureModeSignal.size(), 1); - QCOMPARE(captureModeSignal.last().first().value<QCamera::CaptureMode>(), QCamera::CaptureStillImage); + QCOMPARE(captureModeSignal.last().first().value<QCamera::CaptureModes>(), QCamera::CaptureStillImage); captureModeSignal.clear(); camera.setCaptureMode(QCamera::CaptureVideo); QTRY_COMPARE(captureModeSignal.size(), 1); - QCOMPARE(captureModeSignal.last().first().value<QCamera::CaptureMode>(), QCamera::CaptureVideo); + QCOMPARE(captureModeSignal.last().first().value<QCamera::CaptureModes>(), QCamera::CaptureVideo); captureModeSignal.clear(); camera.start(); @@ -280,7 +280,7 @@ void tst_QCameraBackend::testCaptureMode() QVERIFY2(stateChangedSignal.isEmpty(), "camera should not change the state during capture mode changes"); QCOMPARE(captureModeSignal.size(), 1); - QCOMPARE(captureModeSignal.last().first().value<QCamera::CaptureMode>(), QCamera::CaptureStillImage); + QCOMPARE(captureModeSignal.last().first().value<QCamera::CaptureModes>(), QCamera::CaptureStillImage); captureModeSignal.clear(); camera.setCaptureMode(QCamera::CaptureVideo); @@ -292,7 +292,7 @@ void tst_QCameraBackend::testCaptureMode() QVERIFY2(stateChangedSignal.isEmpty(), "camera should not change the state during capture mode changes"); QCOMPARE(captureModeSignal.size(), 1); - QCOMPARE(captureModeSignal.last().first().value<QCamera::CaptureMode>(), QCamera::CaptureVideo); + QCOMPARE(captureModeSignal.last().first().value<QCamera::CaptureModes>(), QCamera::CaptureVideo); captureModeSignal.clear(); camera.stop(); diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp index 60de17788..4ed64dc92 100644 --- a/tests/auto/unit/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/qcamera/tst_qcamera.cpp @@ -1123,7 +1123,7 @@ void tst_QCamera::testConstructorWithDefaultProvider() void tst_QCamera::testCaptureModeChanged_signal() { MockCameraControl *m_cameraControl= new MockCameraControl(this); - QSignalSpy spy(m_cameraControl, SIGNAL(captureModeChanged(QCamera::CaptureMode))); + QSignalSpy spy(m_cameraControl, SIGNAL(captureModeChanged(QCamera::CaptureModes))); QVERIFY(spy.size() == 0); m_cameraControl->setCaptureMode(QCamera::CaptureVideo); @@ -1331,7 +1331,7 @@ void tst_QCamera::testUnlockWithType() QVERIFY(lockStatus == QCamera::Unlocked); } -/* Test case for signal captureModeChanged(QCamera::CaptureMode) */ +/* Test case for signal captureModeChanged(QCamera::CaptureModes) */ void tst_QCamera::testCaptureModeChangedSignal() { MockCameraService service; @@ -1339,16 +1339,16 @@ void tst_QCamera::testCaptureModeChangedSignal() QCamera camera(0, provider); QVERIFY(camera.captureMode() == QCamera::CaptureStillImage); - qRegisterMetaType<QCamera::CaptureMode>("QCamera::CaptureMode"); + qRegisterMetaType<QCamera::CaptureModes>("QCamera::CaptureModes"); /* Spy the signal */ - QSignalSpy lockCaptureModeChangedSignal(&camera, SIGNAL(captureModeChanged(QCamera::CaptureMode))); + QSignalSpy lockCaptureModeChangedSignal(&camera, SIGNAL(captureModeChanged(QCamera::CaptureModes))); /* set the capture mode and Verify if the signal is emitted */ camera.setCaptureMode(QCamera::CaptureVideo); QVERIFY(camera.captureMode() == QCamera::CaptureVideo); QCOMPARE(lockCaptureModeChangedSignal.count(), 1); - QCamera::CaptureMode lockCaptureMode = qvariant_cast<QCamera::CaptureMode >(lockCaptureModeChangedSignal.at(0).at(0)); + QCamera::CaptureModes lockCaptureMode = qvariant_cast<QCamera::CaptureModes >(lockCaptureModeChangedSignal.at(0).at(0)); QVERIFY(lockCaptureMode == QCamera::CaptureVideo); } diff --git a/tests/auto/unit/qmultimedia_common/mockcameracontrol.h b/tests/auto/unit/qmultimedia_common/mockcameracontrol.h index 18fb12ae2..a6c1ea1c9 100644 --- a/tests/auto/unit/qmultimedia_common/mockcameracontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockcameracontrol.h @@ -89,8 +89,8 @@ public: QCamera::Status status() const { return m_status; } - QCamera::CaptureMode captureMode() const { return m_captureMode; } - void setCaptureMode(QCamera::CaptureMode mode) + QCamera::CaptureModes captureMode() const { return m_captureMode; } + void setCaptureMode(QCamera::CaptureModes mode) { if (m_captureMode != mode) { if (m_state == QCamera::ActiveState && !m_propertyChangesSupported) @@ -100,7 +100,7 @@ public: } } - bool isCaptureModeSupported(QCamera::CaptureMode mode) const + bool isCaptureModeSupported(QCamera::CaptureModes mode) const { return mode == QCamera::CaptureStillImage || mode == QCamera::CaptureVideo; } @@ -135,7 +135,7 @@ public: } QCamera::State m_state; - QCamera::CaptureMode m_captureMode; + QCamera::CaptureModes m_captureMode; QCamera::Status m_status; bool m_propertyChangesSupported; }; |