Rearrange the automatic tests.

Split them into unit and integration tests.  Integration tests really
need to be run on the real platform (not in a VM etc) since they are
somewhat unstable or nonfunctional otherwise.

A few tests were previously broken by QUrl changes and they were repaired.
Removed one test since it was not providing a lot of value.

There are still a number of tests that rely on Q_AUTOTEST_EXPORT symbols.

Change-Id: Ic402abf0af946baa5945075d975b3f584f9ef280
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>

2 files changed, 124 insertions, 0 deletions

diff --git a/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro b/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro
new file mode 100644
index 000000000..a53729a4f
--- /dev/null
+++ b/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro
@@ -0,0 +1,11 @@
+CONFIG += testcase
+TARGET = tst_qcameraviewfinder
+
+QT += multimedia-private multimediawidgets-private testlib
+CONFIG += no_private_qt_headers_warning
+
+include (../qmultimedia_common/mock.pri)
+include (../qmultimedia_common/mockcamera.pri)
+
+SOURCES += tst_qcameraviewfinder.cpp
+QT+=widgets
diff --git a/tests/auto/unit/qcameraviewfinder/tst_qcameraviewfinder.cpp b/tests/auto/unit/qcameraviewfinder/tst_qcameraviewfinder.cpp
new file mode 100644
index 000000000..106a87bc7
--- /dev/null
+++ b/tests/auto/unit/qcameraviewfinder/tst_qcameraviewfinder.cpp
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+
+#include <QtTest/QtTest>
+#include <QDebug>
+
+#include "qcameraviewfinder.h"
+#include "qcamera.h"
+#include "qmediaobject.h"
+
+#include "mockcameraservice.h"
+#include "mockmediaserviceprovider.h"
+
+class tst_QCameraViewFinder : public QObject
+{
+    Q_OBJECT
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+
+private slots:
+    void testConstructor();
+    void testMediaObject();
+
+private:
+    MockCameraService  *mockcameraservice;
+    MockMediaServiceProvider *provider;
+    QCamera *camera;
+    QCameraViewfinder *viewFinder;
+};
+
+void tst_QCameraViewFinder::initTestCase()
+{
+    provider = new MockMediaServiceProvider;
+    mockcameraservice = new MockCameraService;
+    provider->service = mockcameraservice;
+
+    camera = new QCamera(0, provider);
+    viewFinder = new QCameraViewfinder();
+}
+
+void tst_QCameraViewFinder::cleanupTestCase()
+{
+    delete mockcameraservice;
+    delete provider;
+}
+
+void tst_QCameraViewFinder::testConstructor()
+{
+    /* Verify whether the object is created or not */
+    QVERIFY(viewFinder != NULL);
+    QCOMPARE(viewFinder->isVisible(),false);
+    QCOMPARE(viewFinder->isEnabled(),true);
+    viewFinder->show();
+}
+
+void tst_QCameraViewFinder::testMediaObject()
+{
+    QVERIFY(viewFinder != NULL);
+    viewFinder->show();
+    /* Sets the QVideoWidget  based camera viewfinder.*/
+    camera->setViewfinder(viewFinder);
+    QCOMPARE(viewFinder->isVisible(),true);
+
+    /* Return the currently attached media object.*/
+    QMediaObject *media = viewFinder->mediaObject();
+
+    /* Verifying the object */
+    QCOMPARE(media, camera);
+}
+
+QTEST_MAIN(tst_QCameraViewFinder)
+#include "tst_qcameraviewfinder.moc"