diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2012-01-03 16:41:02 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-04 03:43:17 +0100 |
commit | d9dc92039377c41100f58119734883e5e6cb6dea (patch) | |
tree | 4e94d083c8af0b85689308a492b34b489961e412 /tests/auto | |
parent | f9ec11a25e0d04485745fbb9d9fb929da3459826 (diff) |
Remove some test functions that are actually integration tests.
And they're already in the qcamerabackend test.
Change-Id: If3edba9035380372a2e8d46efe1cf41e91ce5f09
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/unit/qcamera/tst_qcamera.cpp | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp index de44ae0d8..8f52e9fa3 100644 --- a/tests/auto/unit/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/qcamera/tst_qcamera.cpp @@ -79,9 +79,6 @@ public slots: void cleanupTestCase(); private slots: - void testAvailableDevices(); - void testDeviceDescription(); - void testCtorWithDevice(); void testSimpleCamera(); void testSimpleCameraWhiteBalance(); void testSimpleCameraExposure(); @@ -183,42 +180,6 @@ void tst_QCamera::cleanupTestCase() delete provider; } -void tst_QCamera::testAvailableDevices() -{ - int deviceCount = QMediaServiceProvider::defaultServiceProvider()->devices(QByteArray(Q_MEDIASERVICE_CAMERA)).count(); - - QVERIFY(QCamera::availableDevices().count() == deviceCount); -} - -void tst_QCamera::testDeviceDescription() -{ - int deviceCount = QMediaServiceProvider::defaultServiceProvider()->devices(QByteArray(Q_MEDIASERVICE_CAMERA)).count(); - - if (deviceCount == 0) - QVERIFY(QCamera::deviceDescription(QByteArray("random")).isNull()); - else { - foreach (const QByteArray &device, QCamera::availableDevices()) - QVERIFY(QCamera::deviceDescription(device).length() > 0); - } -} - -void tst_QCamera::testCtorWithDevice() -{ - int deviceCount = QMediaServiceProvider::defaultServiceProvider()->devices(QByteArray(Q_MEDIASERVICE_CAMERA)).count(); - QCamera *camera = 0; - - if (deviceCount == 0) { - camera = new QCamera("random"); - QVERIFY(camera->error() == QCamera::ServiceMissingError); - } - else { - camera = new QCamera(QCamera::availableDevices().first()); - QVERIFY(camera->error() == QCamera::NoError); - } - - delete camera; -} - void tst_QCamera::testSimpleCamera() { QCamera camera(0, provider); |