1 files changed, 7 insertions, 57 deletions

diff --git a/tests/auto/input/qaxis/tst_qaxis.cpp b/tests/auto/input/qaxis/tst_qaxis.cpp
index 9b3068442..e57b02bb3 100644
--- a/tests/auto/input/qaxis/tst_qaxis.cpp
+++ b/tests/auto/input/qaxis/tst_qaxis.cpp
@@ -29,13 +29,11 @@
 #include <QtTest/QTest>
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
 
 #include <Qt3DInput/QAxis>
 #include <Qt3DInput/QAnalogAxisInput>
 #include <Qt3DInput/private/qaxis_p.h>
-
-#include "testpostmanarbiter.h"
+#include <testarbiter.h>
 
 class tst_QAxis: public QObject
 {
@@ -47,52 +45,6 @@ public:
 
 private Q_SLOTS:
 
-    void checkCloning_data()
-    {
-        QTest::addColumn<Qt3DInput::QAxis *>("axis");
-
-        Qt3DInput::QAxis *defaultConstructed = new Qt3DInput::QAxis();
-        QTest::newRow("defaultConstructed") << defaultConstructed;
-
-        Qt3DInput::QAxis *namedAxis = new Qt3DInput::QAxis();
-        QTest::newRow("namedAxis") << namedAxis;
-
-        Qt3DInput::QAxis *namedAxisWithInputs = new Qt3DInput::QAxis();
-        Qt3DInput::QAbstractAxisInput *axisInput1 = new Qt3DInput::QAnalogAxisInput();
-        Qt3DInput::QAbstractAxisInput *axisInput2 = new Qt3DInput::QAnalogAxisInput();
-        Qt3DInput::QAbstractAxisInput *axisInput3 = new Qt3DInput::QAnalogAxisInput();
-        namedAxisWithInputs->addInput(axisInput1);
-        namedAxisWithInputs->addInput(axisInput2);
-        namedAxisWithInputs->addInput(axisInput3);
-        QTest::newRow("namedAxisWithInputs") << namedAxisWithInputs;
-    }
-
-    void checkCloning()
-    {
-        // GIVEN
-        QFETCH(Qt3DInput::QAxis *, axis);
-
-        // WHEN
-        Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(axis);
-        QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges = creationChangeGenerator.creationChanges();
-
-        // THEN
-        QCOMPARE(creationChanges.size(), 1 + axis->inputs().size());
-
-        const Qt3DCore::QNodeCreatedChangePtr<Qt3DInput::QAxisData> creationChangeData =
-               qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DInput::QAxisData>>(creationChanges.first());
-        const Qt3DInput::QAxisData &cloneData = creationChangeData->data;
-
-        // THEN
-        QCOMPARE(axis->id(), creationChangeData->subjectId());
-        QCOMPARE(axis->isEnabled(), creationChangeData->isNodeEnabled());
-        QCOMPARE(axis->metaObject(), creationChangeData->metaObject());
-        QCOMPARE(axis->inputs().count(), cloneData.inputIds.count());
-
-        for (int i = 0, m = axis->inputs().count(); i < m; ++i)
-            QCOMPARE(axis->inputs().at(i)->id(), cloneData.inputIds.at(i));
-    }
-
     void checkPropertyUpdates()
     {
         // GIVEN
@@ -106,22 +58,20 @@ private Q_SLOTS:
         QCoreApplication::processEvents();
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 0);
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), axis.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), axis.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         // WHEN
         axis->removeInput(input);
         QCoreApplication::processEvents();
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 0);
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), axis.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), axis.data());
 
-        arbiter.events.clear();
+        arbiter.clear();
     }
 
     void checkAxisInputBookkeeping()