Strip out cloning subsystem

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

1 files changed, 14 insertions, 25 deletions

diff --git a/tests/auto/render/qcameraselector/tst_qcameraselector.cpp b/tests/auto/render/qcameraselector/tst_qcameraselector.cpp
index 895cffcf5..fc69f5adf 100644
--- a/tests/auto/render/qcameraselector/tst_qcameraselector.cpp
+++ b/tests/auto/render/qcameraselector/tst_qcameraselector.cpp
@@ -29,22 +29,17 @@
 #include <QtTest/QTest>
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
+#include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
 
 #include <Qt3DRender/qcameraselector.h>
+#include <Qt3DRender/private/qcameraselector_p.h>
 #include <Qt3DCore/qentity.h>
 
 #include "testpostmanarbiter.h"
 
-// We need to call QNode::clone which is protected
-// So we sublcass QNode instead of QObject
-class tst_QCameraSelector: public Qt3DCore::QNode
+class tst_QCameraSelector: public QObject
 {
     Q_OBJECT
-public:
-    ~tst_QCameraSelector()
-    {
-        QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection);
-    }
 
 private Q_SLOTS:
 
@@ -69,21 +64,22 @@ private Q_SLOTS:
         QFETCH(Qt3DCore::QEntity *, camera);
 
         // WHEN
-        Qt3DRender::QCameraSelector *clone = static_cast<Qt3DRender::QCameraSelector *>(QNode::clone(cameraSelector));
+        Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(cameraSelector);
+        QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges = creationChangeGenerator.creationChanges();
 
         // THEN
-        QVERIFY(clone != Q_NULLPTR);
+        QCOMPARE(creationChanges.size(), 1 + (camera ? 1 : 0));
 
-        QCOMPARE(cameraSelector->id(), clone->id());
-        if (cameraSelector->camera()) {
-            QVERIFY(clone->camera());
-            QCOMPARE(clone->camera()->id(), camera->id());
-        } else {
-            QVERIFY(clone->camera() == Q_NULLPTR);
-        }
+        const Qt3DCore::QNodeCreatedChangePtr<Qt3DRender::QCameraSelectorData> creationChangeData =
+                qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DRender::QCameraSelectorData>>(creationChanges.first());
+        const Qt3DRender::QCameraSelectorData &cloneData = creationChangeData->data;
+
+        QCOMPARE(cameraSelector->id(), creationChangeData->subjectId());
+        QCOMPARE(cameraSelector->isEnabled(), creationChangeData->isNodeEnabled());
+        QCOMPARE(cameraSelector->metaObject(), creationChangeData->metaObject());
+        QCOMPARE(cameraSelector->camera() ? cameraSelector->camera()->id() : Qt3DCore::QNodeId(), cloneData.cameraId);
 
         delete cameraSelector;
-        delete clone;
     }
 
     void checkPropertyUpdates()
@@ -139,13 +135,6 @@ private Q_SLOTS:
 
         arbiter.events.clear();
     }
-
-protected:
-    Qt3DCore::QNode *doClone() const Q_DECL_OVERRIDE
-    {
-        return Q_NULLPTR;
-    }
-
 };
 
 QTEST_MAIN(tst_QCameraSelector)