diff --git a/src/libinputactions/handlers/TriggerHandler.cpp b/src/libinputactions/handlers/TriggerHandler.cpp index 23d7652..8bf0673 100644 --- a/src/libinputactions/handlers/TriggerHandler.cpp +++ b/src/libinputactions/handlers/TriggerHandler.cpp @@ -56,7 +56,6 @@ TriggerManagementOperationResult TriggerHandler::activateTriggers(TriggerTypes t TriggerManagementOperationResult result{}; for (auto &trigger : triggers(types, event)) { Q_EMIT activatingTrigger(trigger); - Q_EMIT trigger->activated(); m_activeTriggers.push_back(trigger); qCDebug(INPUTACTIONS_HANDLER_TRIGGER).noquote() << QString("Trigger activated (id: %1)").arg(trigger->id()); diff --git a/src/libinputactions/triggers/Trigger.cpp b/src/libinputactions/triggers/Trigger.cpp index 09d4a7d..a8930df 100644 --- a/src/libinputactions/triggers/Trigger.cpp +++ b/src/libinputactions/triggers/Trigger.cpp @@ -127,7 +127,6 @@ void Trigger::end(bool allowResuming) for (const auto &action : m_actions) { action->triggerEnded(); } - Q_EMIT ended(); reset(); } diff --git a/src/libinputactions/triggers/Trigger.h b/src/libinputactions/triggers/Trigger.h index e172fd7..9c51fa0 100644 --- a/src/libinputactions/triggers/Trigger.h +++ b/src/libinputactions/triggers/Trigger.h @@ -193,10 +193,6 @@ class Trigger : public QObject const TriggerType &type() const; -signals: - void activated(); - void ended(); - protected: /** * Called when an action is added. May be used to change default behavior. diff --git a/tests/libinputactions/CMakeLists.txt b/tests/libinputactions/CMakeLists.txt index ce71d02..ce4fb83 100644 --- a/tests/libinputactions/CMakeLists.txt +++ b/tests/libinputactions/CMakeLists.txt @@ -42,7 +42,6 @@ libinputactions_add_test(TestKeyboardTriggerHandler SOURCES handlers/TestKeyboar libinputactions_add_test(TestMotionTrigger SOURCES triggers/TestMotionTrigger.cpp) libinputactions_add_test(TestMotionTriggerHandler SOURCES handlers/TestMotionTriggerHandler.cpp) libinputactions_add_test(TestPlasmaShortcutActionNodeParser SOURCES config/parsers/actions/TestPlasmaShortcutActionNodeParser.cpp) -libinputactions_add_test(TestPointerTriggerHandler SOURCES handlers/TestPointerTriggerHandler.cpp) libinputactions_add_test(TestQPointFNodeParser SOURCES config/parsers/qt/TestQPointFNodeParser.cpp) libinputactions_add_test(TestQRegularExpressionNodeParser SOURCES config/parsers/qt/TestQRegularExpressionNodeParser.cpp) libinputactions_add_test(TestQStringNodeParser SOURCES config/parsers/qt/TestQStringNodeParser.cpp) diff --git a/tests/libinputactions/handlers/TestPointerTriggerHandler.cpp b/tests/libinputactions/handlers/TestPointerTriggerHandler.cpp deleted file mode 100644 index 14f233c..0000000 --- a/tests/libinputactions/handlers/TestPointerTriggerHandler.cpp +++ /dev/null @@ -1,80 +0,0 @@ -#include "TestPointerTriggerHandler.h" -#include "utils.h" -#include -#include -#include - -namespace InputActions -{ - -void TestPointerTriggerHandler::init() -{ - m_device = std::make_unique(InputDeviceType::Mouse); -} - -void TestPointerTriggerHandler::hover_conditionNotSatisfied_triggerNotActivated() -{ - auto trigger = std::make_unique(); - trigger->setActivationCondition(FALSE_CONDITION); - QSignalSpy activatedSpy(trigger.get(), &Trigger::activated); - - PointerTriggerHandler handler; - handler.addTrigger(std::move(trigger)); - - QVERIFY(!handler.handleEvent(MotionEvent(m_device.get(), InputEventType::PointerMotion, {{1, 0}}))); - QCOMPARE(activatedSpy.count(), 0); -} - -void TestPointerTriggerHandler::hover_conditionSatisfied_triggerActivated() -{ - auto trigger = std::make_unique(); - QSignalSpy activatedSpy(trigger.get(), &Trigger::activated); - - PointerTriggerHandler handler; - handler.addTrigger(std::move(trigger)); - - QVERIFY(!handler.handleEvent(MotionEvent(m_device.get(), InputEventType::PointerMotion, {{1, 0}}))); - QCOMPARE(activatedSpy.count(), 1); -} - -void TestPointerTriggerHandler::hover_conditionNoLongerSatisfied_triggerEnded() -{ - auto trigger = std::make_unique(); - auto satisfied = true; - trigger->setActivationCondition(referenceCondition(satisfied)); - QSignalSpy endedSpy(trigger.get(), &Trigger::ended); - - PointerTriggerHandler handler; - handler.addTrigger(std::move(trigger)); - - QVERIFY(!handler.handleEvent(MotionEvent(m_device.get(), InputEventType::PointerMotion, {{1, 0}}))); - handler.updateTriggers(TriggerType::Hover); - QCOMPARE(endedSpy.count(), 0); - - satisfied = false; - QVERIFY(!handler.handleEvent(MotionEvent(m_device.get(), InputEventType::PointerMotion, {{1, 0}}))); - QCOMPARE(endedSpy.count(), 1); -} - -void TestPointerTriggerHandler::hover_conditionNoLongerSatisfiedNoMotionEvent_triggerEnded() -{ - auto trigger = std::make_unique(); - auto satisfied = true; - trigger->setActivationCondition(referenceCondition(satisfied)); - QSignalSpy endedSpy(trigger.get(), &Trigger::ended); - - PointerTriggerHandler handler; - handler.addTrigger(std::move(trigger)); - - QVERIFY(!handler.handleEvent(MotionEvent(m_device.get(), InputEventType::PointerMotion, {{1, 0}}))); - handler.updateTriggers(TriggerType::Hover); - QCOMPARE(endedSpy.count(), 0); - - satisfied = false; - handler.updateTriggers(TriggerType::Hover); - QCOMPARE(endedSpy.count(), 1); -} - -} - -QTEST_MAIN(InputActions::TestPointerTriggerHandler) \ No newline at end of file diff --git a/tests/libinputactions/handlers/TestPointerTriggerHandler.h b/tests/libinputactions/handlers/TestPointerTriggerHandler.h deleted file mode 100644 index 50127bc..0000000 --- a/tests/libinputactions/handlers/TestPointerTriggerHandler.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include "Test.h" -#include -#include - -namespace InputActions -{ - -class TestPointerTriggerHandler : public Test -{ - Q_OBJECT - -private slots: - void init(); - - void hover_conditionNotSatisfied_triggerNotActivated(); - void hover_conditionSatisfied_triggerActivated(); - void hover_conditionNoLongerSatisfied_triggerEnded(); - void hover_conditionNoLongerSatisfiedNoMotionEvent_triggerEnded(); - -private: - std::unique_ptr m_device; -}; - -} \ No newline at end of file