From 657aebc33fc0abff544aeeb5c6d92e5b5bdb582c Mon Sep 17 00:00:00 2001 From: Juha Vuolle Date: Tue, 1 Jun 2021 12:42:00 +0300 Subject: Remove obsolete 'legacy' test case (cleanup) The term 'legacy' here refers to QtMobility sensors 1.2 implementation, and the test case removed by this commit has been disabled in 2012 when 1.3 was released. Task-number: QTBUG-92513 Change-Id: If6a2e72c9d7c97f0bf93a8acbc3521cceffab571 Reviewed-by: Karsten Heimrich --- tests/auto/legacy_sensors/CMakeLists.txt | 16 -- tests/auto/legacy_sensors/tst_legacy_sensors.cpp | 266 ----------------------- 2 files changed, 282 deletions(-) delete mode 100644 tests/auto/legacy_sensors/CMakeLists.txt delete mode 100644 tests/auto/legacy_sensors/tst_legacy_sensors.cpp (limited to 'tests') diff --git a/tests/auto/legacy_sensors/CMakeLists.txt b/tests/auto/legacy_sensors/CMakeLists.txt deleted file mode 100644 index 8ed9eeb..0000000 --- a/tests/auto/legacy_sensors/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -##################################################################### -## tst_legacy_sensors Binary: -##################################################################### - -qt_internal_add_test(tst_legacy_sensors - SOURCES - ../qsensor/test_backends.cpp ../qsensor/test_backends.h - tst_legacy_sensors.cpp - INCLUDE_DIRECTORIES - ../qsensor - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Sensors - Qt::Test -) diff --git a/tests/auto/legacy_sensors/tst_legacy_sensors.cpp b/tests/auto/legacy_sensors/tst_legacy_sensors.cpp deleted file mode 100644 index 10ced23..0000000 --- a/tests/auto/legacy_sensors/tst_legacy_sensors.cpp +++ /dev/null @@ -1,266 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtSensors module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include -#include -#include "test_backends.h" - -class tst_legacy_sensors : public QObject -{ - Q_OBJECT -public: - tst_legacy_sensors(QObject *parent = 0) - : QObject(parent) - { - qputenv("QT_SENSORS_LOAD_PLUGINS", "0"); // Do not load plugins - register_test_backends(); - } - -private slots: - void initTestCase() - { - } - - void cleanupTestCase() - { - } - - void versions_data() - { - QTest::addColumn("version"); - QTest::addColumn("exists"); - - QTest::newRow("5.0") << "5.0" << true; - } - - void versions() - { - QFETCH(QString, version); - QFETCH(bool, exists); - - QQmlEngine engine; - QString qml = QString("import QtQuick 2.0\nimport QtSensors %1\nItem {}").arg(version); - QQmlComponent c(&engine); - c.setData(qml.toLocal8Bit(), QUrl::fromLocalFile(QDir::currentPath())); - if (!exists) - QTest::ignoreMessage(QtWarningMsg, "QQmlComponent: Component is not ready"); - QObject *obj = c.create(); - QCOMPARE(exists, (obj != 0)); - delete obj; - QList 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("version"); - QTest::addColumn("element"); - QTest::addColumn("exists"); - - QTest::newRow("5.0 Range") << "5.0" << "Range" << false; - QTest::newRow("5.0 OutputRange") << "5.0" << "OutputRange" << false; - QTest::newRow("5.0 Sensor") << "5.0" << "Sensor" << false; - QTest::newRow("5.0 SensorReading") << "5.0" << "SensorReading" << false; - QTest::newRow("5.0 Accelerometer") << "5.0" << "Accelerometer" << true; - QTest::newRow("5.0 AccelerometerReading") << "5.0" << "AccelerometerReading" << false; - QTest::newRow("5.0 AmbientLightSensor") << "5.0" << "AmbientLightSensor" << true; - QTest::newRow("5.0 AmbientLightReading") << "5.0" << "AmbientLightReading" << false; - QTest::newRow("5.0 Compass") << "5.0" << "Compass" << true; - QTest::newRow("5.0 CompassReading") << "5.0" << "CompassReading" << false; - QTest::newRow("5.0 Magnetometer") << "5.0" << "Magnetometer" << true; - QTest::newRow("5.0 MagnetometerReading") << "5.0" << "MagnetometerReading" << false; - QTest::newRow("5.0 OrientationSensor") << "5.0" << "OrientationSensor" << true; - QTest::newRow("5.0 OrientationReading") << "5.0" << "OrientationReading" << false; - QTest::newRow("5.0 ProximitySensor") << "5.0" << "ProximitySensor" << true; - QTest::newRow("5.0 ProximityReading") << "5.0" << "ProximityReading" << false; - QTest::newRow("5.0 RotationSensor") << "5.0" << "RotationSensor" << true; - QTest::newRow("5.0 RotationReading") << "5.0" << "RotationReading" << false; - QTest::newRow("5.0 TapSensor") << "5.0" << "TapSensor" << true; - QTest::newRow("5.0 TapReading") << "5.0" << "TapReading" << false; - QTest::newRow("5.0 LightSensor") << "5.0" << "LightSensor" << true; - QTest::newRow("5.0 LightReading") << "5.0" << "LightReading" << false; - QTest::newRow("5.0 Gyroscope") << "5.0" << "Gyroscope" << true; - QTest::newRow("5.0 GyroscopeReading") << "5.0" << "GyroscopeReading" << false; - QTest::newRow("5.0 IRProximitySensor") << "5.0" << "IRProximitySensor" << true; - QTest::newRow("5.0 IRProximityReading") << "5.0" << "IRProximityReading" << false; - QTest::newRow("5.0 TiltSensor") << "5.0" << "TiltSensor" << true; - QTest::newRow("5.0 TiltReading") << "5.0" << "TiltReading" << false; - - QTest::newRow("5.0 SensorGesture") << "5.0" << "SensorGesture" << true; - } - - void elements() - { - QFETCH(QString, version); - QFETCH(QString, element); - QFETCH(bool, exists); - - QQmlEngine engine; - QString qml = QString("import QtQuick 2.0\nimport QtSensors %1\n%2 {}").arg(version).arg(element); - QQmlComponent c(&engine); - c.setData(qml.toLocal8Bit(), QUrl::fromLocalFile(QDir::currentPath())); - if (!exists) - QTest::ignoreMessage(QtWarningMsg, "QQmlComponent: Component is not ready"); - QObject *obj = c.create(); - QCOMPARE(exists, (obj != 0)); - delete obj; - QList errors = c.errors(); - if (exists) { - QCOMPARE(errors.count(), 0); - } else { - QCOMPARE(errors.count(), 1); - QString expected = QString("Cannot create %1").arg(element); - QString actual = errors.first().description(); - QCOMPARE(expected, actual); - } - } - - void alwaysOn_data() - { - QTest::addColumn("version"); - QTest::addColumn("element"); - QTest::addColumn("validSyntax"); - - QTest::newRow("5.0 Accelerometer") << "5.0" << "Accelerometer" << true; - QTest::newRow("5.0 AmbientLightSensor") << "5.0" << "AmbientLightSensor" << true; - QTest::newRow("5.0 Compass") << "5.0" << "Compass" << true; - QTest::newRow("5.0 Magnetometer") << "5.0" << "Magnetometer" << true; - QTest::newRow("5.0 OrientationSensor") << "5.0" << "OrientationSensor" << true; - QTest::newRow("5.0 ProximitySensor") << "5.0" << "ProximitySensor" << true; - QTest::newRow("5.0 RotationSensor") << "5.0" << "RotationSensor" << true; - QTest::newRow("5.0 TapSensor") << "5.0" << "TapSensor" << true; - QTest::newRow("5.0 LightSensor") << "5.0" << "LightSensor" << true; - QTest::newRow("5.0 Gyroscope") << "5.0" << "Gyroscope" << true; - QTest::newRow("5.0 IRProximitySensor") << "5.0" << "IRProximitySensor" << true; - QTest::newRow("5.0 TiltSensor") << "5.0" << "TiltSensor" << true; - } - - void alwaysOn() - { - QFETCH(QString, version); - QFETCH(QString, element); - QFETCH(bool, validSyntax); - - QQmlEngine engine; - QString qml = QString("import QtQuick 2.0\nimport QtSensors %1\n%2 {\nalwaysOn: true\n}").arg(version).arg(element); - QQmlComponent c(&engine); - if (!validSyntax) - QTest::ignoreMessage(QtWarningMsg, "QQmlComponent: Component is not ready"); - c.setData(qml.toLocal8Bit(), QUrl::fromLocalFile(QDir::currentPath())); - QObject *obj = c.create(); - if (validSyntax) { - QVERIFY(obj); - QVariant alwaysOn = obj->property("alwaysOn"); - QCOMPARE(alwaysOn.isValid(), true); - QCOMPARE(alwaysOn.toBool(), true); - delete obj; - } else { - QCOMPARE(obj, static_cast(0)); - } - } - - void namespace_api_data() - { - QTest::addColumn("qmlcode"); - QTest::addColumn("expected"); - - QVariant expected; - QStringList sl; - foreach (const QByteArray &type, QSensor::sensorTypes()) { - sl << QString::fromLocal8Bit(type); - qDebug() << type; - } - expected = sl; - QTest::newRow("Sensors.sensorTypes()") - << "Item {\n" - "property var result\n" - "Component.onCompleted: {\n" - "result = Sensors.sensorTypes();\n" - "}\n" - "}" - << expected; - - foreach (const QByteArray &type, QSensor::sensorTypes()) { - sl.clear(); - foreach (const QByteArray &identifier, QSensor::sensorsForType(type)) { - sl << QString::fromLocal8Bit(identifier); - } - expected = sl; - QTest::newRow(QString("Sensors.sensorsForType(\"%1\")").arg(QString::fromLocal8Bit(type)).toLocal8Bit().constData()) - << QString( - "Item {\n" - "property var result\n" - "Component.onCompleted: {\n" - "result = Sensors.sensorsForType(\"%1\");\n" - "}\n" - "}").arg(QString::fromLocal8Bit(type)) - << expected; - - expected = QString::fromLocal8Bit(QSensor::defaultSensorForType(type)); - QTest::newRow(QString("Sensors.defaultSensorForType(\"%1\")").arg(QString::fromLocal8Bit(type)).toLocal8Bit().constData()) - << QString( - "Item {\n" - "property var result\n" - "Component.onCompleted: {\n" - "result = Sensors.defaultSensorForType(\"%1\");\n" - "}\n" - "}").arg(QString::fromLocal8Bit(type)) - << expected; - } - } - - void namespace_api() - { - QFETCH(QString, qmlcode); - QFETCH(QVariant, expected); - - QQmlEngine engine; - QString qml = QString("import QtQuick 2.0\nimport QtSensors 5.0 as Sensors\n%1").arg(qmlcode); - QQmlComponent c(&engine); - c.setData(qml.toLocal8Bit(), QUrl::fromLocalFile(QDir::currentPath())); - QObject *obj = c.create(); - QVERIFY(obj); - QVariant result = obj->property("result"); - QCOMPARE(expected, result); - delete obj; - } - -}; - -QTEST_MAIN(tst_legacy_sensors) - -#include "tst_legacy_sensors.moc" -- cgit v1.2.1