Split QAnalogAxisInput out of QAxisInput

The axis property of QAxisInput goes there.

Change-Id: Ie226de652848909fc6e3a425612d877ef18b35f3
Task-number: QTBUG-51474
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

9 files changed, 297 insertions, 73 deletions

diff --git a/tests/auto/input/analogaxisinput/analogaxisinput.pro b/tests/auto/input/analogaxisinput/analogaxisinput.pro
new file mode 100644
index 000000000..7bd0a9865
--- /dev/null
+++ b/tests/auto/input/analogaxisinput/analogaxisinput.pro
@@ -0,0 +1,12 @@
+TEMPLATE = app
+
+TARGET = tst_analogaxisinput
+
+QT += core-private 3dcore 3dcore-private 3dinput 3dinput-private testlib
+
+CONFIG += testcase
+
+SOURCES += tst_analogaxisinput.cpp
+
+include(../../core/common/common.pri)
+include(../commons/commons.pri)
diff --git a/tests/auto/input/analogaxisinput/tst_analogaxisinput.cpp b/tests/auto/input/analogaxisinput/tst_analogaxisinput.cpp
new file mode 100644
index 000000000..99110116c
--- /dev/null
+++ b/tests/auto/input/analogaxisinput/tst_analogaxisinput.cpp
@@ -0,0 +1,131 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QTest>
+#include <qbackendnodetester.h>
+#include <Qt3DCore/private/qnode_p.h>
+#include <Qt3DCore/private/qscene_p.h>
+#include <Qt3DCore/qnodepropertychange.h>
+#include <Qt3DInput/private/analogaxisinput_p.h>
+#include <Qt3DInput/QAnalogAxisInput>
+#include <Qt3DCore/qnodepropertychange.h>
+#include "testdevice.h"
+
+class tst_AnalogAxisInput: public Qt3DCore::QBackendNodeTester
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+
+    void checkPeerPropertyMirroring()
+    {
+        // GIVEN
+        Qt3DInput::Input::AnalogAxisInput backendAxisInput;
+        Qt3DInput::QAnalogAxisInput axisInput;
+        TestDevice sourceDevice;
+
+        axisInput.setAxis(327);
+        axisInput.setSourceDevice(&sourceDevice);
+
+        // WHEN
+        simulateInitialization(&axisInput, &backendAxisInput);
+
+        // THEN
+        QCOMPARE(backendAxisInput.peerId(), axisInput.id());
+        QCOMPARE(backendAxisInput.isEnabled(), axisInput.isEnabled());
+        QCOMPARE(backendAxisInput.axis(), axisInput.axis());
+        QCOMPARE(backendAxisInput.sourceDevice(), sourceDevice.id());
+    }
+
+    void checkInitialAndCleanedUpState()
+    {
+        // GIVEN
+        Qt3DInput::Input::AnalogAxisInput backendAxisInput;
+
+        // THEN
+        QVERIFY(backendAxisInput.peerId().isNull());
+        QCOMPARE(backendAxisInput.axis(), 0);
+        QCOMPARE(backendAxisInput.isEnabled(), false);
+        QCOMPARE(backendAxisInput.sourceDevice(), Qt3DCore::QNodeId());
+
+        // GIVEN
+        Qt3DInput::QAnalogAxisInput axisInput;
+        TestDevice sourceDevice;
+
+        axisInput.setAxis(327);
+        axisInput.setSourceDevice(&sourceDevice);
+
+        // WHEN
+        backendAxisInput.updateFromPeer(&axisInput);
+        backendAxisInput.cleanup();
+
+        // THEN
+        QVERIFY(backendAxisInput.peerId().isNull());
+        QCOMPARE(backendAxisInput.axis(), 0);
+        QCOMPARE(backendAxisInput.isEnabled(), false);
+        QCOMPARE(backendAxisInput.sourceDevice(), Qt3DCore::QNodeId());
+    }
+
+    void checkPropertyChanges()
+    {
+        // GIVEN
+        Qt3DInput::Input::AnalogAxisInput backendAxisInput;
+
+        // WHEN
+        Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
+        updateChange->setValue(32);
+        updateChange->setPropertyName("axis");
+        backendAxisInput.sceneChangeEvent(updateChange);
+
+        // THEN
+        QCOMPARE(backendAxisInput.axis(), 32);
+
+        // WHEN
+        updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
+        updateChange->setPropertyName("enabled");
+        updateChange->setValue(true);
+        backendAxisInput.sceneChangeEvent(updateChange);
+
+        // THEN
+        QCOMPARE(backendAxisInput.isEnabled(), true);
+
+        // WHEN
+        TestDevice device;
+        updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
+        updateChange->setPropertyName("sourceDevice");
+        updateChange->setValue(QVariant::fromValue(device.id()));
+        backendAxisInput.sceneChangeEvent(updateChange);
+
+        // THEN
+        QCOMPARE(backendAxisInput.sourceDevice(), device.id());
+    }
+};
+
+QTEST_APPLESS_MAIN(tst_AnalogAxisInput)
+
+#include "tst_analogaxisinput.moc"
diff --git a/tests/auto/input/axisinput/tst_axisinput.cpp b/tests/auto/input/axisinput/tst_axisinput.cpp
index 011d7d2fc..06edd031a 100644
--- a/tests/auto/input/axisinput/tst_axisinput.cpp
+++ b/tests/auto/input/axisinput/tst_axisinput.cpp
@@ -49,7 +49,6 @@ private Q_SLOTS:
         Qt3DInput::QAxisInput axisInput;
         TestDevice sourceDevice;
 
-        axisInput.setAxis(327);
         axisInput.setSourceDevice(&sourceDevice);
 
         // WHEN
@@ -58,7 +57,6 @@ private Q_SLOTS:
         // THEN
         QCOMPARE(backendAxisInput.peerId(), axisInput.id());
         QCOMPARE(backendAxisInput.isEnabled(), axisInput.isEnabled());
-        QCOMPARE(backendAxisInput.axis(), axisInput.axis());
         QCOMPARE(backendAxisInput.sourceDevice(), sourceDevice.id());
     }
 
@@ -69,7 +67,6 @@ private Q_SLOTS:
 
         // THEN
         QVERIFY(backendAxisInput.peerId().isNull());
-        QCOMPARE(backendAxisInput.axis(), 0);
         QCOMPARE(backendAxisInput.isEnabled(), false);
         QCOMPARE(backendAxisInput.sourceDevice(), Qt3DCore::QNodeId());
 
@@ -77,7 +74,6 @@ private Q_SLOTS:
         Qt3DInput::QAxisInput axisInput;
         TestDevice sourceDevice;
 
-        axisInput.setAxis(327);
         axisInput.setSourceDevice(&sourceDevice);
 
         // WHEN
@@ -86,7 +82,6 @@ private Q_SLOTS:
 
         // THEN
         QVERIFY(backendAxisInput.peerId().isNull());
-        QCOMPARE(backendAxisInput.axis(), 0);
         QCOMPARE(backendAxisInput.isEnabled(), false);
         QCOMPARE(backendAxisInput.sourceDevice(), Qt3DCore::QNodeId());
     }
@@ -98,15 +93,6 @@ private Q_SLOTS:
 
         // WHEN
         Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
-        updateChange->setValue(32);
-        updateChange->setPropertyName("axis");
-        backendAxisInput.sceneChangeEvent(updateChange);
-
-        // THEN
-        QCOMPARE(backendAxisInput.axis(), 32);
-
-        // WHEN
-        updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setPropertyName("enabled");
         updateChange->setValue(true);
         backendAxisInput.sceneChangeEvent(updateChange);
diff --git a/tests/auto/input/buttonaxisinput/tst_buttonaxisinput.cpp b/tests/auto/input/buttonaxisinput/tst_buttonaxisinput.cpp
index ede60e134..9f278bbbe 100644
--- a/tests/auto/input/buttonaxisinput/tst_buttonaxisinput.cpp
+++ b/tests/auto/input/buttonaxisinput/tst_buttonaxisinput.cpp
@@ -62,7 +62,6 @@ private Q_SLOTS:
         TestDevice sourceDevice;
 
         axisInput.setButtons(QVariantList() << QVariant(1 << 8));
-        axisInput.setAxis(327);
         axisInput.setScale(0.5f);
         axisInput.setSourceDevice(&sourceDevice);
 
@@ -73,7 +72,6 @@ private Q_SLOTS:
         QCOMPARE(backendAxisInput.peerId(), axisInput.id());
         QCOMPARE(backendAxisInput.isEnabled(), axisInput.isEnabled());
         compareKeys(backendAxisInput.buttons(), axisInput.buttons());
-        QCOMPARE(backendAxisInput.axis(), axisInput.axis());
         QCOMPARE(backendAxisInput.scale(), axisInput.scale());
         QCOMPARE(backendAxisInput.sourceDevice(), sourceDevice.id());
     }
@@ -87,7 +85,6 @@ private Q_SLOTS:
         QVERIFY(backendAxisInput.peerId().isNull());
         QCOMPARE(backendAxisInput.scale(), 0.0f);
         QVERIFY(backendAxisInput.buttons().isEmpty());
-        QCOMPARE(backendAxisInput.axis(), 0);
         QCOMPARE(backendAxisInput.isEnabled(), false);
         QCOMPARE(backendAxisInput.sourceDevice(), Qt3DCore::QNodeId());
 
@@ -96,7 +93,6 @@ private Q_SLOTS:
         TestDevice sourceDevice;
 
         axisInput.setButtons(QVariantList() << QVariant(1 << 8));
-        axisInput.setAxis(327);
         axisInput.setScale(0.5f);
         axisInput.setSourceDevice(&sourceDevice);
 
@@ -108,7 +104,6 @@ private Q_SLOTS:
         QVERIFY(backendAxisInput.peerId().isNull());
         QCOMPARE(backendAxisInput.scale(), 0.0f);
         QVERIFY(backendAxisInput.buttons().isEmpty());
-        QCOMPARE(backendAxisInput.axis(), 0);
         QCOMPARE(backendAxisInput.isEnabled(), false);
         QCOMPARE(backendAxisInput.sourceDevice(), Qt3DCore::QNodeId());
     }
@@ -118,18 +113,8 @@ private Q_SLOTS:
         // GIVEN
         Qt3DInput::Input::ButtonAxisInput backendAxisInput;
 
-
         // WHEN
-        Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
-        updateChange->setValue(32);
-        updateChange->setPropertyName("axis");
-        backendAxisInput.sceneChangeEvent(updateChange);
-
-        // THEN
-        QCOMPARE(backendAxisInput.axis(), 32);
-
-        // WHEN
-        updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
+        Qt3DCore::QNodePropertyChangePtr  updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setValue(QVariantList() << QVariant(64));
         updateChange->setPropertyName("buttons");
         backendAxisInput.sceneChangeEvent(updateChange);
diff --git a/tests/auto/input/input.pro b/tests/auto/input/input.pro
index b4790f9ff..ed9bf41d6 100644
--- a/tests/auto/input/input.pro
+++ b/tests/auto/input/input.pro
@@ -6,10 +6,12 @@ contains(QT_CONFIG, private_tests) {
         qaction \
         qactioninput \
         qaxisinput \
+        qanalogaxisinput \
         qbuttonaxisinput \
         qlogicaldevice \
         axis \
         action \
         axisinput \
+        analogaxisinput \
         buttonaxisinput
 }
diff --git a/tests/auto/input/qanalogaxisinput/qanalogaxisinput.pro b/tests/auto/input/qanalogaxisinput/qanalogaxisinput.pro
new file mode 100644
index 000000000..e693c160b
--- /dev/null
+++ b/tests/auto/input/qanalogaxisinput/qanalogaxisinput.pro
@@ -0,0 +1,12 @@
+TEMPLATE = app
+
+TARGET = tst_qanalogaxisinput
+
+QT += core-private 3dcore 3dcore-private 3dinput 3dinput-private testlib
+
+CONFIG += testcase
+
+SOURCES += tst_qanalogaxisinput.cpp
+
+include(../../render/commons/commons.pri)
+include(../commons/commons.pri)
diff --git a/tests/auto/input/qanalogaxisinput/tst_qanalogaxisinput.cpp b/tests/auto/input/qanalogaxisinput/tst_qanalogaxisinput.cpp
new file mode 100644
index 000000000..db34a37bf
--- /dev/null
+++ b/tests/auto/input/qanalogaxisinput/tst_qanalogaxisinput.cpp
@@ -0,0 +1,131 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QTest>
+#include <Qt3DCore/private/qnode_p.h>
+#include <Qt3DCore/private/qscene_p.h>
+#include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
+
+#include <Qt3DInput/QAnalogAxisInput>
+#include <Qt3DInput/QAbstractPhysicalDevice>
+#include <Qt3DInput/private/qanalogaxisinput_p.h>
+
+#include "testpostmanarbiter.h"
+#include "testdevice.h"
+
+class tst_QAnalogAxisInput: public QObject
+{
+    Q_OBJECT
+public:
+    tst_QAnalogAxisInput()
+    {
+        qRegisterMetaType<Qt3DInput::QAbstractPhysicalDevice*>("Qt3DInput::QAbstractPhysicalDevice*");
+    }
+
+private Q_SLOTS:
+    void checkCloning_data()
+    {
+        QTest::addColumn<Qt3DInput::QAnalogAxisInput *>("axisInput");
+
+        Qt3DInput::QAnalogAxisInput *defaultConstructed = new Qt3DInput::QAnalogAxisInput();
+        QTest::newRow("defaultConstructed") << defaultConstructed;
+
+        Qt3DInput::QAnalogAxisInput *axisInputWithAxis = new Qt3DInput::QAnalogAxisInput();
+        axisInputWithAxis->setAxis(383);
+        QTest::newRow("axisInputWithAxis") << axisInputWithAxis;
+
+        Qt3DInput::QAnalogAxisInput *axisInputWithAxisAndSourceDevice = new Qt3DInput::QAnalogAxisInput();
+        TestDevice *device = new TestDevice();
+        axisInputWithAxisAndSourceDevice->setSourceDevice(device);
+        axisInputWithAxisAndSourceDevice->setAxis(427);
+        QTest::newRow("axisInputWithAxisAndSourceDevice") << axisInputWithAxisAndSourceDevice;
+    }
+
+    void checkCloning()
+    {
+        // GIVEN
+        QFETCH(Qt3DInput::QAnalogAxisInput *, axisInput);
+
+        // WHEN
+        Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(axisInput);
+        QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges = creationChangeGenerator.creationChanges();
+
+        // THEN
+        QCOMPARE(creationChanges.size(), 1 + (axisInput->sourceDevice() ? 1 : 0));
+
+        const Qt3DCore::QNodeCreatedChangePtr<Qt3DInput::QAnalogAxisInputData> creationChangeData =
+                qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DInput::QAnalogAxisInputData>>(creationChanges.first());
+        const Qt3DInput::QAnalogAxisInputData &cloneData = creationChangeData->data;
+        QCOMPARE(axisInput->id(), creationChangeData->subjectId());
+        QCOMPARE(axisInput->isEnabled(), creationChangeData->isNodeEnabled());
+        QCOMPARE(axisInput->metaObject(), creationChangeData->metaObject());
+        QCOMPARE(axisInput->axis(), cloneData.axis);
+        QCOMPARE(axisInput->sourceDevice() ? axisInput->sourceDevice()->id() : Qt3DCore::QNodeId(), cloneData.sourceDeviceId);
+    }
+
+    void checkPropertyUpdates()
+    {
+        // GIVEN
+        QScopedPointer<Qt3DInput::QAnalogAxisInput> axisInput(new Qt3DInput::QAnalogAxisInput());
+        TestArbiter arbiter(axisInput.data());
+
+        // WHEN
+        axisInput->setAxis(350);
+        QCoreApplication::processEvents();
+
+        // THEN
+        QCOMPARE(arbiter.events.size(), 1);
+        Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>();
+        QCOMPARE(change->propertyName(), "axis");
+        QCOMPARE(change->value().toInt(), 350);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
+
+        arbiter.events.clear();
+
+        // WHEN
+        TestDevice *device = new TestDevice(axisInput.data());
+        QCoreApplication::processEvents();
+        arbiter.events.clear();
+
+        axisInput->setSourceDevice(device);
+        QCoreApplication::processEvents();
+
+        // THEN
+        QCOMPARE(arbiter.events.size(), 1);
+        change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>();
+        QCOMPARE(change->propertyName(), "sourceDevice");
+        QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), device->id());
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
+
+        arbiter.events.clear();
+    }
+};
+
+QTEST_MAIN(tst_QAnalogAxisInput)
+
+#include "tst_qanalogaxisinput.moc"
diff --git a/tests/auto/input/qaxisinput/tst_qaxisinput.cpp b/tests/auto/input/qaxisinput/tst_qaxisinput.cpp
index 465d85ee2..d34060e05 100644
--- a/tests/auto/input/qaxisinput/tst_qaxisinput.cpp
+++ b/tests/auto/input/qaxisinput/tst_qaxisinput.cpp
@@ -55,15 +55,10 @@ private Q_SLOTS:
         Qt3DInput::QAxisInput *defaultConstructed = new Qt3DInput::QAxisInput();
         QTest::newRow("defaultConstructed") << defaultConstructed;
 
-        Qt3DInput::QAxisInput *axisInputWithAxis = new Qt3DInput::QAxisInput();
-        axisInputWithAxis->setAxis(383);
-        QTest::newRow("axisInputWithAxis") << axisInputWithAxis;
-
-        Qt3DInput::QAxisInput *axisInputWithAxisAndSourceDevice = new Qt3DInput::QAxisInput();
+        Qt3DInput::QAxisInput *axisInputWithSourceDevice = new Qt3DInput::QAxisInput();
         TestDevice *device = new TestDevice();
-        axisInputWithAxisAndSourceDevice->setSourceDevice(device);
-        axisInputWithAxisAndSourceDevice->setAxis(427);
-        QTest::newRow("axisInputWithAxisAndSourceDevice") << axisInputWithAxisAndSourceDevice;
+        axisInputWithSourceDevice->setSourceDevice(device);
+        QTest::newRow("axisInputWithSourceDevice") << axisInputWithSourceDevice;
     }
 
     void checkCloning()
@@ -86,7 +81,6 @@ private Q_SLOTS:
         QCOMPARE(axisInput->id(), creationChangeData->subjectId());
         QCOMPARE(axisInput->isEnabled(), creationChangeData->isNodeEnabled());
         QCOMPARE(axisInput->metaObject(), creationChangeData->metaObject());
-        QCOMPARE(axisInput->axis(), cloneData.axis);
         QCOMPARE(axisInput->sourceDevice() ? axisInput->sourceDevice()->id() : Qt3DCore::QNodeId(), cloneData.sourceDeviceId);
     }
 
@@ -97,19 +91,6 @@ private Q_SLOTS:
         TestArbiter arbiter(axisInput.data());
 
         // WHEN
-        axisInput->setAxis(350);
-        QCoreApplication::processEvents();
-
-        // THEN
-        QCOMPARE(arbiter.events.size(), 1);
-        Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>();
-        QCOMPARE(change->propertyName(), "axis");
-        QCOMPARE(change->value().toInt(), 350);
-        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
-
-        arbiter.events.clear();
-
-        // WHEN
         TestDevice *device = new TestDevice(axisInput.data());
         QCoreApplication::processEvents();
         arbiter.events.clear();
@@ -119,7 +100,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>();
+        Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>();
         QCOMPARE(change->propertyName(), "sourceDevice");
         QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), device->id());
         QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
diff --git a/tests/auto/input/qbuttonaxisinput/tst_qbuttonaxisinput.cpp b/tests/auto/input/qbuttonaxisinput/tst_qbuttonaxisinput.cpp
index 62c6d8c3d..ebd266e06 100644
--- a/tests/auto/input/qbuttonaxisinput/tst_qbuttonaxisinput.cpp
+++ b/tests/auto/input/qbuttonaxisinput/tst_qbuttonaxisinput.cpp
@@ -55,17 +55,15 @@ private Q_SLOTS:
         Qt3DInput::QButtonAxisInput *defaultConstructed = new Qt3DInput::QButtonAxisInput();
         QTest::newRow("defaultConstructed") << defaultConstructed;
 
-        Qt3DInput::QButtonAxisInput *axisInputWithKeysAndAxis = new Qt3DInput::QButtonAxisInput();
-        axisInputWithKeysAndAxis->setButtons(QVariantList() << QVariant((1 << 1) | (1 << 5)));
-        axisInputWithKeysAndAxis->setAxis(383);
-        axisInputWithKeysAndAxis->setScale(327.0f);
-        QTest::newRow("axisInputWithKeys") << axisInputWithKeysAndAxis;
+        Qt3DInput::QButtonAxisInput *axisInputWithKeys = new Qt3DInput::QButtonAxisInput();
+        axisInputWithKeys->setButtons(QVariantList() << QVariant((1 << 1) | (1 << 5)));
+        axisInputWithKeys->setScale(327.0f);
+        QTest::newRow("axisInputWithKeys") << axisInputWithKeys;
 
         Qt3DInput::QButtonAxisInput *axisInputWithKeysAndSourceDevice = new Qt3DInput::QButtonAxisInput();
         TestDevice *device = new TestDevice();
         axisInputWithKeysAndSourceDevice->setButtons(QVariantList() << QVariant((1 << 1) | (1 << 5)));
         axisInputWithKeysAndSourceDevice->setSourceDevice(device);
-        axisInputWithKeysAndSourceDevice->setAxis(427);
         axisInputWithKeysAndSourceDevice->setScale(355.0f);
         QTest::newRow("axisInputWithKeysAndSourceDevice") << axisInputWithKeysAndSourceDevice;
     }
@@ -89,7 +87,6 @@ private Q_SLOTS:
         QCOMPARE(axisInput->isEnabled(), creationChangeData->isNodeEnabled());
         QCOMPARE(axisInput->metaObject(), creationChangeData->metaObject());
         QCOMPARE(axisInput->buttons(), cloneData.buttons);
-        QCOMPARE(axisInput->axis(), cloneData.axis);
         QCOMPARE(axisInput->scale(), cloneData.scale);
         QCOMPARE(axisInput->sourceDevice() ? axisInput->sourceDevice()->id() : Qt3DCore::QNodeId(), cloneData.sourceDeviceId);
     }
@@ -128,19 +125,6 @@ private Q_SLOTS:
         arbiter.events.clear();
 
         // WHEN
-        axisInput->setAxis(350);
-        QCoreApplication::processEvents();
-
-        // THEN
-        QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>();
-        QCOMPARE(change->propertyName(), "axis");
-        QCOMPARE(change->value().toInt(), 350);
-        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
-
-        arbiter.events.clear();
-
-        // WHEN
         TestDevice *device = new TestDevice(axisInput.data());
         QCoreApplication::processEvents();
         arbiter.events.clear();