diff options
author | Juha Vuolle <juha.vuolle@insta.fi> | 2022-09-29 17:53:56 +0300 |
---|---|---|
committer | Juha Vuolle <juha.vuolle@insta.fi> | 2022-10-04 08:11:45 +0300 |
commit | 7a94c109e6805b35150522b6714f04e63d751888 (patch) | |
tree | 4ce31ad1feb0de16bda4c591ad18c165db833b1d /tests/auto/qsensorgestureplugins | |
parent | d5d24fd5fe095337063891204e4fee4c6914b165 (diff) |
Remove disabled sensor gesture code
Support for sensor gestures in their then-current form was removed
in Qt 6 (QTBUG-95747). This commit removes the disabled code. This is
to avoid distraction when keeping the repository up-to-date with rest of
Qt.
The gestures may be reintroduced in some shape or form in the future
(QTBUG-97066). For those reference purposes the old code can be found
in the git history.
Fixes: QTBUG-107065
Change-Id: If2c50171f84d483dde55600422d138d550124bdc
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'tests/auto/qsensorgestureplugins')
-rw-r--r-- | tests/auto/qsensorgestureplugins/CMakeLists.txt | 17 | ||||
-rw-r--r-- | tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp | 177 |
2 files changed, 0 insertions, 194 deletions
diff --git a/tests/auto/qsensorgestureplugins/CMakeLists.txt b/tests/auto/qsensorgestureplugins/CMakeLists.txt deleted file mode 100644 index 3df0a4c3..00000000 --- a/tests/auto/qsensorgestureplugins/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -##################################################################### -## tst_qsensorgesturepluginstest Binary: -##################################################################### - -qt_internal_add_test(tst_qsensorgesturepluginstest - SOURCES - ../common/test_backends.cpp ../common/test_backends.h - tst_qsensorgesturepluginstest.cpp - INCLUDE_DIRECTORIES - ../qsensor - LIBRARIES - Qt::Sensors - Qt::Test -) diff --git a/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp b/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp deleted file mode 100644 index 5c9a3dda..00000000 --- a/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp +++ /dev/null @@ -1,177 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#include <QtCore/QString> -#include <QtTest/QtTest> - -#include <QVariant> -#include <QSignalSpy> - -#include <qsensorgesture.h> -#include <qsensorgesturemanager.h> - -#include <qsensorgesturerecognizer.h> -#include <qsensorgestureplugininterface.h> - -#include "../common/test_backends.h" - -class Tst_qsensorgesturePluginsTest : public QObject -{ - Q_OBJECT - -public: - Tst_qsensorgesturePluginsTest(); - -private Q_SLOTS: - - void tst_sensor_plugins_shake(); - void tst_sensor_plugins_qtsensors_data(); - void tst_sensor_plugins_qtsensors(); - void tst_sensor_plugins_qtsensors_all(); - -}; - -Tst_qsensorgesturePluginsTest::Tst_qsensorgesturePluginsTest() -{ - qputenv("QT_SENSORS_LOAD_PLUGINS", "0"); // Do not load plugins - register_test_backends(); -} - -void Tst_qsensorgesturePluginsTest::tst_sensor_plugins_shake() -{ - - QSensorGestureManager manager; - QVERIFY(manager.gestureIds().contains("QtSensors.shake")); - - QSensorGestureRecognizer *recognizer = manager.sensorGestureRecognizer("QtSensors.shake"); - - QCOMPARE(recognizer->isActive(), false); - - QTest::ignoreMessage(QtWarningMsg, "Not starting. Gesture Recognizer not initialized"); - recognizer->startBackend(); - QCOMPARE(recognizer->isActive(), false); - - QTest::ignoreMessage(QtWarningMsg, "Not stopping. Gesture Recognizer not initialized"); - recognizer->stopBackend(); - QCOMPARE(recognizer->isActive(), false); - - QScopedPointer<QSensorGesture> gesture(new QSensorGesture(QStringList() << "QtSensors.shake")); - - QCOMPARE(gesture->isActive(),false); - QCOMPARE(gesture->validIds(), QStringList() << "QtSensors.shake"); - - QCOMPARE(QStringList() << recognizer->id(), gesture->validIds()); - - gesture->startDetection(); - QCOMPARE(gesture->isActive(),true); - QCOMPARE(recognizer->isActive(), true); - - gesture->stopDetection(); - QCOMPARE(recognizer->isActive(), false); -} - -void Tst_qsensorgesturePluginsTest::tst_sensor_plugins_qtsensors_data() -{ - QTest::addColumn<QString>("gestureId"); - - QTest::newRow("QtSensors.cover") << "QtSensors.cover"; - - QTest::newRow("QtSensors.doubletap") << "QtSensors.doubletap"; - - QTest::newRow("QtSensors.freefall") << "QtSensors.freefall"; - QTest::newRow("QtSensors.hover") << "QtSensors.hover"; - QTest::newRow("QtSensors.shake2") << "QtSensors.shake2"; - QTest::newRow("QtSensors.slam") << "QtSensors.slam"; - QTest::newRow("QtSensors.turnover") << "QtSensors.turnover"; - QTest::newRow("QtSensors.twist") << "QtSensors.twist"; - QTest::newRow("QtSensors.whip") << "QtSensors.whip"; -} - -void Tst_qsensorgesturePluginsTest::tst_sensor_plugins_qtsensors() -{ - QFETCH(QString, gestureId); - QSensorGestureManager manager; - - QVERIFY(manager.gestureIds().contains(gestureId)); - - QScopedPointer<QSensorGesture> gesture(new QSensorGesture(QStringList() << gestureId)); - QScopedPointer<QSensorGesture> gesture2(new QSensorGesture(QStringList() << gestureId)); - - QCOMPARE(gesture->isActive(),false); - QCOMPARE(gesture->validIds(), QStringList() << gestureId); - - QSensorGestureRecognizer *recognizer = manager.sensorGestureRecognizer(gestureId); - - QCOMPARE(QStringList() << recognizer->id(), gesture->validIds()); - - QCOMPARE(QStringList() << QStringList(), gesture->invalidIds()); - - QVERIFY(recognizer->isActive() == false); - QVERIFY(gesture->isActive() == false); - QVERIFY(gesture2->isActive() == false); - - gesture->startDetection(); - - QVERIFY(gesture->isActive() == true); - QVERIFY(gesture2->isActive() == false); - - QVERIFY(recognizer->isActive() == true); - - gesture2->startDetection(); - - QVERIFY(gesture->isActive() == true); - QVERIFY(gesture2->isActive() == true); - QVERIFY(recognizer->isActive() == true); - - gesture2->stopDetection(); - - QVERIFY(gesture->isActive() == true); - QVERIFY(gesture2->isActive() == false); - QVERIFY(recognizer->isActive() == true); - - gesture->stopDetection(); - - QVERIFY(gesture->isActive() == false); - QVERIFY(gesture2->isActive() == false); - QVERIFY(recognizer->isActive() == false); - - - QVERIFY(recognizer->gestureSignals().count() > 1); - QVERIFY(recognizer->gestureSignals().contains("detected(QString)")); - -} - -void Tst_qsensorgesturePluginsTest::tst_sensor_plugins_qtsensors_all() -{ - QStringList list; - list << "QtSensors.cover"; - list << "QtSensors.doubletap"; - list << "QtSensors.hover"; - list << "QtSensors.pickup"; - list << "QtSensors.shake2"; - list << "QtSensors.slam"; - list << "QtSensors.turnover"; - list << "QtSensors.twist"; - list << "QtSensors.whip"; - - QSensorGestureManager manager; - - QScopedPointer<QSensorGesture> gesture(new QSensorGesture(list)); - QVERIFY(gesture->invalidIds().count() == 0); - QVERIFY(gesture->validIds().count() == 9); - QVERIFY(gesture->gestureSignals().count() == 14); - - gesture->startDetection(); - QVERIFY(gesture->isActive()); - - QSensorGestureRecognizer *recognizer = manager.sensorGestureRecognizer("QtSensors.turnover"); - recognizer->stopBackend(); - QVERIFY(!recognizer->isActive()); - QVERIFY(gesture->isActive()); - -} - - -QTEST_MAIN(Tst_qsensorgesturePluginsTest); - -#include "tst_qsensorgesturepluginstest.moc" |