summaryrefslogtreecommitdiffstats
path: root/tests/auto/render/qbuffer/tst_qbuffer.cpp
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-09-25 11:31:35 +0200
committerPaul Lemire <paul.lemire@kdab.com>2015-10-14 15:59:29 +0000
commit41afe7c7fc72303052815cd2f26d217d02671a5a (patch)
tree05b5bcada4f96c753c8e11b2a82419e693c03bcd /tests/auto/render/qbuffer/tst_qbuffer.cpp
parent1350a32f1d47f23575be91e6abab44ca56775c30 (diff)
Unit Tests: use the commons TestArbiter/Postman
Change-Id: Ic61ab8b30414297a4f65ee0695e91bfa578af5a6 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'tests/auto/render/qbuffer/tst_qbuffer.cpp')
-rw-r--r--tests/auto/render/qbuffer/tst_qbuffer.cpp78
1 files changed, 1 insertions, 77 deletions
diff --git a/tests/auto/render/qbuffer/tst_qbuffer.cpp b/tests/auto/render/qbuffer/tst_qbuffer.cpp
index 0501fd02e..f71a61607 100644
--- a/tests/auto/render/qbuffer/tst_qbuffer.cpp
+++ b/tests/auto/render/qbuffer/tst_qbuffer.cpp
@@ -37,87 +37,11 @@
#include <QtTest/QTest>
#include <Qt3DCore/private/qnode_p.h>
#include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/private/qpostman_p.h>
-#include <Qt3DCore/private/qchangearbiter_p.h>
-#include <Qt3DCore/QScenePropertyChange>
#include <Qt3DRenderer/qbuffer.h>
#include <Qt3DRenderer/qbufferfunctor.h>
-class TestArbiter;
-
-class TestPostman : public Qt3DCore::QAbstractPostman
-{
-public:
- TestPostman(TestArbiter *arbiter)
- : m_arbiter(arbiter)
- {}
-
- void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_FINAL
- {}
-
- void setScene(Qt3DCore::QScene *) Q_DECL_FINAL
- {}
-
- void notifyBackend(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
-
-private:
- TestArbiter *m_arbiter;
-};
-
-class TestArbiter : public Qt3DCore::QAbstractArbiter
-{
-public:
- TestArbiter(Qt3DCore::QNode *node)
- : m_postman(new TestPostman(this))
- , m_node(node)
- {
- assignArbiter(m_node);
- }
-
- ~TestArbiter()
- {
- Qt3DCore::QNodePrivate::get(m_node)->setArbiter(Q_NULLPTR);
- }
-
- void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL
- {
- events.push_back(e);
- }
-
- void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL
- {
- events.push_back(e);
- }
-
- void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e) Q_DECL_FINAL
- {
- events += QVector<Qt3DCore::QSceneChangePtr>::fromStdVector(e);
- }
-
- Qt3DCore::QAbstractPostman *postman() const Q_DECL_FINAL
- {
- return m_postman;
- }
-
- QVector<Qt3DCore::QSceneChangePtr> events;
-
-private:
- TestPostman *m_postman;
- Qt3DCore::QNode *m_node;
-
- void assignArbiter(Qt3DCore::QNode *node)
- {
- Qt3DCore::QNodePrivate::get(node)->setArbiter(this);
- Q_FOREACH (Qt3DCore::QNode *n, node->childrenNodes())
- assignArbiter(n);
- }
-};
-
-void TestPostman::notifyBackend(const Qt3DCore::QSceneChangePtr &e)
-{
- m_arbiter->sceneChangeEventWithLock(e);
-}
+#include "testpostmanarbiter.h"
class TestFunctor : public Qt3DRender::QBufferFunctor
{