QNode PropertyTrackMode cleanup

Task-number: QTBUG-58897
Change-Id: Ie92c26e7b34ea7730461786f484ff50b003f747a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

6 files changed, 113 insertions, 1 deletions

diff --git a/tests/auto/quick3d/3dcore/3dcore.qml b/tests/auto/quick3d/3dcore/3dcore.qml
index 1d9d885ff..df9dd429b 100644
--- a/tests/auto/quick3d/3dcore/3dcore.qml
+++ b/tests/auto/quick3d/3dcore/3dcore.qml
@@ -28,6 +28,7 @@
 
 
 import Qt3D.Core 2.0 as QQ3Core20
+import Qt3D.Core 2.9 as QQ3Core29
 import QtQuick 2.0
 
 Item {
@@ -40,4 +41,5 @@ Item {
     QQ3Core20.Transform {}                   //Qt3DCore::QTransform
     QQ3Core20.QuaternionAnimation {}         //Qt3DCore::Quick::QQuaternionAnimation
 
+    QQ3Core29.Entity {}                      //Qt3DCore::QEntity, Qt3DCore::Quick::Quick3DEntity
 }
diff --git a/tests/auto/quick3d/quick3d.pro b/tests/auto/quick3d/quick3d.pro
index 8abe04550..dd67a3ef4 100644
--- a/tests/auto/quick3d/quick3d.pro
+++ b/tests/auto/quick3d/quick3d.pro
@@ -7,5 +7,6 @@ qtConfig(private_tests) {
         3drender \
         3dinput \
         3dcore \
-        quick3dbuffer
+        quick3dbuffer \
+        quick3dnode
 }
diff --git a/tests/auto/quick3d/quick3dnode/quick3dnode.pro b/tests/auto/quick3d/quick3dnode/quick3dnode.pro
new file mode 100644
index 000000000..5b3038c42
--- /dev/null
+++ b/tests/auto/quick3d/quick3dnode/quick3dnode.pro
@@ -0,0 +1,13 @@
+TEMPLATE = app
+
+TARGET = tst_quick3dnode
+
+QT += 3dcore 3dcore-private 3drender 3drender-private 3dquick 3dquick-private 3dquickrender-private testlib
+
+CONFIG += testcase
+
+include(../../render/qmlscenereader/qmlscenereader.pri)
+
+SOURCES += tst_quick3dnode.cpp
+
+RESOURCES += quick3dnode.qrc
diff --git a/tests/auto/quick3d/quick3dnode/quick3dnode.qrc b/tests/auto/quick3d/quick3dnode/quick3dnode.qrc
new file mode 100644
index 000000000..afdbbbb66
--- /dev/null
+++ b/tests/auto/quick3d/quick3dnode/quick3dnode.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>quick3dnodev9.qml</file>
+    </qresource>
+</RCC>
diff --git a/tests/auto/quick3d/quick3dnode/quick3dnodev9.qml b/tests/auto/quick3d/quick3dnode/quick3dnodev9.qml
new file mode 100644
index 000000000..5429faf4e
--- /dev/null
+++ b/tests/auto/quick3d/quick3dnode/quick3dnodev9.qml
@@ -0,0 +1,36 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 Paul Lemire <paul.lemire350@gmail.com>
+** 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$
+**
+****************************************************************************/
+
+import Qt3D.Core 2.9
+
+Entity  {
+    propertyTrackingOverrides: {
+                                    "enabled": Entity.DontTrackValues,
+                                    "displacement": Entity.TrackFinalValues
+                               }
+}
diff --git a/tests/auto/quick3d/quick3dnode/tst_quick3dnode.cpp b/tests/auto/quick3d/quick3dnode/tst_quick3dnode.cpp
new file mode 100644
index 000000000..38bf46a7a
--- /dev/null
+++ b/tests/auto/quick3d/quick3dnode/tst_quick3dnode.cpp
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 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 <Qt3DQuick/private/quick3dnode_p.h>
+#include <QObject>
+#include <qmlscenereader.h>
+
+class tst_Quick3DNode : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+
+    void checkPropertyTrackingOverrides_V9()
+    {
+        // GIVEN
+        QmlSceneReader sceneReader(QUrl("qrc:/quick3dnodev9.qml"));
+
+        // THEN
+        QVERIFY(sceneReader.root() != nullptr);
+        Qt3DCore::QNode *node = static_cast<Qt3DCore::QNode *>(sceneReader.root());
+        QCOMPARE(node->propertyTracking(QLatin1String("enabled")), Qt3DCore::QNode::DontTrackValues);
+        QCOMPARE(node->propertyTracking(QLatin1String("displacement")), Qt3DCore::QNode::TrackFinalValues);
+    }
+};
+
+QTEST_MAIN(tst_Quick3DNode)
+
+#include "tst_quick3dnode.moc"