QMaterial: remove NodeAdded/Remove notifications on Effect

Rely on the parent being set for inline declaration and the emit effectChanged
to automatically send notifications.

Updated unit tests accordingly.

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

2 files changed, 27 insertions, 9 deletions

diff --git a/tests/auto/render/material/tst_material.cpp b/tests/auto/render/material/tst_material.cpp
index abf74c823..48733d03b 100644
--- a/tests/auto/render/material/tst_material.cpp
+++ b/tests/auto/render/material/tst_material.cpp
@@ -59,6 +59,7 @@ private slots:
     void shouldHavePropertiesMirroringFromItsPeer();
     void shouldHandleParametersPropertyChange();
     void shouldHandleEnablePropertyChange();
+    void shouldHandleEffectPropertyChange();
 };
 
 
@@ -181,6 +182,23 @@ void tst_RenderMaterial::shouldHandleEnablePropertyChange()
 
     // THEN
     QVERIFY(backend.isEnabled());
+
+}
+
+void tst_RenderMaterial::shouldHandleEffectPropertyChange()
+{
+    // GIVEN
+    Material backend;
+
+    // WHEN
+    QScenePropertyChangePtr updateChange(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
+    Qt3DCore::QNodeId effectId = Qt3DCore::QNodeId::createId();
+    updateChange->setValue(QVariant::fromValue(effectId));
+    updateChange->setPropertyName("effect");
+    backend.sceneChangeEvent(updateChange);
+
+    // THEN
+    QCOMPARE(backend.effect(), effectId);
 }
 
 QTEST_APPLESS_MAIN(tst_RenderMaterial)
diff --git a/tests/auto/render/qmaterial/tst_qmaterial.cpp b/tests/auto/render/qmaterial/tst_qmaterial.cpp
index b12420a5d..3edeb33e1 100644
--- a/tests/auto/render/qmaterial/tst_qmaterial.cpp
+++ b/tests/auto/render/qmaterial/tst_qmaterial.cpp
@@ -87,6 +87,12 @@ class tst_QMaterial : public Qt3DCore::QNode
 {
     Q_OBJECT
 public:
+    tst_QMaterial()
+        : Qt3DCore::QNode()
+    {
+        qRegisterMetaType<Qt3DRender::QEffect*>("Qt3DRender::QEffect*");
+    }
+
     ~tst_QMaterial()
     {
         QNode::cleanup();
@@ -267,7 +273,7 @@ private Q_SLOTS:
         Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "effect");
         QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), effect.id());
-        QCOMPARE(change->type(), Qt3DCore::NodeAdded);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -276,21 +282,15 @@ private Q_SLOTS:
         TestArbiter arbiter2(material2.data());
 
         // WHEN
-        Qt3DRender::QEffect *oldEffect = material2->effect();
         material2->setEffect(&effect);
         QCoreApplication::processEvents();
 
         // THEN
-        QCOMPARE(arbiter2.events.size(), 2);
+        QCOMPARE(arbiter2.events.size(), 1);
         change = arbiter2.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "effect");
-        QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), oldEffect->id());
-        QCOMPARE(change->type(), Qt3DCore::NodeRemoved);
-
-        change = arbiter2.events.last().staticCast<Qt3DCore::QScenePropertyChange>();
-        QCOMPARE(change->propertyName(), "effect");
         QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), effect.id());
-        QCOMPARE(change->type(), Qt3DCore::NodeAdded);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
     }
 
     void checkDynamicParametersAddedUpdates()