Update Axis Input classes to use direct sync

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

4 files changed, 49 insertions, 69 deletions

diff --git a/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp b/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp
index 1390b6b49..48ac4b3fe 100644
--- a/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp
+++ b/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp
@@ -89,7 +89,7 @@ private Q_SLOTS:
         axisInput.setSourceDevice(&sourceDevice);
 
         // WHEN
-        simulateInitialization(&axisInput, &backendAxisInput);
+        simulateInitializationSync(&axisInput, &backendAxisInput);
 
         // THEN
         QCOMPARE(backendAxisInput.peerId(), axisInput.id());
@@ -114,7 +114,7 @@ private Q_SLOTS:
         axisInput.setSourceDevice(&sourceDevice);
 
         // WHEN
-        simulateInitialization(&axisInput, &backendAxisInput);
+        simulateInitializationSync(&axisInput, &backendAxisInput);
         backendAxisInput.cleanup();
 
         // THEN
@@ -125,23 +125,21 @@ private Q_SLOTS:
     void checkPropertyChanges()
     {
         // GIVEN
+        DummyAxisInput axisInput;
         DummyAxisInputBackend backendAxisInput;
+        simulateInitializationSync(&axisInput, &backendAxisInput);
 
         // WHEN
-        Qt3DCore::QPropertyUpdatedChangePtr updateChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId()));
-        updateChange->setPropertyName("enabled");
-        updateChange->setValue(true);
-        backendAxisInput.sceneChangeEvent(updateChange);
+        axisInput.setEnabled(false);
+        backendAxisInput.syncFromFrontEnd(&axisInput, false);
 
         // THEN
-        QCOMPARE(backendAxisInput.isEnabled(), true);
+        QCOMPARE(backendAxisInput.isEnabled(), false);
 
         // WHEN
         TestDevice device;
-        updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId());
-        updateChange->setPropertyName("sourceDevice");
-        updateChange->setValue(QVariant::fromValue(device.id()));
-        backendAxisInput.sceneChangeEvent(updateChange);
+        axisInput.setSourceDevice(&device);
+        backendAxisInput.syncFromFrontEnd(&axisInput, false);
 
         // THEN
         QCOMPARE(backendAxisInput.sourceDevice(), device.id());
diff --git a/tests/auto/input/analogaxisinput/tst_analogaxisinput.cpp b/tests/auto/input/analogaxisinput/tst_analogaxisinput.cpp
index a37c37e96..0bdaadc46 100644
--- a/tests/auto/input/analogaxisinput/tst_analogaxisinput.cpp
+++ b/tests/auto/input/analogaxisinput/tst_analogaxisinput.cpp
@@ -55,7 +55,7 @@ private Q_SLOTS:
         axisInput.setSourceDevice(&sourceDevice);
 
         // WHEN
-        simulateInitialization(&axisInput, &backendAxisInput);
+        simulateInitializationSync(&axisInput, &backendAxisInput);
 
         // THEN
         QCOMPARE(backendAxisInput.peerId(), axisInput.id());
@@ -83,7 +83,7 @@ private Q_SLOTS:
         axisInput.setSourceDevice(&sourceDevice);
 
         // WHEN
-        simulateInitialization(&axisInput, &backendAxisInput);
+        simulateInitializationSync(&axisInput, &backendAxisInput);
         backendAxisInput.cleanup();
 
         // THEN
@@ -95,32 +95,28 @@ private Q_SLOTS:
     void checkPropertyChanges()
     {
         // GIVEN
+        Qt3DInput::QAnalogAxisInput axisInput;
         Qt3DInput::Input::AnalogAxisInput backendAxisInput;
+        simulateInitializationSync(&axisInput, &backendAxisInput);
 
         // WHEN
-        Qt3DCore::QPropertyUpdatedChangePtr updateChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId()));
-        updateChange->setValue(32);
-        updateChange->setPropertyName("axis");
-        backendAxisInput.sceneChangeEvent(updateChange);
+        axisInput.setAxis(32);
+        backendAxisInput.syncFromFrontEnd(&axisInput, false);
 
         // THEN
         QCOMPARE(backendAxisInput.axis(), 32);
 
         // WHEN
-        updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId());
-        updateChange->setPropertyName("enabled");
-        updateChange->setValue(true);
-        backendAxisInput.sceneChangeEvent(updateChange);
+        axisInput.setEnabled(false);
+        backendAxisInput.syncFromFrontEnd(&axisInput, false);
 
         // THEN
-        QCOMPARE(backendAxisInput.isEnabled(), true);
+        QCOMPARE(backendAxisInput.isEnabled(), false);
 
         // WHEN
         TestDevice device;
-        updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId());
-        updateChange->setPropertyName("sourceDevice");
-        updateChange->setValue(QVariant::fromValue(device.id()));
-        backendAxisInput.sceneChangeEvent(updateChange);
+        axisInput.setSourceDevice(&device);
+        backendAxisInput.syncFromFrontEnd(&axisInput, false);
 
         // THEN
         QCOMPARE(backendAxisInput.sourceDevice(), device.id());
@@ -142,7 +138,7 @@ private Q_SLOTS:
         axisInput.setEnabled(true);
         axisInput.setAxis(2);
         axisInput.setSourceDevice(device);
-        simulateInitialization(&axisInput, &backendAxisInput);
+        simulateInitializationSync(&axisInput, &backendAxisInput);
         QCOMPARE(backendAxisInput.axis(), 2);
 
         // WHEN
@@ -176,7 +172,7 @@ private Q_SLOTS:
         axisInput.setEnabled(false);
         axisInput.setAxis(2);
         axisInput.setSourceDevice(device);
-        simulateInitialization(&axisInput, &backendAxisInput);
+        simulateInitializationSync(&axisInput, &backendAxisInput);
         QCOMPARE(backendAxisInput.axis(), 2);
 
         // WHEN
diff --git a/tests/auto/input/buttonaxisinput/tst_buttonaxisinput.cpp b/tests/auto/input/buttonaxisinput/tst_buttonaxisinput.cpp
index 18887cfe6..5debe4d99 100644
--- a/tests/auto/input/buttonaxisinput/tst_buttonaxisinput.cpp
+++ b/tests/auto/input/buttonaxisinput/tst_buttonaxisinput.cpp
@@ -58,7 +58,7 @@ private Q_SLOTS:
         axisInput.setSourceDevice(&sourceDevice);
 
         // WHEN
-        simulateInitialization(&axisInput, &backendAxisInput);
+        simulateInitializationSync(&axisInput, &backendAxisInput);
 
         // THEN
         QCOMPARE(backendAxisInput.peerId(), axisInput.id());
@@ -98,7 +98,7 @@ private Q_SLOTS:
         axisInput.setSourceDevice(&sourceDevice);
 
         // WHEN
-        simulateInitialization(&axisInput, &backendAxisInput);
+        simulateInitializationSync(&axisInput, &backendAxisInput);
         backendAxisInput.cleanup();
 
         // THEN
@@ -115,77 +115,63 @@ private Q_SLOTS:
     void checkPropertyChanges()
     {
         // GIVEN
+        Qt3DInput::QButtonAxisInput axisInput;
         Qt3DInput::Input::ButtonAxisInput backendAxisInput;
+        simulateInitializationSync(&axisInput, &backendAxisInput);
 
         // WHEN
-        Qt3DCore::QPropertyUpdatedChangePtr  updateChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId()));
-        updateChange->setValue(QVariant::fromValue(QVector<int>() << 64));
-        updateChange->setPropertyName("buttons");
-        backendAxisInput.sceneChangeEvent(updateChange);
+        axisInput.setButtons(QVector<int>() << 64);
+        backendAxisInput.syncFromFrontEnd(&axisInput, false);
 
         // THEN
         QCOMPARE(backendAxisInput.buttons(), QVector<int>() << 64);
 
         // WHEN
-        updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId());
-        updateChange->setValue(0.5f);
-        updateChange->setPropertyName("scale");
-        backendAxisInput.sceneChangeEvent(updateChange);
+        axisInput.setScale(0.5f);
+        backendAxisInput.syncFromFrontEnd(&axisInput, false);
 
         // THEN
         QCOMPARE(backendAxisInput.scale(), 0.5f);
 
         // WHEN
-        updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId());
-        updateChange->setPropertyName("enabled");
-        updateChange->setValue(true);
-        backendAxisInput.sceneChangeEvent(updateChange);
+        axisInput.setEnabled(false);
+        backendAxisInput.syncFromFrontEnd(&axisInput, false);
 
         // THEN
-        QCOMPARE(backendAxisInput.isEnabled(), true);
+        QCOMPARE(backendAxisInput.isEnabled(), false);
 
         // WHEN
         TestDevice device;
-        updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId());
-        updateChange->setPropertyName("sourceDevice");
-        updateChange->setValue(QVariant::fromValue(device.id()));
-        backendAxisInput.sceneChangeEvent(updateChange);
+        axisInput.setSourceDevice(&device);
+        backendAxisInput.syncFromFrontEnd(&axisInput, false);
 
         // THEN
         QCOMPARE(backendAxisInput.sourceDevice(), device.id());
 
         // WHEN
-        updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId());
-        updateChange->setValue(0.42f);
-        updateChange->setPropertyName("acceleration");
-        backendAxisInput.sceneChangeEvent(updateChange);
+        axisInput.setAcceleration(0.42f);
+        backendAxisInput.syncFromFrontEnd(&axisInput, false);
 
         // THEN
         QCOMPARE(backendAxisInput.acceleration(), 0.42f);
 
         // WHEN
-        updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId());
-        updateChange->setValue(-0.42f);
-        updateChange->setPropertyName("acceleration");
-        backendAxisInput.sceneChangeEvent(updateChange);
+        axisInput.setAcceleration(-0.42f);
+        backendAxisInput.syncFromFrontEnd(&axisInput, false);
 
         // THEN
         QVERIFY(qIsInf(backendAxisInput.acceleration()));
 
         // WHEN
-        updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId());
-        updateChange->setValue(0.43f);
-        updateChange->setPropertyName("deceleration");
-        backendAxisInput.sceneChangeEvent(updateChange);
+        axisInput.setDeceleration(0.43f);
+        backendAxisInput.syncFromFrontEnd(&axisInput, false);
 
         // THEN
         QCOMPARE(backendAxisInput.deceleration(), 0.43f);
 
         // WHEN
-        updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId());
-        updateChange->setValue(-0.43f);
-        updateChange->setPropertyName("deceleration");
-        backendAxisInput.sceneChangeEvent(updateChange);
+        axisInput.setDeceleration(-0.43f);
+        backendAxisInput.syncFromFrontEnd(&axisInput, false);
 
         // THEN
         QVERIFY(qIsInf(backendAxisInput.deceleration()));
@@ -210,7 +196,7 @@ private Q_SLOTS:
         axisInput.setAcceleration(0.15f);
         axisInput.setDeceleration(0.3f);
         axisInput.setSourceDevice(device);
-        simulateInitialization(&axisInput, &backendAxisInput);
+        simulateInitializationSync(&axisInput, &backendAxisInput);
         QCOMPARE(backendAxisInput.speedRatio(), 0.0f);
         QCOMPARE(backendAxisInput.lastUpdateTime(), 0);
 
@@ -311,7 +297,7 @@ private Q_SLOTS:
         axisInput.setAcceleration(0.15f);
         axisInput.setDeceleration(0.3f);
         axisInput.setSourceDevice(device);
-        simulateInitialization(&axisInput, &backendAxisInput);
+        simulateInitializationSync(&axisInput, &backendAxisInput);
         QCOMPARE(backendAxisInput.speedRatio(), 0.0f);
         QCOMPARE(backendAxisInput.lastUpdateTime(), 0);
 
diff --git a/tests/auto/input/utils/tst_utils.cpp b/tests/auto/input/utils/tst_utils.cpp
index d90034a3f..0b82bf23f 100644
--- a/tests/auto/input/utils/tst_utils.cpp
+++ b/tests/auto/input/utils/tst_utils.cpp
@@ -94,7 +94,7 @@ private Q_SLOTS:
 
         // WHEN -> Create backend AnalogAxisInput
         Qt3DInput::Input::AnalogAxisInput *backendAxisInput = handler.analogAxisInputManager()->getOrCreateResource(analogAxisInput.id());
-        simulateInitialization(&analogAxisInput, backendAxisInput);
+        simulateInitializationSync(&analogAxisInput, backendAxisInput);
 
         // THEN
         QCOMPARE(backendAxisInput->axis(), analogAxisInput.axis());
@@ -125,7 +125,7 @@ private Q_SLOTS:
 
         // WHEN -> Create backend AnalogAxisInput
         Qt3DInput::Input::AnalogAxisInput *backendAxisInput = handler.analogAxisInputManager()->getOrCreateResource(analogAxisInput.id());
-        simulateInitialization(&analogAxisInput, backendAxisInput);
+        simulateInitializationSync(&analogAxisInput, backendAxisInput);
 
         // THEN
         QCOMPARE(backendAxisInput->axis(), analogAxisInput.axis());
@@ -165,7 +165,7 @@ private Q_SLOTS:
 
         // WHEN -> Create backend AnalogAxisInput
         Qt3DInput::Input::AnalogAxisInput *backendAxisInput = handler.analogAxisInputManager()->getOrCreateResource(analogAxisInput.id());
-        simulateInitialization(&analogAxisInput, backendAxisInput);
+        simulateInitializationSync(&analogAxisInput, backendAxisInput);
 
         // THEN
         QCOMPARE(backendAxisInput->axis(), analogAxisInput.axis());
@@ -196,7 +196,7 @@ private Q_SLOTS:
 
         // WHEN -> Create backend AnalogAxisInput
         Qt3DInput::Input::AnalogAxisInput *backendAxisInput = handler.analogAxisInputManager()->getOrCreateResource(analogAxisInput.id());
-        simulateInitialization(&analogAxisInput, backendAxisInput);
+        simulateInitializationSync(&analogAxisInput, backendAxisInput);
 
         // THEN
         QCOMPARE(backendAxisInput->axis(), analogAxisInput.axis());