diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-19 17:16:52 +0100 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2016-04-29 16:22:24 +0000 |
commit | 948d0357850918596b56f38a6dc6e25cd186f5a0 (patch) | |
tree | 2a522442757660b6eadecd3a6decde1f34ab5740 /tests/auto/render/qviewport/tst_qviewport.cpp | |
parent | ae5ac1128bc61176f797f6e248d18b9ced051ad9 (diff) |
Strip out cloning subsystem
Change-Id: I4def54a11de0f9c676ef6b2d7bd8e723ded25ab9
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto/render/qviewport/tst_qviewport.cpp')
-rw-r--r-- | tests/auto/render/qviewport/tst_qviewport.cpp | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/tests/auto/render/qviewport/tst_qviewport.cpp b/tests/auto/render/qviewport/tst_qviewport.cpp index 88b54cac6..30c3bcccc 100644 --- a/tests/auto/render/qviewport/tst_qviewport.cpp +++ b/tests/auto/render/qviewport/tst_qviewport.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/qviewport.h> +#include <Qt3DRender/private/qviewport_p.h> #include "testpostmanarbiter.h" -// We need to call QNode::clone which is protected -// So we sublcass QNode instead of QObject -class tst_QViewport: public Qt3DCore::QNode +class tst_QViewport: public QObject { Q_OBJECT -public: - ~tst_QViewport() - { - QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection); - } private Q_SLOTS: @@ -71,15 +66,22 @@ private Q_SLOTS: QCOMPARE(viewport->normalizedRect(), normalizedRect); // WHEN - Qt3DRender::QViewport *clone = static_cast<Qt3DRender::QViewport *>(QNode::clone(viewport)); + Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(viewport); + QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges = creationChangeGenerator.creationChanges(); // THEN - QVERIFY(clone != Q_NULLPTR); - QCOMPARE(viewport->id(), clone->id()); - QCOMPARE(viewport->normalizedRect(), clone->normalizedRect()); + QCOMPARE(creationChanges.size(), 1); + + const Qt3DCore::QNodeCreatedChangePtr<Qt3DRender::QViewportData> creationChangeData = + qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DRender::QViewportData>>(creationChanges.first()); + const Qt3DRender::QViewportData &cloneData = creationChangeData->data; + + QCOMPARE(viewport->id(), creationChangeData->subjectId()); + QCOMPARE(viewport->isEnabled(), creationChangeData->isNodeEnabled()); + QCOMPARE(viewport->metaObject(), creationChangeData->metaObject()); + QCOMPARE(viewport->normalizedRect(), cloneData.normalizedRect); delete viewport; - delete clone; } void checkPropertyUpdates() @@ -122,13 +124,6 @@ private Q_SLOTS: QCOMPARE(change->type(), Qt3DCore::NodeUpdated); } - -protected: - Qt3DCore::QNode *doClone() const Q_DECL_OVERRIDE - { - return Q_NULLPTR; - } - }; QTEST_MAIN(tst_QViewport) |