Update QRenderCapture to use direct sync

Change-Id: I3a253af0ee11ad141c3dbcaf8b92e3f67797f05f
Reviewed-by: Mike Krus <mike.krus@kdab.com>

2 files changed, 15 insertions, 22 deletions

diff --git a/tests/auto/render/qrendercapture/tst_qrendercapture.cpp b/tests/auto/render/qrendercapture/tst_qrendercapture.cpp
index 2fab1e837..b9cb2230f 100644
--- a/tests/auto/render/qrendercapture/tst_qrendercapture.cpp
+++ b/tests/auto/render/qrendercapture/tst_qrendercapture.cpp
@@ -72,17 +72,11 @@ private Q_SLOTS:
         QScopedPointer<Qt3DRender::QRenderCaptureReply> reply(renderCapture->requestCapture(QRect(10, 15, 20, 50)));
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 1);
-        Qt3DCore::QPropertyUpdatedChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>();
-        QCOMPARE(change->propertyName(), "renderCaptureRequest");
-        QCOMPARE(change->subjectId(),renderCapture->id());
-        QCOMPARE(change->type(), Qt3DCore::PropertyUpdated);
-        QVERIFY(change->value().canConvert<Qt3DRender::QRenderCaptureRequest>());
-        const Qt3DRender::QRenderCaptureRequest request = change->value().value<Qt3DRender::QRenderCaptureRequest>();
-        QCOMPARE(request.captureId, 1);
-        QCOMPARE(request.rect, QRect(10, 15, 20, 50));
-
-        arbiter.events.clear();
+        QCOMPARE(arbiter.events.size(), 0);
+        QCOMPARE(arbiter.dirtyNodes.size(), 1);
+        QCOMPARE(arbiter.dirtyNodes.front(), renderCapture.data());
+
+        arbiter.dirtyNodes.clear();
     }
 
     void checkRenderCaptureReply()
diff --git a/tests/auto/render/rendercapture/tst_rendercapture.cpp b/tests/auto/render/rendercapture/tst_rendercapture.cpp
index 78b792b01..194c5cd24 100644
--- a/tests/auto/render/rendercapture/tst_rendercapture.cpp
+++ b/tests/auto/render/rendercapture/tst_rendercapture.cpp
@@ -49,7 +49,7 @@ private Q_SLOTS:
 
         // WHEN
         backend.setRenderer(&renderer);
-        simulateInitialization(&frontend, &backend);
+        simulateInitializationSync(&frontend, &backend);
 
         // THEN
         QVERIFY(!backend.peerId().isNull());
@@ -61,34 +61,33 @@ private Q_SLOTS:
     void checkEnabledPropertyChange()
     {
         // GIVEN
+        Qt3DRender::QRenderCapture frontend;
         Qt3DRender::Render::RenderCapture renderCapture;
         TestRenderer renderer;
         renderCapture.setRenderer(&renderer);
+        simulateInitializationSync(&frontend, &renderCapture);
 
         // WHEN
-        Qt3DCore::QPropertyUpdatedChangePtr change(new Qt3DCore::QPropertyUpdatedChange(renderCapture.peerId()));
-        change->setPropertyName(QByteArrayLiteral("enabled"));
-        change->setValue(QVariant::fromValue(true));
-        sceneChangeEvent(&renderCapture, change);
+        frontend.setEnabled(false);
+        renderCapture.syncFromFrontEnd(&frontend, false);
 
         // THEN
-        QCOMPARE(renderCapture.isEnabled(), true);
+        QCOMPARE(renderCapture.isEnabled(), false);
         QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::FrameGraphDirty);
     }
 
     void checkReceiveRenderCaptureRequest()
     {
         // GIVEN
+        Qt3DRender::QRenderCapture frontend;
         Qt3DRender::Render::RenderCapture renderCapture;
         TestRenderer renderer;
         renderCapture.setRenderer(&renderer);
-        renderCapture.setEnabled(true);
+        simulateInitializationSync(&frontend, &renderCapture);
 
         // WHEN
-        Qt3DCore::QPropertyUpdatedChangePtr change(new Qt3DCore::QPropertyUpdatedChange(renderCapture.peerId()));
-        change->setPropertyName(QByteArrayLiteral("renderCaptureRequest"));
-        change->setValue(QVariant::fromValue(32));
-        sceneChangeEvent(&renderCapture, change);
+        frontend.requestCapture();
+        renderCapture.syncFromFrontEnd(&frontend, false);
 
         // THEN
         QCOMPARE(renderCapture.wasCaptureRequested(), true);