1 files changed, 6 insertions, 130 deletions

diff --git a/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp b/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp
index bd32f340..32d82348 100644
--- a/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp
+++ b/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QtTest/QtTest>
 #include <QtTest/QSignalSpy>
@@ -7,11 +7,6 @@
 
 #include <QtTest/private/qpropertytesthelper_p.h>
 #include <QtSensorsQuick/private/qmlsensor_p.h>
-// #include <QtSensorsQuick/private/qmlsensorgesture_p.h>
-
-#include "qtemplategestureplugin.h"
-#include "qtemplaterecognizer.h"
-#include <qsensorgesturemanager.h>
 #include <qsensorbackend.h>
 #include "qsensormanager.h"
 
@@ -170,125 +165,6 @@ void tst_sensors_qmlcpp::testReadingBindings()
     unregister_test_backends();
 }
 
-/*
-void tst_sensors_qmlcpp::testGesture()
-{
-    QTemplateGesturePlugin* plugin = new QTemplateGesturePlugin();
-    QList <QSensorGestureRecognizer *> recognizers = plugin->createRecognizers();
-    QSensorGestureManager manager;
-
-    QmlSensorGesture* gs = new QmlSensorGesture(this);
-    gs->componentComplete();
-    QSignalSpy spy_availableGesturesChanged(gs, SIGNAL(availableGesturesChanged()));
-    QSignalSpy spy_detected(gs, SIGNAL(detected(QString)));
-    QSignalSpy spy_gesturesChanged(gs, SIGNAL(gesturesChanged()));
-    QSignalSpy spy_validGesturesChanged(gs, SIGNAL(validGesturesChanged()));
-    QSignalSpy spy_invalidGesturesChanged(gs, SIGNAL(invalidGesturesChanged()));
-    QSignalSpy spy_enabledChanged(gs, SIGNAL(enabledChanged()));
-
-    //This flag is needed if you run this unit test with an alread installed template plugin
-    bool registered = false;
-    for (int i = 0; i < recognizers.count(); i++){
-        registered = manager.registerSensorGestureRecognizer(recognizers[i]);
-    }
-    if (registered) {
-        QCOMPARE(spy_availableGesturesChanged.count(), 2);
-    }
-
-    //check creation of a not known plugin
-    QCOMPARE(spy_invalidGesturesChanged.count(), 0);
-    QCOMPARE(spy_gesturesChanged.count(), 0);
-    gs->setGestures(QStringList() << "lollipop");
-    QCOMPARE(spy_gesturesChanged.count(), 1);
-    QCOMPARE(spy_invalidGesturesChanged.count(), 1);
-
-    //check creation of a known plugin
-    QCOMPARE(spy_validGesturesChanged.count(), 0);
-    QCOMPARE(spy_gesturesChanged.count(), 1);
-    spy_invalidGesturesChanged.clear();
-    spy_validGesturesChanged.clear();
-    gs->setGestures(QStringList() << "QtSensors.template");
-    QCOMPARE(spy_gesturesChanged.count(), 2);
-    QCOMPARE(spy_invalidGesturesChanged.count(), 1);
-    QCOMPARE(spy_validGesturesChanged.count(), 1);
-
-    //enable "QtSensors.template"
-    QCOMPARE(spy_enabledChanged.count(), 0);
-    QCOMPARE(spy_detected.count(), 0);
-    gs->setEnabled(true);
-    QCOMPARE(spy_enabledChanged.count(), 1);
-    QCOMPARE(spy_detected.count(), 1);
-
-    //set gesture during running sensor should not emit gesture changed
-    spy_gesturesChanged.clear();
-    gs->setGestures(QStringList() << "QtSensors.template2");
-    QCOMPARE(spy_gesturesChanged.count(), 0);
-
-    gs->setEnabled(false);
-
-    QmlSensorGesture* gs1 = new QmlSensorGesture(this);
-    QSignalSpy spy1_detected(gs1, SIGNAL(detected(QString)));
-    QSignalSpy spy1_gesturesChanged(gs1, SIGNAL(gesturesChanged()));
-    QSignalSpy spy1_validGesturesChanged(gs1, SIGNAL(validGesturesChanged()));
-    QSignalSpy spy1_invalidGesturesChanged(gs1, SIGNAL(invalidGesturesChanged()));
-    QSignalSpy spy1_enabledChanged(gs1, SIGNAL(enabledChanged()));
-    gs1->componentComplete();
-
-    //set enable = true without gesture should
-    gs1->setEnabled(true);
-    QCOMPARE(spy1_enabledChanged.count(), 1);
-    gs1->setEnabled(false);
-    spy1_enabledChanged.clear();
-
-    //reding gestures check if we get back an empty string list
-    QStringList gestures = gs1->gestures();
-    QCOMPARE(gestures.count(), 0);
-    QStringList validgestures = gs1->validGestures();
-    QCOMPARE(validgestures.count(), 0);
-    QStringList invalidgestures = gs1->invalidGestures();
-    QCOMPARE(invalidgestures.count(), 0);
-
-    //check types "QtSensors.template" "QtSensors.template1" "lollipop"
-    //expect valid 2 not available 1
-    gestures << "QtSensors.template" << "QtSensors.template1" << "lollipop";
-    gs1->setGestures(gestures);
-    gestures = gs1->gestures();
-    QCOMPARE(gestures.count(), 3);
-    QCOMPARE(spy1_validGesturesChanged.count(), 1);
-    QCOMPARE(spy1_invalidGesturesChanged.count(), 1);
-    QCOMPARE(spy1_gesturesChanged.count(), 1);
-    //set same gesture again should not emit gesture changed
-    gs1->setGestures(gestures);
-    QCOMPARE(spy1_gesturesChanged.count(), 1);
-
-    spy1_gesturesChanged.clear();
-    gestures.clear();
-    gs1->setGestures(gestures);
-    QCOMPARE(spy1_gesturesChanged.count(), 1);
-
-    //enable "QtSensors.template" and "QtSensors.template1"
-    gestures << "QtSensors.template" << "QtSensors.template1";
-    gs1->setEnabled(false);
-    gs1->setGestures(gestures);
-    spy1_enabledChanged.clear();
-    spy1_detected.clear();
-    gs1->setEnabled(true);
-    QCOMPARE(spy1_enabledChanged.count(), 1);
-    QCOMPARE(spy1_detected.count(), 2);
-    gs1->setEnabled(false);
-
-    //check sensor shouldn't run until the componentComplete gets called
-    QmlSensorGesture* gs2 = new QmlSensorGesture(this);
-    QSignalSpy spy2_detected(gs2, SIGNAL(detected(QString)));
-    gs2->setGestures(QStringList() << "QtSensors.template");
-    gs2->setEnabled(true);
-    QCOMPARE(spy2_detected.count(), 0);
-    gs2->componentComplete();
-    QCOMPARE(spy2_detected.count(), 1);
-}
-
-*/
-
 class QDummySensorBackend : public QSensorBackend
 {
     Q_OBJECT
@@ -389,11 +265,11 @@ void tst_sensors_qmlcpp::testSensorRanges()
     QSignalSpy output2Spy(output2, SIGNAL(destroyed()));
 
     qmlSensor.reset();
-    QCOMPARE(range0Spy.count(), 1);
-    QCOMPARE(range1Spy.count(), 1);
-    QCOMPARE(output0Spy.count(), 1);
-    QCOMPARE(output1Spy.count(), 1);
-    QCOMPARE(output2Spy.count(), 1);
+    QCOMPARE(range0Spy.size(), 1);
+    QCOMPARE(range1Spy.size(), 1);
+    QCOMPARE(output0Spy.size(), 1);
+    QCOMPARE(output1Spy.size(), 1);
+    QCOMPARE(output2Spy.size(), 1);
 }
 
 QT_END_NAMESPACE