From 812bc78ce4b88f612b0d4880723547fe09181f93 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Mon, 30 Sep 2019 10:54:50 +0100 Subject: Update input action classes to use direct sync Change-Id: I6126a9b51e5d681ad312bf1df5ca694c6d712294 Reviewed-by: Paul Lemire --- tests/auto/input/actioninput/tst_actioninput.cpp | 30 +++++----- tests/auto/input/inputchord/tst_inputchord.cpp | 48 ++++++++-------- .../auto/input/inputsequence/tst_inputsequence.cpp | 66 ++++++++++------------ 3 files changed, 65 insertions(+), 79 deletions(-) (limited to 'tests') diff --git a/tests/auto/input/actioninput/tst_actioninput.cpp b/tests/auto/input/actioninput/tst_actioninput.cpp index 23dfaad64..e5321c6f2 100644 --- a/tests/auto/input/actioninput/tst_actioninput.cpp +++ b/tests/auto/input/actioninput/tst_actioninput.cpp @@ -50,7 +50,7 @@ private Q_SLOTS: actionInput.setSourceDevice(&sourceDevice); // WHEN - simulateInitialization(&actionInput, &backendActionInput); + simulateInitializationSync(&actionInput, &backendActionInput); // THEN QCOMPARE(backendActionInput.peerId(), actionInput.id()); @@ -78,7 +78,7 @@ private Q_SLOTS: actionInput.setSourceDevice(&sourceDevice); // WHEN - simulateInitialization(&actionInput, &backendActionInput); + simulateInitializationSync(&actionInput, &backendActionInput); backendActionInput.cleanup(); // THEN @@ -90,32 +90,28 @@ private Q_SLOTS: void shouldHandlePropertyChanges() { // GIVEN + Qt3DInput::QActionInput actionInput; Qt3DInput::Input::ActionInput backendActionInput; + simulateInitializationSync(&actionInput, &backendActionInput); // WHEN - Qt3DCore::QPropertyUpdatedChangePtr updateChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId())); - updateChange->setValue(QVariant::fromValue(QVector() << 64)); - updateChange->setPropertyName("buttons"); - backendActionInput.sceneChangeEvent(updateChange); + actionInput.setButtons(QVector() << 64); + backendActionInput.syncFromFrontEnd(&actionInput, false); // THEN QCOMPARE(backendActionInput.buttons(), QVector() << 64); // WHEN - updateChange = QSharedPointer::create(Qt3DCore::QNodeId()); - updateChange->setPropertyName("enabled"); - updateChange->setValue(true); - backendActionInput.sceneChangeEvent(updateChange); + actionInput.setEnabled(false); + backendActionInput.syncFromFrontEnd(&actionInput, false); // THEN - QCOMPARE(backendActionInput.isEnabled(), true); + QCOMPARE(backendActionInput.isEnabled(), false); // WHEN TestDevice device; - updateChange = QSharedPointer::create(Qt3DCore::QNodeId()); - updateChange->setPropertyName("sourceDevice"); - updateChange->setValue(QVariant::fromValue(device.id())); - backendActionInput.sceneChangeEvent(updateChange); + actionInput.setSourceDevice(&device); + backendActionInput.syncFromFrontEnd(&actionInput, false); // THEN QCOMPARE(backendActionInput.sourceDevice(), device.id()); @@ -135,7 +131,7 @@ private Q_SLOTS: actionInput.setEnabled(true); actionInput.setButtons(QVector() << Qt::Key_Space << Qt::Key_Return); actionInput.setSourceDevice(device); - simulateInitialization(&actionInput, &backendActionInput); + simulateInitializationSync(&actionInput, &backendActionInput); // WHEN deviceBackend->setButtonPressed(Qt::Key_Up, true); @@ -188,7 +184,7 @@ private Q_SLOTS: actionInput.setEnabled(false); actionInput.setButtons(QVector() << Qt::Key_Space << Qt::Key_Return); actionInput.setSourceDevice(device); - simulateInitialization(&actionInput, &backendActionInput); + simulateInitializationSync(&actionInput, &backendActionInput); // WHEN deviceBackend->setButtonPressed(Qt::Key_Space, true); diff --git a/tests/auto/input/inputchord/tst_inputchord.cpp b/tests/auto/input/inputchord/tst_inputchord.cpp index 093bd29f7..afc324a9d 100644 --- a/tests/auto/input/inputchord/tst_inputchord.cpp +++ b/tests/auto/input/inputchord/tst_inputchord.cpp @@ -55,7 +55,7 @@ private Q_SLOTS: inputChord.addChord(&actionInput); // WHEN - simulateInitialization(&inputChord, &backendInputChord); + simulateInitializationSync(&inputChord, &backendInputChord); // THEN QCOMPARE(backendInputChord.peerId(), inputChord.id()); @@ -89,7 +89,7 @@ private Q_SLOTS: inputChord.addChord(&actionInput); // WHEN - simulateInitialization(&inputChord, &backendInputChord); + simulateInitializationSync(&inputChord, &backendInputChord); backendInputChord.cleanup(); // THEN @@ -101,41 +101,37 @@ private Q_SLOTS: void shouldHandlePropertyChanges() { // GIVEN + Qt3DInput::QInputChord inputChord; Qt3DInput::Input::InputChord backendInputChord; + simulateInitializationSync(&inputChord, &backendInputChord); // WHEN - Qt3DCore::QPropertyUpdatedChangePtr updateChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId())); - updateChange->setValue(250); - updateChange->setPropertyName("timeout"); - backendInputChord.sceneChangeEvent(updateChange); + inputChord.setTimeout(250); + backendInputChord.syncFromFrontEnd(&inputChord, false); // THEN QCOMPARE(backendInputChord.timeout(), 250000000); // WHEN - updateChange = QSharedPointer::create(Qt3DCore::QNodeId()); - updateChange->setPropertyName("enabled"); - updateChange->setValue(true); - backendInputChord.sceneChangeEvent(updateChange); + inputChord.setEnabled(false); + backendInputChord.syncFromFrontEnd(&inputChord, false); // THEN - QCOMPARE(backendInputChord.isEnabled(), true); + QCOMPARE(backendInputChord.isEnabled(), false); // WHEN Qt3DInput::QActionInput input; const Qt3DCore::QNodeId inputId = input.id(); - const auto nodeAddedChange = Qt3DCore::QPropertyNodeAddedChangePtr::create(Qt3DCore::QNodeId(), &input); - nodeAddedChange->setPropertyName("chord"); - backendInputChord.sceneChangeEvent(nodeAddedChange); + inputChord.addChord(&input); + backendInputChord.syncFromFrontEnd(&inputChord, false); // THEN QCOMPARE(backendInputChord.chords().size(), 1); QCOMPARE(backendInputChord.chords().first(), inputId); // WHEN - const auto nodeRemovedChange = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), &input); - nodeRemovedChange->setPropertyName("chord"); - backendInputChord.sceneChangeEvent(nodeRemovedChange); + inputChord.removeChord(&input); + backendInputChord.syncFromFrontEnd(&inputChord, false); // THEN QCOMPARE(backendInputChord.chords().size(), 0); @@ -154,13 +150,13 @@ private Q_SLOTS: firstInput->setButtons(QVector() << Qt::Key_Q << Qt::Key_W); firstInput->setSourceDevice(device); auto backendFirstInput = handler.actionInputManager()->getOrCreateResource(firstInput->id()); - simulateInitialization(firstInput, backendFirstInput); + simulateInitializationSync(firstInput, backendFirstInput); auto secondInput = new Qt3DInput::QActionInput; secondInput->setButtons(QVector() << Qt::Key_A << Qt::Key_S); secondInput->setSourceDevice(device); auto backendSecondInput = handler.actionInputManager()->getOrCreateResource(secondInput->id()); - simulateInitialization(secondInput, backendSecondInput); + simulateInitializationSync(secondInput, backendSecondInput); Qt3DInput::Input::InputChord backendInputChord; Qt3DInput::QInputChord inputChord; @@ -168,7 +164,7 @@ private Q_SLOTS: inputChord.setTimeout(300); inputChord.addChord(firstInput); inputChord.addChord(secondInput); - simulateInitialization(&inputChord, &backendInputChord); + simulateInitializationSync(&inputChord, &backendInputChord); // WHEN deviceBackend->setButtonPressed(Qt::Key_Up, true); @@ -242,13 +238,13 @@ private Q_SLOTS: firstInput->setButtons(QVector() << Qt::Key_Q); firstInput->setSourceDevice(device); auto backendFirstInput = handler.actionInputManager()->getOrCreateResource(firstInput->id()); - simulateInitialization(firstInput, backendFirstInput); + simulateInitializationSync(firstInput, backendFirstInput); auto secondInput = new Qt3DInput::QActionInput; secondInput->setButtons(QVector() << Qt::Key_W); secondInput->setSourceDevice(device); auto backendSecondInput = handler.actionInputManager()->getOrCreateResource(secondInput->id()); - simulateInitialization(secondInput, backendSecondInput); + simulateInitializationSync(secondInput, backendSecondInput); Qt3DInput::Input::InputChord backendInputChord; Qt3DInput::QInputChord inputChord; @@ -256,7 +252,7 @@ private Q_SLOTS: inputChord.setTimeout(300); inputChord.addChord(firstInput); inputChord.addChord(secondInput); - simulateInitialization(&inputChord, &backendInputChord); + simulateInitializationSync(&inputChord, &backendInputChord); // WHEN deviceBackend->setButtonPressed(Qt::Key_Q, true); @@ -290,13 +286,13 @@ private Q_SLOTS: firstInput->setButtons(QVector() << Qt::Key_Q); firstInput->setSourceDevice(device); auto backendFirstInput = handler.actionInputManager()->getOrCreateResource(firstInput->id()); - simulateInitialization(firstInput, backendFirstInput); + simulateInitializationSync(firstInput, backendFirstInput); auto secondInput = new Qt3DInput::QActionInput; secondInput->setButtons(QVector() << Qt::Key_W); secondInput->setSourceDevice(device); auto backendSecondInput = handler.actionInputManager()->getOrCreateResource(secondInput->id()); - simulateInitialization(secondInput, backendSecondInput); + simulateInitializationSync(secondInput, backendSecondInput); Qt3DInput::Input::InputChord backendInputChord; Qt3DInput::QInputChord inputChord; @@ -304,7 +300,7 @@ private Q_SLOTS: inputChord.setTimeout(300); inputChord.addChord(firstInput); inputChord.addChord(secondInput); - simulateInitialization(&inputChord, &backendInputChord); + simulateInitializationSync(&inputChord, &backendInputChord); // WHEN deviceBackend->setButtonPressed(Qt::Key_Q, true); diff --git a/tests/auto/input/inputsequence/tst_inputsequence.cpp b/tests/auto/input/inputsequence/tst_inputsequence.cpp index b5630ddb5..d8af3d6f6 100644 --- a/tests/auto/input/inputsequence/tst_inputsequence.cpp +++ b/tests/auto/input/inputsequence/tst_inputsequence.cpp @@ -56,7 +56,7 @@ private Q_SLOTS: inputSequence.addSequence(&actionInput); // WHEN - simulateInitialization(&inputSequence, &backendInputSequence); + simulateInitializationSync(&inputSequence, &backendInputSequence); // THEN QCOMPARE(backendInputSequence.peerId(), inputSequence.id()); @@ -93,7 +93,7 @@ private Q_SLOTS: inputSequence.addSequence(&actionInput); // WHEN - simulateInitialization(&inputSequence, &backendInputSequence); + simulateInitializationSync(&inputSequence, &backendInputSequence); backendInputSequence.cleanup(); // THEN @@ -106,50 +106,44 @@ private Q_SLOTS: void shouldHandlePropertyChanges() { // GIVEN + Qt3DInput::QInputSequence inputSequence; Qt3DInput::Input::InputSequence backendInputSequence; + simulateInitializationSync(&inputSequence, &backendInputSequence); // WHEN - Qt3DCore::QPropertyUpdatedChangePtr updateChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId())); - updateChange->setValue(250); - updateChange->setPropertyName("timeout"); - backendInputSequence.sceneChangeEvent(updateChange); + inputSequence.setTimeout(250); + backendInputSequence.syncFromFrontEnd(&inputSequence, false); // THEN QCOMPARE(backendInputSequence.timeout(), 250000000); // WHEN - updateChange = QSharedPointer::create(Qt3DCore::QNodeId()); - updateChange->setValue(150); - updateChange->setPropertyName("buttonInterval"); - backendInputSequence.sceneChangeEvent(updateChange); + inputSequence.setButtonInterval(150); + backendInputSequence.syncFromFrontEnd(&inputSequence, false); // THEN QCOMPARE(backendInputSequence.buttonInterval(), 150000000); // WHEN - updateChange = QSharedPointer::create(Qt3DCore::QNodeId()); - updateChange->setPropertyName("enabled"); - updateChange->setValue(true); - backendInputSequence.sceneChangeEvent(updateChange); + inputSequence.setEnabled(false); + backendInputSequence.syncFromFrontEnd(&inputSequence, false); // THEN - QCOMPARE(backendInputSequence.isEnabled(), true); + QCOMPARE(backendInputSequence.isEnabled(), false); // WHEN Qt3DInput::QActionInput input; const Qt3DCore::QNodeId inputId = input.id(); - const auto nodeAddedChange = Qt3DCore::QPropertyNodeAddedChangePtr::create(Qt3DCore::QNodeId(), &input); - nodeAddedChange->setPropertyName("sequence"); - backendInputSequence.sceneChangeEvent(nodeAddedChange); + inputSequence.addSequence(&input); + backendInputSequence.syncFromFrontEnd(&inputSequence, false); // THEN QCOMPARE(backendInputSequence.sequences().size(), 1); QCOMPARE(backendInputSequence.sequences().first(), inputId); // WHEN - const auto nodeRemovedChange = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), &input); - nodeRemovedChange->setPropertyName("sequence"); - backendInputSequence.sceneChangeEvent(nodeRemovedChange); + inputSequence.removeSequence(&input); + backendInputSequence.syncFromFrontEnd(&inputSequence, false); // THEN QCOMPARE(backendInputSequence.sequences().size(), 0); @@ -168,19 +162,19 @@ private Q_SLOTS: firstInput->setButtons(QVector() << Qt::Key_Q << Qt::Key_A); firstInput->setSourceDevice(device); auto backendFirstInput = handler.actionInputManager()->getOrCreateResource(firstInput->id()); - simulateInitialization(firstInput, backendFirstInput); + simulateInitializationSync(firstInput, backendFirstInput); auto secondInput = new Qt3DInput::QActionInput; secondInput->setButtons(QVector() << Qt::Key_S << Qt::Key_W); secondInput->setSourceDevice(device); auto backendSecondInput = handler.actionInputManager()->getOrCreateResource(secondInput->id()); - simulateInitialization(secondInput, backendSecondInput); + simulateInitializationSync(secondInput, backendSecondInput); auto thirdInput = new Qt3DInput::QActionInput; thirdInput->setButtons(QVector() << Qt::Key_D << Qt::Key_E); thirdInput->setSourceDevice(device); auto backendThirdInput = handler.actionInputManager()->getOrCreateResource(thirdInput->id()); - simulateInitialization(thirdInput, backendThirdInput); + simulateInitializationSync(thirdInput, backendThirdInput); Qt3DInput::Input::InputSequence backendInputSequence; Qt3DInput::QInputSequence inputSequence; @@ -190,7 +184,7 @@ private Q_SLOTS: inputSequence.addSequence(firstInput); inputSequence.addSequence(secondInput); inputSequence.addSequence(thirdInput); - simulateInitialization(&inputSequence, &backendInputSequence); + simulateInitializationSync(&inputSequence, &backendInputSequence); // WHEN deviceBackend->setButtonPressed(Qt::Key_Up, true); @@ -294,19 +288,19 @@ private Q_SLOTS: firstInput->setButtons(QVector() << Qt::Key_Q << Qt::Key_A); firstInput->setSourceDevice(device); auto backendFirstInput = handler.actionInputManager()->getOrCreateResource(firstInput->id()); - simulateInitialization(firstInput, backendFirstInput); + simulateInitializationSync(firstInput, backendFirstInput); auto secondInput = new Qt3DInput::QActionInput; secondInput->setButtons(QVector() << Qt::Key_S << Qt::Key_W); secondInput->setSourceDevice(device); auto backendSecondInput = handler.actionInputManager()->getOrCreateResource(secondInput->id()); - simulateInitialization(secondInput, backendSecondInput); + simulateInitializationSync(secondInput, backendSecondInput); auto thirdInput = new Qt3DInput::QActionInput; thirdInput->setButtons(QVector() << Qt::Key_D << Qt::Key_E); thirdInput->setSourceDevice(device); auto backendThirdInput = handler.actionInputManager()->getOrCreateResource(thirdInput->id()); - simulateInitialization(thirdInput, backendThirdInput); + simulateInitializationSync(thirdInput, backendThirdInput); Qt3DInput::Input::InputSequence backendInputSequence; Qt3DInput::QInputSequence inputSequence; @@ -316,7 +310,7 @@ private Q_SLOTS: inputSequence.addSequence(firstInput); inputSequence.addSequence(secondInput); inputSequence.addSequence(thirdInput); - simulateInitialization(&inputSequence, &backendInputSequence); + simulateInitializationSync(&inputSequence, &backendInputSequence); // WHEN deviceBackend->setButtonPressed(Qt::Key_Q, true); @@ -352,19 +346,19 @@ private Q_SLOTS: firstInput->setButtons(QVector() << Qt::Key_Q << Qt::Key_A); firstInput->setSourceDevice(device); auto backendFirstInput = handler.actionInputManager()->getOrCreateResource(firstInput->id()); - simulateInitialization(firstInput, backendFirstInput); + simulateInitializationSync(firstInput, backendFirstInput); auto secondInput = new Qt3DInput::QActionInput; secondInput->setButtons(QVector() << Qt::Key_S << Qt::Key_W); secondInput->setSourceDevice(device); auto backendSecondInput = handler.actionInputManager()->getOrCreateResource(secondInput->id()); - simulateInitialization(secondInput, backendSecondInput); + simulateInitializationSync(secondInput, backendSecondInput); auto thirdInput = new Qt3DInput::QActionInput; thirdInput->setButtons(QVector() << Qt::Key_D << Qt::Key_E); thirdInput->setSourceDevice(device); auto backendThirdInput = handler.actionInputManager()->getOrCreateResource(thirdInput->id()); - simulateInitialization(thirdInput, backendThirdInput); + simulateInitializationSync(thirdInput, backendThirdInput); Qt3DInput::Input::InputSequence backendInputSequence; Qt3DInput::QInputSequence inputSequence; @@ -374,7 +368,7 @@ private Q_SLOTS: inputSequence.addSequence(firstInput); inputSequence.addSequence(secondInput); inputSequence.addSequence(thirdInput); - simulateInitialization(&inputSequence, &backendInputSequence); + simulateInitializationSync(&inputSequence, &backendInputSequence); // WHEN deviceBackend->setButtonPressed(Qt::Key_Q, true); @@ -410,13 +404,13 @@ private Q_SLOTS: firstInput->setButtons(QVector() << Qt::Key_Q); firstInput->setSourceDevice(device); auto backendFirstInput = handler.actionInputManager()->getOrCreateResource(firstInput->id()); - simulateInitialization(firstInput, backendFirstInput); + simulateInitializationSync(firstInput, backendFirstInput); auto secondInput = new Qt3DInput::QActionInput; secondInput->setButtons(QVector() << Qt::Key_S); secondInput->setSourceDevice(device); auto backendSecondInput = handler.actionInputManager()->getOrCreateResource(secondInput->id()); - simulateInitialization(secondInput, backendSecondInput); + simulateInitializationSync(secondInput, backendSecondInput); Qt3DInput::Input::InputSequence backendInputSequence; Qt3DInput::QInputSequence inputSequence; @@ -425,7 +419,7 @@ private Q_SLOTS: inputSequence.setTimeout(450); inputSequence.addSequence(firstInput); inputSequence.addSequence(secondInput); - simulateInitialization(&inputSequence, &backendInputSequence); + simulateInitializationSync(&inputSequence, &backendInputSequence); // WHEN deviceBackend->setButtonPressed(Qt::Key_Q, true); -- cgit v1.2.3