diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-30 16:10:19 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-02 06:34:02 +0000 |
commit | ed6d778b20d0cdf2968e8d68085d33791ac33c49 (patch) | |
tree | d97e5a36316371b199dca3774cae50ba4348172e /tests/auto/render/renderpass/tst_renderpass.cpp | |
parent | 77b04a10874870b6b41e7b788636b492f3da9075 (diff) |
Remove QbackendNode::setPeer(QNode *)
...and fix up unit tests by using the QbackendNodeTester to simulate
the initialization performed by QAbstractAspectPrivate.
Change-Id: I61207f9f1631494f926552bef8eba33cc2a45850
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto/render/renderpass/tst_renderpass.cpp')
-rw-r--r-- | tests/auto/render/renderpass/tst_renderpass.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/render/renderpass/tst_renderpass.cpp b/tests/auto/render/renderpass/tst_renderpass.cpp index ce369b28f..38887bb80 100644 --- a/tests/auto/render/renderpass/tst_renderpass.cpp +++ b/tests/auto/render/renderpass/tst_renderpass.cpp @@ -27,6 +27,7 @@ ****************************************************************************/ #include <QtTest/QtTest> +#include <qbackendnodetester.h> #include <Qt3DRender/private/renderpass_p.h> #include <Qt3DCore/QNodePropertyChange> @@ -66,13 +67,14 @@ using namespace Qt3DCore; using namespace Qt3DRender; using namespace Qt3DRender::Render; -class tst_RenderRenderPass : public QObject +class tst_RenderRenderPass : public Qt3DCore::QBackendNodeTester { Q_OBJECT public: tst_RenderRenderPass() : m_renderStateManager(new RenderStateManager()) { + qRegisterMetaType<Qt3DCore::QNode *>(); } ~tst_RenderRenderPass() {} @@ -106,10 +108,10 @@ private slots: RenderPass backend; RenderStateNode *backendState = m_renderStateManager->getOrCreateResource(frontendState->id()); - backendState->setPeer(frontendState); + simulateInitialization(frontendState, backendState); // WHEN - backend.setPeer(&frontend); + simulateInitialization(&frontend, &backend); // THEN QCOMPARE(backend.shaderProgram(), frontend.shaderProgram()->id()); @@ -217,7 +219,7 @@ private slots: backend.setRenderer(&renderer); RenderStateNode *backendState = m_renderStateManager->getOrCreateResource(frontendState->id()); - backendState->setPeer(frontendState); + simulateInitialization(frontendState, backendState); // WHEN const auto addChange = Qt3DCore::QNodeAddedPropertyChangePtr::create(Qt3DCore::QNodeId(), frontendState); |