Unit Tests: use the commons TestArbiter/Postman

Change-Id: Ic61ab8b30414297a4f65ee0695e91bfa578af5a6
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>

10 files changed, 16 insertions, 386 deletions

diff --git a/tests/auto/render/qattribute/qattribute.pro b/tests/auto/render/qattribute/qattribute.pro
index 657d6c8fa..474531bf3 100644
--- a/tests/auto/render/qattribute/qattribute.pro
+++ b/tests/auto/render/qattribute/qattribute.pro
@@ -7,3 +7,5 @@ QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib
 CONFIG += testcase
 
 SOURCES += tst_qattribute.cpp
+
+include(../commons/commons.pri)
diff --git a/tests/auto/render/qattribute/tst_qattribute.cpp b/tests/auto/render/qattribute/tst_qattribute.cpp
index 9383012ba..4acf1670b 100644
--- a/tests/auto/render/qattribute/tst_qattribute.cpp
+++ b/tests/auto/render/qattribute/tst_qattribute.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/QAttribute>
 #include <Qt3DRenderer/QBuffer>
 
-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"
 
 // We need to call QNode::clone which is protected
 // So we sublcass QNode instead of QObject
diff --git a/tests/auto/render/qbuffer/qbuffer.pro b/tests/auto/render/qbuffer/qbuffer.pro
index dd132936a..69f30d1f8 100644
--- a/tests/auto/render/qbuffer/qbuffer.pro
+++ b/tests/auto/render/qbuffer/qbuffer.pro
@@ -7,3 +7,5 @@ QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib
 CONFIG += testcase
 
 SOURCES += tst_qbuffer.cpp
+
+include(../commons/commons.pri)
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
 {
diff --git a/tests/auto/render/qgeometry/qgeometry.pro b/tests/auto/render/qgeometry/qgeometry.pro
index 73e2b00bc..9ab76b6cc 100644
--- a/tests/auto/render/qgeometry/qgeometry.pro
+++ b/tests/auto/render/qgeometry/qgeometry.pro
@@ -7,3 +7,5 @@ QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib
 CONFIG += testcase
 
 SOURCES += tst_qgeometry.cpp
+
+include(../commons/commons.pri)
diff --git a/tests/auto/render/qgeometry/tst_qgeometry.cpp b/tests/auto/render/qgeometry/tst_qgeometry.cpp
index 692cd6f16..08a1429db 100644
--- a/tests/auto/render/qgeometry/tst_qgeometry.cpp
+++ b/tests/auto/render/qgeometry/tst_qgeometry.cpp
@@ -37,88 +37,12 @@
 #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/qgeometry.h>
 #include <Qt3DRenderer/qattribute.h>
 #include <Qt3DRenderer/qbuffer.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"
 
 // We need to call QNode::clone which is protected
 // So we sublcass QNode instead of QObject
diff --git a/tests/auto/render/qgeometryrenderer/qgeometryrenderer.pro b/tests/auto/render/qgeometryrenderer/qgeometryrenderer.pro
index e41e0f06b..668fa6550 100644
--- a/tests/auto/render/qgeometryrenderer/qgeometryrenderer.pro
+++ b/tests/auto/render/qgeometryrenderer/qgeometryrenderer.pro
@@ -7,3 +7,5 @@ QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib
 CONFIG += testcase
 
 SOURCES += tst_qgeometryrenderer.cpp
+
+include(../commons/commons.pri)
diff --git a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
index 186b2e9a8..0eb3e1248 100644
--- a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
+++ b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
@@ -37,9 +37,6 @@
 #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/qgeometryrenderer.h>
 #include <Qt3DRenderer/qgeometryfunctor.h>
@@ -47,80 +44,7 @@
 #include <Qt3DRenderer/qattribute.h>
 #include <Qt3DRenderer/qbuffer.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::QGeometryFunctor
 {
diff --git a/tests/auto/render/qmaterial/qmaterial.pro b/tests/auto/render/qmaterial/qmaterial.pro
index d15458ff6..75e5e93a9 100644
--- a/tests/auto/render/qmaterial/qmaterial.pro
+++ b/tests/auto/render/qmaterial/qmaterial.pro
@@ -7,3 +7,5 @@ QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib
 CONFIG += testcase
 
 SOURCES += tst_qmaterial.cpp
+
+include(../commons/commons.pri)
diff --git a/tests/auto/render/qmaterial/tst_qmaterial.cpp b/tests/auto/render/qmaterial/tst_qmaterial.cpp
index e719a8ea8..b12420a5d 100644
--- a/tests/auto/render/qmaterial/tst_qmaterial.cpp
+++ b/tests/auto/render/qmaterial/tst_qmaterial.cpp
@@ -37,9 +37,6 @@
 #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/QEffect>
 #include <Qt3DRenderer/QMaterial>
@@ -55,6 +52,8 @@
 #include <Qt3DRenderer/QNormalDiffuseMapAlphaMaterial>
 #include <Qt3DRenderer/QNormalDiffuseSpecularMapMaterial>
 
+#include "testpostmanarbiter.h"
+
 class TestMaterial : public Qt3DRender::QMaterial
 {
 public:
@@ -82,81 +81,6 @@ public:
     Qt3DRender::QShaderProgram *m_shaderProgram;
 };
 
-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);
-}
-
 // We need to call QNode::clone which is protected
 // So we sublcass QNode instead of QObject
 class tst_QMaterial : public Qt3DCore::QNode