Fix SortPolicy backend node parenting

Also comes with unit tests showing the bug and testing the basic
SortPolicy node behavior.

Change-Id: Ied522dcce4faaa7c6750c289f6aafb18f92ffc74
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

3 files changed, 120 insertions, 1 deletions

diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro
index 7cd682e13..9f8798314 100644
--- a/tests/auto/render/render.pro
+++ b/tests/auto/render/render.pro
@@ -50,5 +50,6 @@ contains(QT_CONFIG, private_tests) {
         filterentitybycomponent \
         genericlambdajob \
         qgraphicsapifilter \
-        qrendersurfaceselector
+        qrendersurfaceselector \
+        sortpolicy
 }
diff --git a/tests/auto/render/sortpolicy/sortpolicy.pro b/tests/auto/render/sortpolicy/sortpolicy.pro
new file mode 100644
index 000000000..18b28cff7
--- /dev/null
+++ b/tests/auto/render/sortpolicy/sortpolicy.pro
@@ -0,0 +1,13 @@
+TEMPLATE = app
+
+TARGET = tst_sortpolicy
+
+QT += 3dcore 3dcore-private 3drender 3drender-private testlib
+
+CONFIG += testcase
+
+SOURCES += \
+    tst_sortpolicy.cpp
+
+include(../../core/common/common.pri)
+include(../commons/commons.pri)
diff --git a/tests/auto/render/sortpolicy/tst_sortpolicy.cpp b/tests/auto/render/sortpolicy/tst_sortpolicy.cpp
new file mode 100644
index 000000000..8cab1a9c4
--- /dev/null
+++ b/tests/auto/render/sortpolicy/tst_sortpolicy.cpp
@@ -0,0 +1,105 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QTest>
+#include <qbackendnodetester.h>
+#include <Qt3DRender/private/sortpolicy_p.h>
+#include <Qt3DCore/qpropertyupdatedchange.h>
+#include "testrenderer.h"
+
+class tst_SortPolicy : public Qt3DCore::QBackendNodeTester
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void checkInitialState()
+    {
+        // GIVEN
+        TestRenderer renderer;
+        Qt3DRender::Render::SortPolicy backendNode;
+        backendNode.setRenderer(&renderer);
+
+        // THEN
+        QVERIFY(backendNode.peerId().isNull());
+        QVERIFY(backendNode.parentId().isNull());
+        QVERIFY(backendNode.sortTypes().isEmpty());
+    }
+
+    void checkPeerPropertyMirroring()
+    {
+        // GIVEN
+        Qt3DRender::QFrameGraphNode parent;
+        auto parentBackend = new Qt3DRender::Render::FrameGraphNode;
+        simulateInitialization(&parent, parentBackend);
+
+        Qt3DRender::Render::FrameGraphManager manager;
+        manager.appendNode(parent.id(), parentBackend);
+
+        const auto sortTypes = QVector<Qt3DRender::QSortPolicy::SortType>() << Qt3DRender::QSortPolicy::BackToFront
+                                                                            << Qt3DRender::QSortPolicy::Material;
+        Qt3DRender::Render::SortPolicy backendNode;
+        backendNode.setFrameGraphManager(&manager);
+        Qt3DRender::QSortPolicy sortPolicy(&parent);
+        sortPolicy.setSortTypes(sortTypes);
+
+        // WHEN
+        simulateInitialization(&sortPolicy, &backendNode);
+
+        // THEN
+        QCOMPARE(backendNode.peerId(), sortPolicy.id());
+        QCOMPARE(backendNode.parentId(), parent.id());
+        QCOMPARE(backendNode.sortTypes(), sortTypes);
+    }
+
+    void checkPropertyChanges()
+    {
+        // GIVEN
+        const auto sortTypes = QVector<Qt3DRender::QSortPolicy::SortType>() << Qt3DRender::QSortPolicy::BackToFront
+                                                                            << Qt3DRender::QSortPolicy::Material;
+        TestRenderer renderer;
+        Qt3DRender::Render::SortPolicy backendNode;
+        backendNode.setRenderer(&renderer);
+
+        // WHEN
+        auto sortTypeInts = QVector<int>();
+        std::transform(sortTypes.constBegin(), sortTypes.constEnd(),
+                       std::back_inserter(sortTypeInts),
+                       [] (Qt3DRender::QSortPolicy::SortType type) -> int { return type; });
+        Qt3DCore::QPropertyUpdatedChangePtr updateChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId()));
+        updateChange->setValue(QVariant::fromValue(sortTypeInts));
+        updateChange->setPropertyName("sortTypes");
+        backendNode.sceneChangeEvent(updateChange);
+
+        // THEN
+        QCOMPARE(backendNode.sortTypes(), sortTypes);
+    }
+};
+
+
+QTEST_APPLESS_MAIN(tst_SortPolicy)
+
+#include "tst_sortpolicy.moc"