Remove deprecated classes and functions

Mostly old messaging API

Change-Id: I17eb2206b2ede56d2f7d36375d5e711d6149019f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

1 files changed, 15 insertions, 71 deletions

diff --git a/tests/auto/render/qbuffer/tst_qbuffer.cpp b/tests/auto/render/qbuffer/tst_qbuffer.cpp
index fd96bf1c2..cbb141d2e 100644
--- a/tests/auto/render/qbuffer/tst_qbuffer.cpp
+++ b/tests/auto/render/qbuffer/tst_qbuffer.cpp
@@ -33,13 +33,12 @@ QT_WARNING_DISABLE_DEPRECATED
 #include <QtTest/QTest>
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
 
 #include <Qt3DRender/qbuffer.h>
 #include <Qt3DRender/private/qbuffer_p.h>
 #include <Qt3DRender/qbufferdatagenerator.h>
 
-#include "testpostmanarbiter.h"
+#include "testarbiter.h"
 
 class TestFunctor : public Qt3DRender::QBufferDataGenerator
 {
@@ -73,58 +72,6 @@ class tst_QBuffer: public QObject
 
 private Q_SLOTS:
 
-    void checkCloning_data()
-    {
-        QTest::addColumn<Qt3DRender::QBuffer *>("buffer");
-
-        Qt3DRender::QBuffer *defaultConstructed = new Qt3DRender::QBuffer();
-        QTest::newRow("defaultConstructed") << defaultConstructed;
-
-        auto buffer = new Qt3DRender::QBuffer;
-        buffer->setUsage(Qt3DRender::QBuffer::DynamicRead);
-        buffer->setData(QByteArrayLiteral("There's no replacement"));
-        buffer->setDataGenerator(Qt3DRender::QBufferDataGeneratorPtr(new TestFunctor(883)));
-        QTest::newRow("vertex") << buffer;
-
-        auto indexBuffer = new Qt3DRender::QBuffer;
-        indexBuffer->setUsage(Qt3DRender::QBuffer::StaticCopy);
-        indexBuffer->setData(QByteArrayLiteral("For displacement"));
-        indexBuffer->setDataGenerator(Qt3DRender::QBufferDataGeneratorPtr(new TestFunctor(1340)));
-        indexBuffer->setSyncData(true);
-        QTest::newRow("index") << indexBuffer;
-    }
-
-    void checkCloning()
-    {
-        // GIVEN
-        QFETCH(Qt3DRender::QBuffer *, buffer);
-
-        // WHEN
-        Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(buffer);
-        QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges = creationChangeGenerator.creationChanges();
-
-        // THEN
-        QCOMPARE(creationChanges.size(), 1);
-
-        const Qt3DCore::QNodeCreatedChangePtr<Qt3DRender::QBufferData> creationChangeData =
-                qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DRender::QBufferData>>(creationChanges.first());
-        const Qt3DRender::QBufferData &cloneData = creationChangeData->data;
-
-
-        QCOMPARE(buffer->id(), creationChangeData->subjectId());
-        QCOMPARE(buffer->isEnabled(), creationChangeData->isNodeEnabled());
-        QCOMPARE(buffer->metaObject(), creationChangeData->metaObject());
-        QCOMPARE(buffer->data(), cloneData.data);
-        QCOMPARE(buffer->usage(), cloneData.usage);
-        QCOMPARE(buffer->dataGenerator(), cloneData.functor);
-        QCOMPARE(buffer->isSyncData(), cloneData.syncData);
-        if (buffer->dataGenerator()) {
-            QVERIFY(cloneData.functor);
-            QVERIFY(*cloneData.functor == *buffer->dataGenerator());
-            QCOMPARE((*cloneData.functor)(), (*buffer->dataGenerator())());
-        }
-    }
-
     void checkPropertyUpdates()
     {
         // GIVEN
@@ -136,21 +83,19 @@ private Q_SLOTS:
         buffer->setUsage(Qt3DRender::QBuffer::DynamicCopy);
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 0);
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), buffer.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), buffer.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         // WHEN
         buffer->setData(QByteArrayLiteral("Z28"));
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 0);
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), buffer.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), buffer.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         // WHEN
         Qt3DRender::QBufferDataGeneratorPtr functor(new TestFunctor(355));
@@ -158,28 +103,27 @@ private Q_SLOTS:
         QCoreApplication::processEvents();
 
         // THEN
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), buffer.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), buffer.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         // WHEN
         buffer->setSyncData(true);
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 0);
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), buffer.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), buffer.data());
 
-        arbiter.dirtyNodes.clear();
+        arbiter.clear();
 
         // WHEN
         buffer->updateData(1, QByteArrayLiteral("L1"));
         QCoreApplication::processEvents();
 
         // THEN
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), buffer.data());
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), buffer.data());
     }
 };