Fix BV tests following changes in BV propagation

Pick-to: 6.2 6.1
Change-Id: Ifa53378c930b071231dab3d293e8bb1ed4c71b46
Reviewed-by: Mike Krus <mike.krus@kdab.com>

3 files changed, 27 insertions, 18 deletions

diff --git a/tests/auto/render/boundingsphere/tst_boundingsphere.cpp b/tests/auto/render/boundingsphere/tst_boundingsphere.cpp
index 93612fe05..db1fe3e99 100644
--- a/tests/auto/render/boundingsphere/tst_boundingsphere.cpp
+++ b/tests/auto/render/boundingsphere/tst_boundingsphere.cpp
@@ -181,14 +181,17 @@ void runRequiredJobs(Qt3DRender::TestAspect *test)
 
     Qt3DCore::CalculateBoundingVolumeJob calcCBVolume(nullptr);
     calcCBVolume.setRoot(test->root());
+
+    Qt3DRender::Render::CalculateBoundingVolumeJobPtr calcRBVolume = Qt3DRender::Render::CalculateBoundingVolumeJobPtr::create();
+    calcRBVolume->setManagers(test->nodeManagers());
+    calcRBVolume->setFrontEndNodeManager(test);
+    calcRBVolume->setRoot(test->sceneRoot());
+
+    calcCBVolume.addWatcher(calcRBVolume);
+
     calcCBVolume.run();
     calcCBVolume.postFrame(nullptr);
-
-    Qt3DRender::Render::CalculateBoundingVolumeJob calcRBVolume;
-    calcRBVolume.setManagers(test->nodeManagers());
-    calcRBVolume.setFrontEndNodeManager(test);
-    calcRBVolume.setRoot(test->sceneRoot());
-    calcRBVolume.run();
+    calcRBVolume->run();
 
     Qt3DRender::Render::UpdateWorldBoundingVolumeJob updateWorldBVolume;
     updateWorldBVolume.setManager(test->nodeManagers()->renderNodesManager());
diff --git a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp
index 0f942510c..98bf268bb 100644
--- a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp
+++ b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp
@@ -211,14 +211,17 @@ void runRequiredJobs(Qt3DRender::TestAspect *test)
 
     Qt3DCore::CalculateBoundingVolumeJob calcCBVolume(nullptr);
     calcCBVolume.setRoot(test->root());
+
+    Qt3DRender::Render::CalculateBoundingVolumeJobPtr calcRBVolume = Qt3DRender::Render::CalculateBoundingVolumeJobPtr::create();
+    calcRBVolume->setManagers(test->nodeManagers());
+    calcRBVolume->setFrontEndNodeManager(test);
+    calcRBVolume->setRoot(test->sceneRoot());
+
+    calcCBVolume.addWatcher(calcRBVolume);
+
     calcCBVolume.run();
     calcCBVolume.postFrame(nullptr);
-
-    Qt3DRender::Render::CalculateBoundingVolumeJob calcRBVolume;
-    calcRBVolume.setManagers(test->nodeManagers());
-    calcRBVolume.setFrontEndNodeManager(test);
-    calcRBVolume.setRoot(test->sceneRoot());
-    calcRBVolume.run();
+    calcRBVolume->run();
 
     Qt3DRender::Render::UpdateWorldBoundingVolumeJob updateWorldBVolume;
     updateWorldBVolume.setManager(test->nodeManagers()->renderNodesManager());
diff --git a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp
index 37c2d20d7..71b6427a1 100644
--- a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp
+++ b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp
@@ -209,14 +209,17 @@ void runRequiredJobs(Qt3DRender::TestAspect *test)
 
     Qt3DCore::CalculateBoundingVolumeJob calcCBVolume(nullptr);
     calcCBVolume.setRoot(test->root());
+
+    Qt3DRender::Render::CalculateBoundingVolumeJobPtr calcRBVolume = Qt3DRender::Render::CalculateBoundingVolumeJobPtr::create();
+    calcRBVolume->setManagers(test->nodeManagers());
+    calcRBVolume->setFrontEndNodeManager(test);
+    calcRBVolume->setRoot(test->sceneRoot());
+
+    calcCBVolume.addWatcher(calcRBVolume);
+
     calcCBVolume.run();
     calcCBVolume.postFrame(nullptr);
-
-    Qt3DRender::Render::CalculateBoundingVolumeJob calcRBVolume;
-    calcRBVolume.setManagers(test->nodeManagers());
-    calcRBVolume.setFrontEndNodeManager(test);
-    calcRBVolume.setRoot(test->sceneRoot());
-    calcRBVolume.run();
+    calcRBVolume->run();
 
     Qt3DRender::Render::UpdateWorldBoundingVolumeJob updateWorldBVolume;
     updateWorldBVolume.setManager(test->nodeManagers()->renderNodesManager());