diff options
Diffstat (limited to 'tests/auto/unit/qcamera/tst_qcamera.cpp')
| -rw-r--r-- | tests/auto/unit/qcamera/tst_qcamera.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp index fdd282cae..8c72acb8c 100644 --- a/tests/auto/unit/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/qcamera/tst_qcamera.cpp @@ -274,7 +274,7 @@ void tst_QCamera::testSimpleCameraExposure() cameraExposure->setAutoShutterSpeed(); QVERIFY(cameraExposure->shutterSpeed() < 0); cameraExposure->setManualShutterSpeed(1/128.0); - QVERIFY(cameraExposure->shutterSpeed() < 0); + QVERIFY(cameraExposure->shutterSpeed() < 0); } void tst_QCamera::testSimpleCameraFocus() @@ -292,7 +292,7 @@ void tst_QCamera::testSimpleCameraFocus() QCOMPARE(cameraFocus->focusMode(), QCameraFocus::AutoFocus); QTest::ignoreMessage(QtWarningMsg, "Focus mode selection is not supported"); cameraFocus->setFocusMode(QCameraFocus::ContinuousFocus); - QCOMPARE(cameraFocus->focusMode(), QCameraFocus::AutoFocus); + QCOMPARE(cameraFocus->focusMode(), QCameraFocus::AutoFocus); QCOMPARE(cameraFocus->maximumOpticalZoom(), 1.0); QCOMPARE(cameraFocus->maximumDigitalZoom(), 1.0); @@ -459,7 +459,7 @@ void tst_QCamera::testCameraCapture() QVERIFY(!imageCapture.isReadyForCapture()); - QSignalSpy capturedSignal(&imageCapture, SIGNAL(imageCaptured(int,QImage))); + QSignalSpy capturedSignal(&imageCapture, SIGNAL(imageCaptured(int,QImage))); QSignalSpy errorSignal(&imageCapture, SIGNAL(error(int, QCameraImageCapture::Error,QString))); imageCapture.capture(QString::fromLatin1("/dev/null")); @@ -504,7 +504,8 @@ void tst_QCamera::testCameraCaptureMetadata() QCOMPARE(metadata[0].toInt(), id); QCOMPARE(metadata[1].toString(), QMediaMetaData::DateTimeOriginal); QDateTime captureTime = metadata[2].value<QVariant>().value<QDateTime>(); - QVERIFY(qAbs(captureTime.secsTo(QDateTime::currentDateTime()) < 5)); //it should not takes more than 5 seconds for signal to arrive here + const qint64 dt = captureTime.secsTo(QDateTime::currentDateTime()); + QVERIFY2(qAbs(dt) < 5, QByteArray::number(dt).constData()); // it should not take more than 5 seconds for signal to arrive here metadata = metadataSignal[2]; QCOMPARE(metadata[0].toInt(), id); |