1 files changed, 4 insertions, 62 deletions
diff --git a/tests/auto/render/qsceneloader/tst_qsceneloader.cpp b/tests/auto/render/qsceneloader/tst_qsceneloader.cpp
index 79ca6a291..b237f2dd4 100644
--- a/tests/auto/render/qsceneloader/tst_qsceneloader.cpp
+++ b/tests/auto/render/qsceneloader/tst_qsceneloader.cpp
@@ -30,7 +30,6 @@
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
 #include <Qt3DCore/qtransform.h>
 
 #include <Qt3DRender/qsceneloader.h>
@@ -41,7 +40,7 @@
 #include <Qt3DRender/private/qsceneloader_p.h>
 #include <QSignalSpy>
 
-#include "testpostmanarbiter.h"
+#include "testarbiter.h"
 
 class tst_QSceneLoader: public QObject
 {
@@ -60,62 +59,6 @@ private Q_SLOTS:
         QVERIFY(static_cast<Qt3DRender::QSceneLoaderPrivate *>(Qt3DCore::QNodePrivate::get(&sceneLoader))->m_subTreeRoot == nullptr);
     }
 
-    void checkCreationData()
-    {
-        // GIVEN
-        Qt3DRender::QSceneLoader sceneLoader;
-        const QUrl sceneUrl = QUrl(QStringLiteral("LA ConventionCenter"));
-        sceneLoader.setSource(sceneUrl);
-
-        // WHEN
-        QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges;
-
-        {
-            Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(&sceneLoader);
-            creationChanges = creationChangeGenerator.creationChanges();
-        }
-
-        // THEN
-        {
-            QCOMPARE(creationChanges.size(), 1);
-
-            const auto creationChangeData =
-                    qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DRender::QSceneLoaderData>>(creationChanges.first());
-            const Qt3DRender::QSceneLoaderData cloneData = creationChangeData->data;
-
-            QCOMPARE(sceneLoader.id(), creationChangeData->subjectId());
-            QCOMPARE(sceneLoader.isEnabled(), true);
-            QCOMPARE(sceneLoader.isEnabled(), creationChangeData->isNodeEnabled());
-            QCOMPARE(sceneLoader.metaObject(), creationChangeData->metaObject());
-            QCOMPARE(sceneLoader.source(), sceneUrl);
-            QCOMPARE(sceneLoader.source(), cloneData.source);
-        }
-
-        // WHEN
-        sceneLoader.setEnabled(false);
-
-        {
-            Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(&sceneLoader);
-            creationChanges = creationChangeGenerator.creationChanges();
-        }
-
-        // THEN
-        {
-            QCOMPARE(creationChanges.size(), 1);
-
-            const auto creationChangeData =
-                    qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DRender::QSceneLoaderData>>(creationChanges.first());
-            const Qt3DRender::QSceneLoaderData cloneData = creationChangeData->data;
-
-            QCOMPARE(sceneLoader.id(), creationChangeData->subjectId());
-            QCOMPARE(sceneLoader.isEnabled(), false);
-            QCOMPARE(sceneLoader.isEnabled(), creationChangeData->isNodeEnabled());
-            QCOMPARE(sceneLoader.metaObject(), creationChangeData->metaObject());
-            QCOMPARE(sceneLoader.source(), sceneUrl);
-            QCOMPARE(sceneLoader.source(), cloneData.source);
-        }
-    }
-
     void checkSourcePropertyUpdate()
     {
         // GIVEN
@@ -129,11 +72,10 @@ private Q_SLOTS:
         QCoreApplication::processEvents();
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 0);
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), sceneLoader.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), sceneLoader.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
     }
 
     void checkEntities()