Update LoadSceneJob to use direct sync

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

3 files changed, 13 insertions, 165 deletions

diff --git a/tests/auto/render/loadscenejob/tst_loadscenejob.cpp b/tests/auto/render/loadscenejob/tst_loadscenejob.cpp
index 66c9271f7..044c3e0f4 100644
--- a/tests/auto/render/loadscenejob/tst_loadscenejob.cpp
+++ b/tests/auto/render/loadscenejob/tst_loadscenejob.cpp
@@ -148,27 +148,9 @@ private Q_SLOTS:
         loadSceneJob.run();
 
         // THEN
-        QCOMPARE(arbiter.events.count(), 4);
-        auto change = arbiter.events.at(0).staticCast<Qt3DCore::QPropertyUpdatedChange>();
-        QCOMPARE(change->subjectId(), scene->peerId());
-        QCOMPARE(change->propertyName(), "status");
-        QCOMPARE(change->value().value<Qt3DRender::QSceneLoader::Status>(), Qt3DRender::QSceneLoader::None);
-
-        change = arbiter.events.at(1).staticCast<Qt3DCore::QPropertyUpdatedChange>();
-        QCOMPARE(change->subjectId(), scene->peerId());
-        QCOMPARE(change->propertyName(), "status");
-        QCOMPARE(change->value().value<Qt3DRender::QSceneLoader::Status>(), Qt3DRender::QSceneLoader::Loading);
-
-        change = arbiter.events.at(2).staticCast<Qt3DCore::QPropertyUpdatedChange>();
-        QCOMPARE(change->subjectId(), scene->peerId());
-        QCOMPARE(change->propertyName(), "scene");
-        QVERIFY(change->value().value<Qt3DCore::QEntity *>() != nullptr);
-        delete change->value().value<Qt3DCore::QEntity *>();
-
-        change = arbiter.events.at(3).staticCast<Qt3DCore::QPropertyUpdatedChange>();
-        QCOMPARE(change->subjectId(), scene->peerId());
-        QCOMPARE(change->propertyName(), "status");
-        QCOMPARE(change->value().value<Qt3DRender::QSceneLoader::Status>(), Qt3DRender::QSceneLoader::Ready);
+        Qt3DRender::Render::LoadSceneJobPrivate *dJob = static_cast<decltype(dJob)>(Qt3DCore::QAspectJobPrivate::get(&loadSceneJob));
+        QCOMPARE(dJob->m_status, Qt3DRender::QSceneLoader::Ready);
+        QVERIFY(dJob->m_sceneSubtree != nullptr);
     }
 
     void checkEmptySource()
@@ -192,21 +174,9 @@ private Q_SLOTS:
         loadSceneJob.run();
 
         // THEN
-        QCOMPARE(arbiter.events.count(), 3);
-        auto change = arbiter.events.at(0).staticCast<Qt3DCore::QPropertyUpdatedChange>();
-        QCOMPARE(change->subjectId(), scene->peerId());
-        QCOMPARE(change->propertyName(), "status");
-        QCOMPARE(change->value().value<Qt3DRender::QSceneLoader::Status>(), Qt3DRender::QSceneLoader::None);
-
-        change = arbiter.events.at(1).staticCast<Qt3DCore::QPropertyUpdatedChange>();
-        QCOMPARE(change->subjectId(), scene->peerId());
-        QCOMPARE(change->propertyName(), "scene");
-        QVERIFY(change->value().value<Qt3DCore::QEntity *>() == nullptr);
-
-        change = arbiter.events.at(2).staticCast<Qt3DCore::QPropertyUpdatedChange>();
-        QCOMPARE(change->subjectId(), scene->peerId());
-        QCOMPARE(change->propertyName(), "status");
-        QCOMPARE(change->value().value<Qt3DRender::QSceneLoader::Status>(), Qt3DRender::QSceneLoader::None);
+        Qt3DRender::Render::LoadSceneJobPrivate *dJob = static_cast<decltype(dJob)>(Qt3DCore::QAspectJobPrivate::get(&loadSceneJob));
+        QCOMPARE(dJob->m_status, Qt3DRender::QSceneLoader::None);
+        QVERIFY(dJob->m_sceneSubtree == nullptr);
     }
 
     void checkRunValidSourceUnsupportedFormat()
@@ -233,21 +203,9 @@ private Q_SLOTS:
         loadSceneJob.run();
 
         // THEN
-        QCOMPARE(arbiter.events.count(), 3);
-        auto change = arbiter.events.at(0).staticCast<Qt3DCore::QPropertyUpdatedChange>();
-        QCOMPARE(change->subjectId(), scene->peerId());
-        QCOMPARE(change->propertyName(), "status");
-        QCOMPARE(change->value().value<Qt3DRender::QSceneLoader::Status>(), Qt3DRender::QSceneLoader::None);
-
-        change = arbiter.events.at(1).staticCast<Qt3DCore::QPropertyUpdatedChange>();
-        QCOMPARE(change->subjectId(), scene->peerId());
-        QCOMPARE(change->propertyName(), "scene");
-        QVERIFY(change->value().value<Qt3DCore::QEntity *>() == nullptr);
-
-        change = arbiter.events.at(2).staticCast<Qt3DCore::QPropertyUpdatedChange>();
-        QCOMPARE(change->subjectId(), scene->peerId());
-        QCOMPARE(change->propertyName(), "status");
-        QCOMPARE(change->value().value<Qt3DRender::QSceneLoader::Status>(), Qt3DRender::QSceneLoader::Error);
+        Qt3DRender::Render::LoadSceneJobPrivate *dJob = static_cast<decltype(dJob)>(Qt3DCore::QAspectJobPrivate::get(&loadSceneJob));
+        QCOMPARE(dJob->m_status, Qt3DRender::QSceneLoader::Error);
+        QVERIFY(dJob->m_sceneSubtree == nullptr);
     }
 
     void checkRunErrorAtLoading()
@@ -271,22 +229,10 @@ private Q_SLOTS:
         loadSceneJob.run();
 
         // THEN
-        QCOMPARE(arbiter.events.count(), 3);
-        auto change = arbiter.events.at(0).staticCast<Qt3DCore::QPropertyUpdatedChange>();
-        QCOMPARE(change->subjectId(), scene->peerId());
-        QCOMPARE(change->propertyName(), "status");
-        QCOMPARE(change->value().value<Qt3DRender::QSceneLoader::Status>(), Qt3DRender::QSceneLoader::None);
-
-        change = arbiter.events.at(1).staticCast<Qt3DCore::QPropertyUpdatedChange>();
-        QCOMPARE(change->subjectId(), scene->peerId());
-        QCOMPARE(change->propertyName(), "scene");
-        QVERIFY(change->value().value<Qt3DCore::QEntity *>() == nullptr);
-        delete change->value().value<Qt3DCore::QEntity *>();
-
-        change = arbiter.events.at(2).staticCast<Qt3DCore::QPropertyUpdatedChange>();
-        QCOMPARE(change->subjectId(), scene->peerId());
-        QCOMPARE(change->propertyName(), "status");
-        QCOMPARE(change->value().value<Qt3DRender::QSceneLoader::Status>(), Qt3DRender::QSceneLoader::Error);
+        // THEN
+        Qt3DRender::Render::LoadSceneJobPrivate *dJob = static_cast<decltype(dJob)>(Qt3DCore::QAspectJobPrivate::get(&loadSceneJob));
+        QCOMPARE(dJob->m_status, Qt3DRender::QSceneLoader::Error);
+        QVERIFY(dJob->m_sceneSubtree == nullptr);
     }
 };
 
diff --git a/tests/auto/render/qsceneloader/tst_qsceneloader.cpp b/tests/auto/render/qsceneloader/tst_qsceneloader.cpp
index 381960c42..9336a0b2e 100644
--- a/tests/auto/render/qsceneloader/tst_qsceneloader.cpp
+++ b/tests/auto/render/qsceneloader/tst_qsceneloader.cpp
@@ -137,59 +137,6 @@ private Q_SLOTS:
         arbiter.dirtyNodes.clear();
     }
 
-    // DEPRECATED
-//    void checkStatusPropertyUpdate()
-//    {
-//        // GIVEN
-//        qRegisterMetaType<Qt3DRender::QSceneLoader::Status>("Status");
-//        TestArbiter arbiter;
-//        QScopedPointer<Qt3DRender::QSceneLoader> sceneLoader(new Qt3DRender::QSceneLoader());
-//        arbiter.setArbiterOnNode(sceneLoader.data());
-//        QSignalSpy spy(sceneLoader.data(), SIGNAL(statusChanged(Status)));
-
-
-//        // WHEN
-//        const Qt3DRender::QSceneLoader::Status newStatus = Qt3DRender::QSceneLoader::Ready;
-//        sceneLoader->setStatus(newStatus);
-
-//        // THEN
-//        QVERIFY(arbiter.events.empty());
-//        QCOMPARE(spy.count(), 1);
-
-//        spy.clear();
-//    }
-
-    void checkPropertyChanges()
-    {
-        // GIVEN
-        Qt3DCore::QScene scene;
-        Qt3DCore::QEntity rootEntity;
-        QScopedPointer<Qt3DRender::QSceneLoader> sceneLoader(new Qt3DRender::QSceneLoader());
-        Qt3DCore::QNodePrivate::get(&rootEntity)->setScene(&scene);
-        Qt3DCore::QNodePrivate::get(sceneLoader.data())->setScene(&scene);
-        rootEntity.addComponent(sceneLoader.data());
-
-        // WHEN
-        Qt3DCore::QEntity backendCreatedSubtree;
-        Qt3DCore::QPropertyUpdatedChangePtr valueChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId()));
-        valueChange->setPropertyName("scene");
-        valueChange->setValue(QVariant::fromValue(&backendCreatedSubtree));
-        sceneLoader->sceneChangeEvent(valueChange);
-
-        // THEN
-        QCOMPARE(static_cast<Qt3DRender::QSceneLoaderPrivate *>(Qt3DCore::QNodePrivate::get(sceneLoader.data()))->m_subTreeRoot, &backendCreatedSubtree);
-
-        // WHEN
-        const Qt3DRender::QSceneLoader::Status newStatus = Qt3DRender::QSceneLoader::Ready;
-        valueChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId());
-        valueChange->setPropertyName("status");
-        valueChange->setValue(QVariant::fromValue(newStatus));
-        sceneLoader->sceneChangeEvent(valueChange);
-
-        // THEN
-        QCOMPARE(sceneLoader->status(), newStatus);
-    }
-
     void checkEntities()
     {
         // GIVEN
diff --git a/tests/auto/render/sceneloader/tst_sceneloader.cpp b/tests/auto/render/sceneloader/tst_sceneloader.cpp
index e5ea8b6c1..d146abfcc 100644
--- a/tests/auto/render/sceneloader/tst_sceneloader.cpp
+++ b/tests/auto/render/sceneloader/tst_sceneloader.cpp
@@ -130,51 +130,6 @@ private Q_SLOTS:
         QCOMPARE(sceneLoader.isEnabled(), false);
     }
 
-    void checkSubtreeTransmission()
-    {
-        // GIVEN
-        TestRenderer renderer;
-        TestArbiter arbiter;
-        Qt3DRender::Render::Scene sceneLoader;
-
-        Qt3DCore::QBackendNodePrivate::get(&sceneLoader)->setArbiter(&arbiter);
-        sceneLoader.setRenderer(&renderer);
-
-        // WHEN
-        Qt3DCore::QEntity subtree;
-        sceneLoader.setSceneSubtree(&subtree);
-
-        // THEN
-        Qt3DCore::QPropertyUpdatedChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>();
-        QCOMPARE(arbiter.events.count(), 1);
-        QCOMPARE(change->propertyName(), "scene");
-        QCOMPARE(change->value().value<Qt3DCore::QEntity *>(), &subtree);
-
-        arbiter.events.clear();
-    }
-
-    void checkStatusTransmission()
-    {
-        // GIVEN
-        TestRenderer renderer;
-        TestArbiter arbiter;
-        Qt3DRender::Render::Scene sceneLoader;
-
-        Qt3DCore::QBackendNodePrivate::get(&sceneLoader)->setArbiter(&arbiter);
-        sceneLoader.setRenderer(&renderer);
-
-        // WHEN
-        sceneLoader.setStatus(Qt3DRender::QSceneLoader::Ready);
-
-        // THEN
-        Qt3DCore::QPropertyUpdatedChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>();
-        QCOMPARE(arbiter.events.count(), 1);
-        QCOMPARE(change->propertyName(), "status");
-        QCOMPARE(change->value().value<Qt3DRender::QSceneLoader::Status>(), Qt3DRender::QSceneLoader::Ready);
-
-        arbiter.events.clear();
-    }
-
     void checkProcessEmptyPath()
     {
         // GIVEN