diff options
-rw-r--r-- | src/imports/sensors2/sensors2.pro | 4 | ||||
-rw-r--r-- | tests/auto/auto.pro | 1 | ||||
-rw-r--r-- | tests/auto/qtsensors5/qtsensors5.pro | 6 | ||||
-rw-r--r-- | tests/auto/qtsensors5/tst_qtsensors5.cpp | 129 |
4 files changed, 137 insertions, 3 deletions
diff --git a/src/imports/sensors2/sensors2.pro b/src/imports/sensors2/sensors2.pro index 4a812c7f..1c77ed1b 100644 --- a/src/imports/sensors2/sensors2.pro +++ b/src/imports/sensors2/sensors2.pro @@ -3,9 +3,7 @@ TARGETPATH = QtSensors include(qsensors2import.pri) -QT += declarative sensors - -load(qt_plugin) +QT = declarative sensors SOURCES += sensors2.cpp \ qsensor2ambientlight.cpp \ diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 0b6ab9a7..e16b33c0 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -3,4 +3,5 @@ TEMPLATE = subdirs SUBDIRS += qsensor SUBDIRS += sensors2qmlapi SUBDIRS += legacy_sensors +SUBDIRS += qtsensors5 diff --git a/tests/auto/qtsensors5/qtsensors5.pro b/tests/auto/qtsensors5/qtsensors5.pro new file mode 100644 index 00000000..92d624dd --- /dev/null +++ b/tests/auto/qtsensors5/qtsensors5.pro @@ -0,0 +1,6 @@ +TEMPLATE=app +TARGET=tst_qtsensors5 +CONFIG += testcase +QT = core testlib gui declarative +SOURCES += tst_qtsensors5.cpp + diff --git a/tests/auto/qtsensors5/tst_qtsensors5.cpp b/tests/auto/qtsensors5/tst_qtsensors5.cpp new file mode 100644 index 00000000..ce6036ff --- /dev/null +++ b/tests/auto/qtsensors5/tst_qtsensors5.cpp @@ -0,0 +1,129 @@ +/**************************************************************************** +** +** Copyright (C) 2011 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 <QtDeclarative/QtDeclarative> + +class tst_qtsensors5 : public QObject +{ + Q_OBJECT +public: + tst_qtsensors5(QObject *parent = 0) + : QObject(parent) + { + } + +private slots: + void initTestCase() + { + } + + void cleanupTestCase() + { + } + + void versions_data() + { + QTest::addColumn<QString>("version"); + QTest::addColumn<bool>("exists"); + + QTest::newRow("version 5.0") << "5.0" << true; + } + + void versions() + { + QFETCH(QString, version); + QFETCH(bool, exists); + + QDeclarativeEngine engine; + QString qml = QString("import QtQuick 2.0\nimport QtSensors %1\nItem {}").arg(version); + QDeclarativeComponent c(&engine); + c.setData(qml.toLocal8Bit(), QUrl::fromLocalFile(QDir::currentPath())); + if (!exists) + QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready"); + QObject *obj = c.create(); + QCOMPARE(exists, (obj != 0)); + delete obj; + QList<QDeclarativeError> errors = c.errors(); + if (exists) { + QCOMPARE(errors.count(), 0); + } else { + QCOMPARE(errors.count(), 1); + QString expected = QString("module \"QtSensors\" version %1 is not installed").arg(version); + QString actual = errors.first().description(); + QCOMPARE(expected, actual); + } + } + + void elements_data() + { + QTest::addColumn<QString>("version"); + QTest::addColumn<QString>("element"); + QTest::addColumn<bool>("exists"); + + QTest::newRow("TiltSensor 5.0") << "5.0" << "TiltSensor" << true; + QTest::newRow("AmbientLightSensor 5.0") << "5.0" << "AmbientLightSensor" << true; + QTest::newRow("ProximitySensor 5.0") << "5.0" << "ProximitySensor" << true; + } + + void elements() + { + QFETCH(QString, version); + QFETCH(QString, element); + QFETCH(bool, exists); + + QDeclarativeEngine engine; + QString qml = QString("import QtQuick 2.0\nimport QtSensors %1\n%2 {}").arg(version).arg(element); + QDeclarativeComponent c(&engine); + c.setData(qml.toLocal8Bit(), QUrl::fromLocalFile(QDir::currentPath())); + if (!exists) + QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready"); + QObject *obj = c.create(); + QCOMPARE(exists, (obj != 0)); + delete obj; + QList<QDeclarativeError> errors = c.errors(); + QCOMPARE(errors.count(), 0); + } +}; + +QTEST_MAIN(tst_qtsensors5) + +#include "tst_qtsensors5.moc" |