Update QLogicalDevice to use direct sync

Change-Id: I6e176c19ceda3ca1c0bf03da4d78fe92ec3344a7
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

2 files changed, 38 insertions, 55 deletions

diff --git a/tests/auto/input/logicaldevice/tst_logicaldevice.cpp b/tests/auto/input/logicaldevice/tst_logicaldevice.cpp
index 58c8c7fcb..8dbe24762 100644
--- a/tests/auto/input/logicaldevice/tst_logicaldevice.cpp
+++ b/tests/auto/input/logicaldevice/tst_logicaldevice.cpp
@@ -59,24 +59,19 @@ private Q_SLOTS:
     void checkCleanupState()
     {
         // GIVEN
+        Qt3DInput::QLogicalDevice logicalDevice;
         Qt3DInput::Input::LogicalDevice backendLogicalDevice;
+        simulateInitializationSync(&logicalDevice, &backendLogicalDevice);
 
         // WHEN
         backendLogicalDevice.setEnabled(true);
 
         // WHEN
-        {
-            Qt3DInput::QAxis newValue;
-            const auto change = Qt3DCore::QPropertyNodeAddedChangePtr::create(Qt3DCore::QNodeId(), &newValue);
-            change->setPropertyName("axis");
-            backendLogicalDevice.sceneChangeEvent(change);
-        }
-        {
-            Qt3DInput::QAction newValue;
-            const auto change = Qt3DCore::QPropertyNodeAddedChangePtr::create(Qt3DCore::QNodeId(), &newValue);
-            change->setPropertyName("action");
-            backendLogicalDevice.sceneChangeEvent(change);
-        }
+        Qt3DInput::QAxis newAxisValue;
+        Qt3DInput::QAction newActionValue;
+        logicalDevice.addAxis(&newAxisValue);
+        logicalDevice.addAction(&newActionValue);
+        backendLogicalDevice.syncFromFrontEnd(&logicalDevice, false);
 
         // THEN
         QCOMPARE(backendLogicalDevice.axes().size(), 1);
@@ -104,7 +99,7 @@ private Q_SLOTS:
         {
             // WHEN
             Qt3DInput::Input::LogicalDevice backendLogicalDevice;
-            simulateInitialization(&logicalDevice, &backendLogicalDevice);
+            simulateInitializationSync(&logicalDevice, &backendLogicalDevice);
 
             // THEN
             QCOMPARE(backendLogicalDevice.isEnabled(), true);
@@ -118,7 +113,7 @@ private Q_SLOTS:
             // WHEN
             Qt3DInput::Input::LogicalDevice backendLogicalDevice;
             logicalDevice.setEnabled(false);
-            simulateInitialization(&logicalDevice, &backendLogicalDevice);
+            simulateInitializationSync(&logicalDevice, &backendLogicalDevice);
 
             // THEN
             QCOMPARE(backendLogicalDevice.isEnabled(), false);
@@ -128,15 +123,15 @@ private Q_SLOTS:
     void checkSceneChangeEvents()
     {
         // GIVEN
+        Qt3DInput::QLogicalDevice logicalDevice;
         Qt3DInput::Input::LogicalDevice backendLogicalDevice;
+        simulateInitializationSync(&logicalDevice, &backendLogicalDevice);
 
         {
             // WHEN
             const bool newValue = false;
-            const auto change = Qt3DCore::QPropertyUpdatedChangePtr::create(Qt3DCore::QNodeId());
-            change->setPropertyName("enabled");
-            change->setValue(newValue);
-            backendLogicalDevice.sceneChangeEvent(change);
+            logicalDevice.setEnabled(newValue);
+            backendLogicalDevice.syncFromFrontEnd(&logicalDevice, false);
 
             // THEN
             QCOMPARE(backendLogicalDevice.isEnabled(), newValue);
@@ -144,18 +139,16 @@ private Q_SLOTS:
         {
             // WHEN
             Qt3DInput::QAxis newValue;
-            const auto change = Qt3DCore::QPropertyNodeAddedChangePtr::create(Qt3DCore::QNodeId(), &newValue);
-            change->setPropertyName("axis");
-            backendLogicalDevice.sceneChangeEvent(change);
+            logicalDevice.addAxis(&newValue);
+            backendLogicalDevice.syncFromFrontEnd(&logicalDevice, false);
 
             // THEN
             QCOMPARE(backendLogicalDevice.axes().size(), 1);
             QCOMPARE(backendLogicalDevice.axes().first(), newValue.id());
 
             // WHEN
-            const auto change2 = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), &newValue);
-            change2->setPropertyName("axis");
-            backendLogicalDevice.sceneChangeEvent(change2);
+            logicalDevice.removeAxis(&newValue);
+            backendLogicalDevice.syncFromFrontEnd(&logicalDevice, false);
 
             // THEN
             QCOMPARE(backendLogicalDevice.axes().size(), 0);
@@ -163,18 +156,16 @@ private Q_SLOTS:
         {
             // WHEN
             Qt3DInput::QAction newValue;
-            const auto change = Qt3DCore::QPropertyNodeAddedChangePtr::create(Qt3DCore::QNodeId(), &newValue);
-            change->setPropertyName("action");
-            backendLogicalDevice.sceneChangeEvent(change);
+            logicalDevice.addAction(&newValue);
+            backendLogicalDevice.syncFromFrontEnd(&logicalDevice, false);
 
             // THEN
             QCOMPARE(backendLogicalDevice.actions().size(), 1);
             QCOMPARE(backendLogicalDevice.actions().first(), newValue.id());
 
             // WHEN
-            const auto change2 = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), &newValue);
-            change2->setPropertyName("action");
-            backendLogicalDevice.sceneChangeEvent(change2);
+            logicalDevice.removeAction(&newValue);
+            backendLogicalDevice.syncFromFrontEnd(&logicalDevice, false);
 
             // THEN
             QCOMPARE(backendLogicalDevice.actions().size(), 0);
diff --git a/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp b/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp
index f81fcee41..5baef08fa 100644
--- a/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp
+++ b/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp
@@ -122,56 +122,48 @@ private Q_SLOTS:
         QCoreApplication::processEvents();
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 1);
-        Qt3DCore::QPropertyNodeAddedChangePtr nodeAddedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeAddedChange>();
-        QCOMPARE(nodeAddedChange->propertyName(), "action");
-        QCOMPARE(nodeAddedChange->addedNodeId(), action->id());
-        QCOMPARE(nodeAddedChange->type(), Qt3DCore::PropertyValueAdded);
+        QCOMPARE(arbiter.events.size(), 0);
+        QCOMPARE(arbiter.dirtyNodes.size(), 1);
+        QCOMPARE(arbiter.dirtyNodes.front(), logicalDevice.data());
 
-        arbiter.events.clear();
+        arbiter.dirtyNodes.clear();
 
         // WHEN
         logicalDevice->removeAction(action);
         QCoreApplication::processEvents();
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 1);
-        Qt3DCore::QPropertyNodeRemovedChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>();
-        QCOMPARE(nodeRemovedChange->propertyName(), "action");
-        QCOMPARE(nodeRemovedChange->removedNodeId(), action->id());
-        QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved);
+        QCOMPARE(arbiter.events.size(), 0);
+        QCOMPARE(arbiter.dirtyNodes.size(), 1);
+        QCOMPARE(arbiter.dirtyNodes.front(), logicalDevice.data());
 
-        arbiter.events.clear();
+        arbiter.dirtyNodes.clear();
 
         // WHEN
         Qt3DInput::QAxis *axis = new Qt3DInput::QAxis(logicalDevice.data());
         QCoreApplication::processEvents();
-        arbiter.events.clear();
+        arbiter.dirtyNodes.clear();
 
         logicalDevice->addAxis(axis);
         QCoreApplication::processEvents();
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 1);
-        nodeAddedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeAddedChange>();
-        QCOMPARE(nodeAddedChange->propertyName(), "axis");
-        QCOMPARE(nodeAddedChange->addedNodeId(), axis->id());
-        QCOMPARE(nodeAddedChange->type(), Qt3DCore::PropertyValueAdded);
+        QCOMPARE(arbiter.events.size(), 0);
+        QCOMPARE(arbiter.dirtyNodes.size(), 1);
+        QCOMPARE(arbiter.dirtyNodes.front(), logicalDevice.data());
 
-        arbiter.events.clear();
+        arbiter.dirtyNodes.clear();
 
         // WHEN
         logicalDevice->removeAxis(axis);
         QCoreApplication::processEvents();
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 1);
-        nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>();
-        QCOMPARE(nodeRemovedChange->propertyName(), "axis");
-        QCOMPARE(nodeRemovedChange->removedNodeId(), axis->id());
-        QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved);
+        QCOMPARE(arbiter.events.size(), 0);
+        QCOMPARE(arbiter.dirtyNodes.size(), 1);
+        QCOMPARE(arbiter.dirtyNodes.front(), logicalDevice.data());
 
-        arbiter.events.clear();
+        arbiter.dirtyNodes.clear();
     }
 
     void checkAxisBookkeeping()