Update device nodes to use direct sync

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

2 files changed, 23 insertions, 29 deletions

diff --git a/tests/auto/input/mousedevice/tst_mousedevice.cpp b/tests/auto/input/mousedevice/tst_mousedevice.cpp
index 64447d0de..2d44848ee 100644
--- a/tests/auto/input/mousedevice/tst_mousedevice.cpp
+++ b/tests/auto/input/mousedevice/tst_mousedevice.cpp
@@ -70,7 +70,7 @@ private Q_SLOTS:
         {
             // WHEN
             Qt3DInput::Input::MouseDevice backendMouseDevice;
-            simulateInitialization(&mouseDevice, &backendMouseDevice);
+            simulateInitializationSync(&mouseDevice, &backendMouseDevice);
 
             // THEN
             QCOMPARE(backendMouseDevice.isEnabled(), true);
@@ -91,7 +91,7 @@ private Q_SLOTS:
             // WHEN
             Qt3DInput::Input::MouseDevice backendMouseDevice;
             mouseDevice.setEnabled(false);
-            simulateInitialization(&mouseDevice, &backendMouseDevice);
+            simulateInitializationSync(&mouseDevice, &backendMouseDevice);
 
             // THEN
             QCOMPARE(backendMouseDevice.peerId(), mouseDevice.id());
@@ -220,15 +220,15 @@ private Q_SLOTS:
     void checkSceneChangeEvents()
     {
         // GIVEN
+        Qt3DInput::QMouseDevice mouseDevice;
         Qt3DInput::Input::MouseDevice backendMouseDevice;
+        simulateInitializationSync(&mouseDevice, &backendMouseDevice);
 
         {
             // WHEN
             const bool newValue = false;
-            const auto change = Qt3DCore::QPropertyUpdatedChangePtr::create(Qt3DCore::QNodeId());
-            change->setPropertyName("enabled");
-            change->setValue(newValue);
-            backendMouseDevice.sceneChangeEvent(change);
+            mouseDevice.setEnabled(newValue);
+            backendMouseDevice.syncFromFrontEnd(&mouseDevice, false);
 
             // THEN
             QCOMPARE(backendMouseDevice.isEnabled(), newValue);
@@ -236,10 +236,8 @@ private Q_SLOTS:
         {
             // WHEN
             const float newValue = 99.0f;
-            const auto change = Qt3DCore::QPropertyUpdatedChangePtr::create(Qt3DCore::QNodeId());
-            change->setPropertyName("sensitivity");
-            change->setValue(QVariant::fromValue(newValue));
-            backendMouseDevice.sceneChangeEvent(change);
+            mouseDevice.setSensitivity(newValue);
+            backendMouseDevice.syncFromFrontEnd(&mouseDevice, false);
 
             // THEN
             QCOMPARE(backendMouseDevice.sensitivity(), newValue);
diff --git a/tests/auto/input/qabstractphysicaldevicebackendnode/tst_qabstractphysicaldevicebackendnode.cpp b/tests/auto/input/qabstractphysicaldevicebackendnode/tst_qabstractphysicaldevicebackendnode.cpp
index 06d390859..7d9666225 100644
--- a/tests/auto/input/qabstractphysicaldevicebackendnode/tst_qabstractphysicaldevicebackendnode.cpp
+++ b/tests/auto/input/qabstractphysicaldevicebackendnode/tst_qabstractphysicaldevicebackendnode.cpp
@@ -143,7 +143,7 @@ private Q_SLOTS:
         {
             // WHEN
             TestPhysicalDeviceBackendNode backendQAbstractPhysicalDeviceBackendNode;
-            simulateInitialization(&physicalDeviceNode, &backendQAbstractPhysicalDeviceBackendNode);
+            simulateInitializationSync(&physicalDeviceNode, &backendQAbstractPhysicalDeviceBackendNode);
 
             // THEN
             QCOMPARE(backendQAbstractPhysicalDeviceBackendNode.isEnabled(), true);
@@ -153,7 +153,7 @@ private Q_SLOTS:
             // WHEN
             TestPhysicalDeviceBackendNode backendQAbstractPhysicalDeviceBackendNode;
             physicalDeviceNode.setEnabled(false);
-            simulateInitialization(&physicalDeviceNode, &backendQAbstractPhysicalDeviceBackendNode);
+            simulateInitializationSync(&physicalDeviceNode, &backendQAbstractPhysicalDeviceBackendNode);
 
             // THEN
             QCOMPARE(backendQAbstractPhysicalDeviceBackendNode.peerId(), physicalDeviceNode.id());
@@ -164,17 +164,17 @@ private Q_SLOTS:
     void checkSceneChangeEvents()
     {
         // GIVEN
+        TestDevice physicalDeviceNode;
         TestPhysicalDeviceBackendNode backendQAbstractPhysicalDeviceBackendNode;
         Qt3DInput::QInputAspect aspect;
         backendQAbstractPhysicalDeviceBackendNode.setInputAspect(&aspect);
+        simulateInitializationSync(&physicalDeviceNode, &backendQAbstractPhysicalDeviceBackendNode);
 
         {
             // WHEN
             const bool newValue = false;
-            const auto change = Qt3DCore::QPropertyUpdatedChangePtr::create(Qt3DCore::QNodeId());
-            change->setPropertyName("enabled");
-            change->setValue(newValue);
-            backendQAbstractPhysicalDeviceBackendNode.sceneChangeEvent(change);
+            physicalDeviceNode.setEnabled(newValue);
+            backendQAbstractPhysicalDeviceBackendNode.syncFromFrontEnd(&physicalDeviceNode, false);
 
             // THEN
             QCOMPARE(backendQAbstractPhysicalDeviceBackendNode.isEnabled(), newValue);
@@ -202,40 +202,36 @@ private Q_SLOTS:
             // Adding AxisSettings
             {
                 // WHEN
-                auto change = Qt3DCore::QPropertyNodeAddedChangePtr::create(Qt3DCore::QNodeId(), &settings1);
-                change->setPropertyName("axisSettings");
-                backendQAbstractPhysicalDeviceBackendNode.sceneChangeEvent(change);
+                physicalDeviceNode.addAxisSetting(&settings1);
+                backendQAbstractPhysicalDeviceBackendNode.syncFromFrontEnd(&physicalDeviceNode, false);
 
                 // THEN
                 QCOMPARE(priv->m_axisSettings.size(), 1);
 
                 // WHEN
-                change = Qt3DCore::QPropertyNodeAddedChangePtr::create(Qt3DCore::QNodeId(), &settings2);
-                change->setPropertyName("axisSettings");
-                backendQAbstractPhysicalDeviceBackendNode.sceneChangeEvent(change);
+                physicalDeviceNode.addAxisSetting(&settings2);
+                backendQAbstractPhysicalDeviceBackendNode.syncFromFrontEnd(&physicalDeviceNode, false);
 
                 // THEN
                 QCOMPARE(priv->m_axisSettings.size(), 2);
             }
+
             // Removing AxisSettings
             {
                 // WHEN
-                auto change = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), &settings1);
-                change->setPropertyName("axisSettings");
-                backendQAbstractPhysicalDeviceBackendNode.sceneChangeEvent(change);
+                physicalDeviceNode.removeAxisSetting(&settings1);
+                backendQAbstractPhysicalDeviceBackendNode.syncFromFrontEnd(&physicalDeviceNode, false);
 
                 // THEN
                 QCOMPARE(priv->m_axisSettings.size(), 1);
 
                 // WHEN
-                change = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), &settings2);
-                change->setPropertyName("axisSettings");
-                backendQAbstractPhysicalDeviceBackendNode.sceneChangeEvent(change);
+                physicalDeviceNode.removeAxisSetting(&settings2);
+                backendQAbstractPhysicalDeviceBackendNode.syncFromFrontEnd(&physicalDeviceNode, false);
 
                 // THEN
                 QCOMPARE(priv->m_axisSettings.size(), 0);
             }
-
         }
     }