From 44150b8815fd133bd86b033abd19a41b9ad81fb8 Mon Sep 17 00:00:00 2001
From: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Date: Tue, 20 Dec 2011 19:03:08 +1000
Subject: alwaysOn for QtSensors 5.0 sensors

refactor the enabled and alwaysOn properties into a common base class
use appropriate namespacing to avoid collisions with the QtMobility.sensors elements

Change-Id: I6ac9f040d226bb648ede5459df2c26b82feff587
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Wolfgang Beck <wolfgang.beck@nokia.com>
---
 tests/auto/qtsensors5/tst_qtsensors5.cpp     | 28 ++++++++++++++++++++++++++++
 tests/auto/sensors2qmlapi/sensors2qmlapi.pro |  2 ++
 2 files changed, 30 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/qtsensors5/tst_qtsensors5.cpp b/tests/auto/qtsensors5/tst_qtsensors5.cpp
index 3f673154..7be610a5 100644
--- a/tests/auto/qtsensors5/tst_qtsensors5.cpp
+++ b/tests/auto/qtsensors5/tst_qtsensors5.cpp
@@ -124,6 +124,34 @@ private slots:
         QList<QDeclarativeError> errors = c.errors();
         QCOMPARE(errors.count(), 0);
     }
+
+    void uncreatable_elements_data()
+    {
+        QTest::addColumn<QString>("version");
+        QTest::addColumn<QString>("element");
+
+        QTest::newRow("Sensor 5.0")         << "5.0" << "Sensor";
+    }
+
+    void uncreatable_elements()
+    {
+        QFETCH(QString, version);
+        QFETCH(QString, element);
+
+        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()));
+        //QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready");
+        QObject *obj = c.create();
+        QCOMPARE(obj, static_cast<QObject*>(0));
+        delete obj;
+        QList<QDeclarativeError> errors = c.errors();
+        QCOMPARE(errors.count(), 1);
+        QString expected = QString("Cannot create %1").arg(element);
+        QString actual = errors.first().description();
+        QCOMPARE(expected, actual);
+    }
 };
 
 QTEST_MAIN(tst_qtsensors5)
diff --git a/tests/auto/sensors2qmlapi/sensors2qmlapi.pro b/tests/auto/sensors2qmlapi/sensors2qmlapi.pro
index cdd9c02e..836cce0e 100644
--- a/tests/auto/sensors2qmlapi/sensors2qmlapi.pro
+++ b/tests/auto/sensors2qmlapi/sensors2qmlapi.pro
@@ -11,6 +11,7 @@ SOURCES += tst_sensors2qmlapi.cpp \
            ./../../../src/imports/sensors2/qsensor2proximity.cpp \
            ./../../../src/imports/sensors2/qsensor2tilt.cpp \
            ./../../../src/imports/sensors2/qsensor2gesture.cpp \
+           ./../../../src/imports/sensors2/qsensor2common.cpp \
            qtemplategestureplugin.cpp \
            qtemplaterecognizer.cpp
 
@@ -22,5 +23,6 @@ HEADERS += qdeclaccelerometer.h \
            ./../../../src/imports/sensors2/qsensor2proximity.h \
            ./../../../src/imports/sensors2/qsensor2tilt.h \
            ./../../../src/imports/sensors2/qsensor2gesture.h \
+           ./../../../src/imports/sensors2/qsensor2common.h \
            qtemplategestureplugin.h \
            qtemplaterecognizer.h
-- 
cgit v1.2.3