From 948d0357850918596b56f38a6dc6e25cd186f5a0 Mon Sep 17 00:00:00 2001
From: Sean Harmer <sean.harmer@kdab.com>
Date: Tue, 19 Apr 2016 17:16:52 +0100
Subject: Strip out cloning subsystem

Change-Id: I4def54a11de0f9c676ef6b2d7bd8e723ded25ab9
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
---
 .../auto/render/qlayerfilter/tst_qlayerfilter.cpp  | 37 ++++++++++------------
 1 file changed, 17 insertions(+), 20 deletions(-)

(limited to 'tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp')

diff --git a/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp b/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp
index 175285a69..8ace74d30 100644
--- a/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp
+++ b/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp
@@ -29,21 +29,16 @@
 #include <QtTest/QTest>
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
+#include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
 
 #include <Qt3DRender/qlayerfilter.h>
+#include <Qt3DRender/private/qlayerfilter_p.h>
 
 #include "testpostmanarbiter.h"
 
-// We need to call QNode::clone which is protected
-// So we sublcass QNode instead of QObject
-class tst_QLayerFilter: public Qt3DCore::QNode
+class tst_QLayerFilter: public QObject
 {
     Q_OBJECT
-public:
-    ~tst_QLayerFilter()
-    {
-        QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection);
-    }
 
 private Q_SLOTS:
 
@@ -76,15 +71,24 @@ private Q_SLOTS:
         QCOMPARE(layerFilter->layers(), layerNames);
 
         // WHEN
-        Qt3DRender::QLayerFilter *clone = static_cast<Qt3DRender::QLayerFilter *>(QNode::clone(layerFilter));
+        Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(layerFilter);
+        QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges = creationChangeGenerator.creationChanges();
+
+        // THEN
+        QCOMPARE(creationChanges.size(), 1);
+
+        const Qt3DCore::QNodeCreatedChangePtr<Qt3DRender::QLayerFilterData> creationChangeData =
+                qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DRender::QLayerFilterData>>(creationChanges.first());
+        const Qt3DRender::QLayerFilterData &cloneData = creationChangeData->data;
+
 
         // THEN
-        QVERIFY(clone != Q_NULLPTR);
-        QCOMPARE(layerFilter->id(), clone->id());
-        QCOMPARE(layerFilter->layers(), clone->layers());
+        QCOMPARE(layerFilter->id(), creationChangeData->subjectId());
+        QCOMPARE(layerFilter->isEnabled(), creationChangeData->isNodeEnabled());
+        QCOMPARE(layerFilter->metaObject(), creationChangeData->metaObject());
+        QCOMPARE(layerFilter->layers(), cloneData.layers);
 
         delete layerFilter;
-        delete clone;
     }
 
     void checkPropertyUpdates()
@@ -145,13 +149,6 @@ private Q_SLOTS:
 
         arbiter.events.clear();
     }
-
-protected:
-    Qt3DCore::QNode *doClone() const Q_DECL_OVERRIDE
-    {
-        return Q_NULLPTR;
-    }
-
 };
 
 QTEST_MAIN(tst_QLayerFilter)
-- 
cgit v1.2.3