slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Camera integration test fixes

Browse Source 
Skip the testCtorWithDevice test if camera doesn't
support devices selection;

Allow synchronous camera status changes

Change-Id: I14f4a74f8a92b8dc2f75f8f5df2bcf9c124bda68
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2012-08-16 14:45:46 +10:00
committed by Qt by Nokia
parent 37b872da9e
commit 8a3706a5a1
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
View File

@@ -128,17 +128,16 @@ void tst_QCameraBackend::testDeviceDescription()
void tst_QCameraBackend::testCtorWithDevice() void tst_QCameraBackend::testCtorWithDevice()
{ {
int deviceCount = QMediaServiceProvider::defaultServiceProvider()->devices(QByteArray(Q_MEDIASERVICE_CAMERA)).count(); if (QCamera::availableDevices().isEmpty())
QCamera *camera = 0; QSKIP("Camera selection not supported");
if (deviceCount == 0) { QCamera *camera = new QCamera(QCamera::availableDevices().first());
camera = new QCamera("random"); QCOMPARE(camera->error(), QCamera::NoError);
QCOMPARE(camera->error(), QCamera::ServiceMissingError); delete camera;
}
else { //loading non existing camera should fail
camera = new QCamera(QCamera::availableDevices().first()); camera = new QCamera(QUuid::createUuid().toByteArray());
QCOMPARE(camera->error(), QCamera::NoError); QCOMPARE(camera->error(), QCamera::ServiceMissingError);
}
delete camera; delete camera;
} }
@@ -608,7 +607,8 @@ void tst_QCameraBackend::testVideoRecording()
QCOMPARE(recorder.status(), QMediaRecorder::UnloadedStatus); QCOMPARE(recorder.status(), QMediaRecorder::UnloadedStatus);
camera->start(); camera->start();
QCOMPARE(recorder.status(), QMediaRecorder::LoadingStatus); QVERIFY(recorder.status() == QMediaRecorder::LoadingStatus ||
recorder.status() == QMediaRecorder::LoadedStatus);
QCOMPARE(recorderStatusSignal.last().first().value<QMediaRecorder::Status>(), recorder.status()); QCOMPARE(recorderStatusSignal.last().first().value<QMediaRecorder::Status>(), recorder.status());
QTRY_COMPARE(camera->status(), QCamera::ActiveStatus); QTRY_COMPARE(camera->status(), QCamera::ActiveStatus);
QTRY_COMPARE(recorder.status(), QMediaRecorder::LoadedStatus); QTRY_COMPARE(recorder.status(), QMediaRecorder::LoadedStatus);