diff options
author | Doris Verria <doris.verria@qt.io> | 2021-05-20 19:20:46 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-05-23 14:05:07 +0000 |
commit | 6bbbd6754de580c67839257e0e98f51ac676b571 (patch) | |
tree | 26935388172560e226dae777e753483ffa8d1d7c /tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp | |
parent | e4bf3c4421e09d1ce9abc6d79b07dfa9f43cfb9d (diff) |
Fix tst_qcamerabackend failures for macOS and iOS
- Blacklist testCameraStartParallel on iOS as it doesn't seem to
support two active capture sessions at the same time.
- Fix some erroneous values.
- Add some missing keys to the Info.plist.
* Blacklist testCameraCaptureMetaData for macOS/iOS for now as it's
not yet implemented.
Change-Id: If889b7e4537c4f08ea810926420da59bd985e8e1
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp')
-rw-r--r-- | tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index 1db116d7b..fd2b03429 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -375,13 +375,13 @@ void tst_QCameraBackend::testExposureCompensation() camera.start(); QTRY_COMPARE(camera.status(), QCamera::ActiveStatus); - QCOMPARE(camera.exposureCompensation(), -1.0); + QCOMPARE(camera.exposureCompensation(), 1.0); exposureCompensationSignal.clear(); - camera.setExposureCompensation(1.0); - QCOMPARE(camera.exposureCompensation(), 1.0); + camera.setExposureCompensation(-1.0); + QCOMPARE(camera.exposureCompensation(), -1.0); QTRY_COMPARE(exposureCompensationSignal.count(), 1); - QCOMPARE(exposureCompensationSignal.last().first().toReal(), 1.0); + QCOMPARE(exposureCompensationSignal.last().first().toReal(), -1.0); } void tst_QCameraBackend::testExposureMode() @@ -398,7 +398,7 @@ void tst_QCameraBackend::testExposureMode() camera.setExposureMode(QCamera::ExposureNight); QCOMPARE(camera.exposureMode(), QCamera::ExposureNight); camera.start(); - QTRY_COMPARE(camera.status(), QCamera::ActiveStatus); + QVERIFY(camera.isActive()); QCOMPARE(camera.exposureMode(), QCamera::ExposureNight); } @@ -409,7 +409,7 @@ void tst_QCameraBackend::testExposureMode() camera.setExposureMode(QCamera::ExposureAuto); QCOMPARE(camera.exposureMode(), QCamera::ExposureAuto); camera.start(); - QTRY_COMPARE(camera.status(), QCamera::ActiveStatus); + QVERIFY(camera.isActive()); QCOMPARE(camera.exposureMode(), QCamera::ExposureAuto); // Manual |