Split some of the autotests into widget and non widget parts.

Since the tests are mostly not widget based.

Change-Id: Ic3fa4224b19f2a5c710fd4763b5e645252975c1c
Reviewed-on: http://codereview.qt-project.org/4174
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>

2 files changed, 2 insertions, 65 deletions

diff --git a/tests/auto/qcamera/qcamera.pro b/tests/auto/qcamera/qcamera.pro
index a34e81571..9e4a7e8ae 100644
--- a/tests/auto/qcamera/qcamera.pro
+++ b/tests/auto/qcamera/qcamera.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += multimediakit-private multimediakitwidgets-private
+QT += multimediakit-private
 CONFIG += no_private_qt_headers_warning
 
 include (../qmultimedia_common/mock.pri)
diff --git a/tests/auto/qcamera/tst_qcamera.cpp b/tests/auto/qcamera/tst_qcamera.cpp
index 016e738a0..f0962394a 100644
--- a/tests/auto/qcamera/tst_qcamera.cpp
+++ b/tests/auto/qcamera/tst_qcamera.cpp
@@ -58,10 +58,7 @@
 #include <qmediaservice.h>
 #include <qcamera.h>
 #include <qcameraimagecapture.h>
-#include <qgraphicsvideoitem.h>
 #include <qvideorenderercontrol.h>
-#include <qvideowidget.h>
-#include <qvideowindowcontrol.h>
 
 #include "mockcameraservice.h"
 
@@ -1037,39 +1034,10 @@ void tst_QCamera::testCameraEncodingProperyChange()
     QCOMPARE(camera.status(), QCamera::ActiveStatus);
     QCOMPARE(stateChangedSignal.count(), 0);
     QCOMPARE(statusChangedSignal.count(), 1);
-    stateChangedSignal.clear();
-    statusChangedSignal.clear();
-
-    //setting the viewfinder should also trigger backend to be restarted:
-    camera.setViewfinder(new QGraphicsVideoItem());
-    QCOMPARE(camera.state(), QCamera::ActiveState);
-    QCOMPARE(camera.status(), QCamera::LoadedStatus);
-
-    QCOMPARE(stateChangedSignal.count(), 0);
-    QCOMPARE(statusChangedSignal.count(), 1);
-
-    QTest::qWait(10);
-
-    service.mockControl->m_propertyChangesSupported = true;
-    //the changes to encoding settings,
-    //capture mode and encoding parameters should not trigger service restart
-    stateChangedSignal.clear();
-    statusChangedSignal.clear();
-
-    camera.setCaptureMode(QCamera::CaptureVideo);
-    camera.setCaptureMode(QCamera::CaptureStillImage);
-    imageCapture.setEncodingSettings(QImageEncoderSettings());
-    imageCapture.setEncodingSettings(QImageEncoderSettings());
-    camera.setViewfinder(new QGraphicsVideoItem());
-
-    QCOMPARE(stateChangedSignal.count(), 0);
-    QCOMPARE(statusChangedSignal.count(), 0);
 }
 
 void tst_QCamera::testSetVideoOutput()
 {
-    QVideoWidget widget;
-    QGraphicsVideoItem item;
     MockVideoSurface surface;
 
     MockCameraService service;
@@ -1077,21 +1045,9 @@ void tst_QCamera::testSetVideoOutput()
     provider.service = &service;
     QCamera camera(0, &provider);
 
-    camera.setViewfinder(&widget);
-    QVERIFY(widget.mediaObject() == &camera);
-
-    camera.setViewfinder(&item);
-    QVERIFY(widget.mediaObject() == 0);
-    QVERIFY(item.mediaObject() == &camera);
-
     camera.setViewfinder(reinterpret_cast<QVideoWidget *>(0));
-    QVERIFY(item.mediaObject() == 0);
-
-    camera.setViewfinder(&widget);
-    QVERIFY(widget.mediaObject() == &camera);
 
     camera.setViewfinder(reinterpret_cast<QGraphicsVideoItem *>(0));
-    QVERIFY(widget.mediaObject() == 0);
 
     camera.setViewfinder(&surface);
     QVERIFY(service.rendererControl->surface() == &surface);
@@ -1102,56 +1058,37 @@ void tst_QCamera::testSetVideoOutput()
     camera.setViewfinder(&surface);
     QVERIFY(service.rendererControl->surface() == &surface);
 
-    camera.setViewfinder(&widget);
+    camera.setViewfinder(reinterpret_cast<QVideoWidget *>(0));
     QVERIFY(service.rendererControl->surface() == 0);
-    QVERIFY(widget.mediaObject() == &camera);
 
     camera.setViewfinder(&surface);
     QVERIFY(service.rendererControl->surface() == &surface);
-    QVERIFY(widget.mediaObject() == 0);
 }
 
 
 void tst_QCamera::testSetVideoOutputNoService()
 {
-    QVideoWidget widget;
-    QGraphicsVideoItem item;
     MockVideoSurface surface;
 
     MockMediaServiceProvider provider;
     provider.service = 0;
     QCamera camera(0, &provider);
 
-    camera.setViewfinder(&widget);
-    QVERIFY(widget.mediaObject() == 0);
-
-    camera.setViewfinder(&item);
-    QVERIFY(item.mediaObject() == 0);
-
     camera.setViewfinder(&surface);
     // Nothing we can verify here other than it doesn't assert.
 }
 
 void tst_QCamera::testSetVideoOutputNoControl()
 {
-    QVideoWidget widget;
-    QGraphicsVideoItem item;
     MockVideoSurface surface;
 
     MockCameraService service;
     service.rendererRef = 1;
-    service.windowRef = 1;
 
     MockMediaServiceProvider provider;
     provider.service = &service;
     QCamera camera(0, &provider);
 
-    camera.setViewfinder(&widget);
-    QVERIFY(widget.mediaObject() == 0);
-
-    camera.setViewfinder(&item);
-    QVERIFY(item.mediaObject() == 0);
-
     camera.setViewfinder(&surface);
     QVERIFY(service.rendererControl->surface() == 0);
 }