From 688dcbbd21fde67a4970dc0c11a2526d0cbdc92b Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Wed, 10 Jun 2020 17:12:44 +0200 Subject: QNode: remove property tracking mode This serves no purpose since the synchronous synching was put in place. Change-Id: I4509cc348168d614388f73a26f8420b26629ace6 Reviewed-by: Mike Krus --- tests/auto/core/nodes/tst_nodes.cpp | 97 ------------- tests/auto/core/qscene/tst_qscene.cpp | 158 --------------------- tests/auto/quick3d/CMakeLists.txt | 1 - tests/auto/quick3d/quick3d.pro | 3 +- tests/auto/quick3d/quick3dnode/CMakeLists.txt | 40 ------ tests/auto/quick3d/quick3dnode/quick3dnode.pro | 13 -- tests/auto/quick3d/quick3dnode/quick3dnode.qrc | 5 - tests/auto/quick3d/quick3dnode/quick3dnodev9.qml | 36 ----- tests/auto/quick3d/quick3dnode/tst_quick3dnode.cpp | 55 ------- .../tst_updateshaderdatatransformjob.cpp | 4 +- 10 files changed, 3 insertions(+), 409 deletions(-) delete mode 100644 tests/auto/quick3d/quick3dnode/CMakeLists.txt delete mode 100644 tests/auto/quick3d/quick3dnode/quick3dnode.pro delete mode 100644 tests/auto/quick3d/quick3dnode/quick3dnode.qrc delete mode 100644 tests/auto/quick3d/quick3dnode/quick3dnodev9.qml delete mode 100644 tests/auto/quick3d/quick3dnode/tst_quick3dnode.cpp (limited to 'tests') diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp index 39560938a..d925cec15 100644 --- a/tests/auto/core/nodes/tst_nodes.cpp +++ b/tests/auto/core/nodes/tst_nodes.cpp @@ -53,7 +53,6 @@ public: ~tst_Nodes() {} private slots: - void initTestCase(); void defaultNodeConstruction(); void defaultComponentConstruction(); void defaultEntityConstrution(); @@ -99,8 +98,6 @@ private slots: void checkDefaultConstruction(); void checkPropertyChanges(); void checkEnabledUpdate(); - void checkPropertyTrackModeUpdate(); - void checkTrackedPropertyNamesUpdate(); void checkNodeRemovedFromDirtyListOnDestruction(); }; @@ -465,11 +462,6 @@ void verifyChildrenCreatedBeforeParents(Qt3DCore::QNode *root, TestAspect *aspec } } -void tst_Nodes::initTestCase() -{ - qRegisterMetaType("PropertyTrackingMode"); -} - void tst_Nodes::defaultNodeConstruction() { // GIVEN @@ -1551,7 +1543,6 @@ void tst_Nodes::checkDefaultConstruction() // THEN QCOMPARE(node.parentNode(), nullptr); QCOMPARE(node.isEnabled(), true); - QCOMPARE(node.defaultPropertyTrackingMode(), Qt3DCore::QNode::TrackFinalValues); } void tst_Nodes::checkPropertyChanges() @@ -1598,40 +1589,6 @@ void tst_Nodes::checkPropertyChanges() QCOMPARE(node.isEnabled(), newValue); QCOMPARE(spy.count(), 0); } - { - // WHEN - QSignalSpy spy(&node, SIGNAL(defaultPropertyTrackingModeChanged(PropertyTrackingMode))); - const Qt3DCore::QNode::PropertyTrackingMode newValue = Qt3DCore::QNode::TrackAllValues; - node.setDefaultPropertyTrackingMode(newValue); - - // THEN - QVERIFY(spy.isValid()); - QCOMPARE(node.defaultPropertyTrackingMode(), newValue); - QCOMPARE(spy.count(), 1); - - // WHEN - spy.clear(); - node.setDefaultPropertyTrackingMode(newValue); - - // THEN - QCOMPARE(node.defaultPropertyTrackingMode(), newValue); - QCOMPARE(spy.count(), 0); - } - { - // WHEN - const QString enabledPropertyName = QStringLiteral("enabled"); - node.setDefaultPropertyTrackingMode(Qt3DCore::QNode::DontTrackValues); - node.setPropertyTracking(enabledPropertyName, Qt3DCore::QNode::TrackAllValues); - - // THEN - QCOMPARE(node.propertyTracking(enabledPropertyName), Qt3DCore::QNode::TrackAllValues); - - // WHEN - node.clearPropertyTracking(enabledPropertyName); - - // THEN - QCOMPARE(node.propertyTracking(enabledPropertyName), Qt3DCore::QNode::DontTrackValues); - } } void tst_Nodes::checkEnabledUpdate() @@ -1662,60 +1619,6 @@ void tst_Nodes::checkEnabledUpdate() } -void tst_Nodes::checkPropertyTrackModeUpdate() -{ - // GIVEN - TestArbiter arbiter; - Qt3DCore::QNode node; - arbiter.setArbiterOnNode(&node); - - { - // WHEN - node.setDefaultPropertyTrackingMode(Qt3DCore::QNode::TrackAllValues); - QCoreApplication::processEvents(); - - // THEN -> this properties is non notifying - QCOMPARE(arbiter.dirtyNodes().size(), 0); - } - - { - // WHEN - node.setDefaultPropertyTrackingMode(Qt3DCore::QNode::TrackAllValues); - QCoreApplication::processEvents(); - - // THEN - QCOMPARE(arbiter.dirtyNodes().size(), 0); - } - -} - -void tst_Nodes::checkTrackedPropertyNamesUpdate() -{ - // GIVEN - TestArbiter arbiter; - Qt3DCore::QNode node; - arbiter.setArbiterOnNode(&node); - - { - // WHEN - node.setPropertyTracking(QStringLiteral("883"), Qt3DCore::QNode::TrackAllValues); - QCoreApplication::processEvents(); - - // THEN -> this properties is non notifying - QCOMPARE(arbiter.dirtyNodes().size(), 0); - } - - { - // WHEN - node.setPropertyTracking(QStringLiteral("883"), Qt3DCore::QNode::DontTrackValues); - QCoreApplication::processEvents(); - - // THEN - QCOMPARE(arbiter.dirtyNodes().size(), 0); - } - -} - void tst_Nodes::checkNodeRemovedFromDirtyListOnDestruction() { // GIVEN diff --git a/tests/auto/core/qscene/tst_qscene.cpp b/tests/auto/core/qscene/tst_qscene.cpp index 5a23dab48..7285beb1c 100644 --- a/tests/auto/core/qscene/tst_qscene.cpp +++ b/tests/auto/core/qscene/tst_qscene.cpp @@ -50,11 +50,6 @@ private slots: void addEntityForComponent(); void removeEntityForComponent(); void hasEntityForComponent(); - void setPropertyTrackData(); - void lookupNodePropertyTrackData(); - void removePropertyTrackData(); - void nodeSetAndUnsetPropertyTrackData(); - void nodeUpdatePropertyTrackData(); }; class tst_Node : public Qt3DCore::QNode @@ -349,159 +344,6 @@ void tst_QScene::hasEntityForComponent() QVERIFY(scene->hasEntityForComponent(components.at(i)->id(), entities.at(i)->id())); } -void tst_QScene::setPropertyTrackData() -{ - // GIVEN - Qt3DCore::QNodeId fakeNodeId = Qt3DCore::QNodeId::createId(); - QScopedPointer scene(new Qt3DCore::QScene); - QHash overridenTrackedProperties; - overridenTrackedProperties.insert(QStringLiteral("1340"), Qt3DCore::QNode::TrackAllValues); - - // WHEN - { - Qt3DCore::QScene::NodePropertyTrackData trackData; - trackData.trackedPropertiesOverrides = overridenTrackedProperties; - trackData.defaultTrackMode = Qt3DCore::QNode::DontTrackValues; - scene->setPropertyTrackDataForNode(fakeNodeId, trackData); - } - - // THEN - { - Qt3DCore::QScene::NodePropertyTrackData trackData = scene->lookupNodePropertyTrackData(fakeNodeId); - QCOMPARE(trackData.trackedPropertiesOverrides, overridenTrackedProperties); - QCOMPARE(trackData.defaultTrackMode, Qt3DCore::QNode::DontTrackValues); - } - - // WHEN - { - Qt3DCore::QScene::NodePropertyTrackData trackData; - trackData.trackedPropertiesOverrides.clear(); - trackData.defaultTrackMode = Qt3DCore::QNode::TrackFinalValues; - scene->setPropertyTrackDataForNode(fakeNodeId, trackData); - } - - // THEN - { - Qt3DCore::QScene::NodePropertyTrackData trackData = scene->lookupNodePropertyTrackData(fakeNodeId); - QCOMPARE(trackData.trackedPropertiesOverrides.size(), 0); - QCOMPARE(trackData.defaultTrackMode, Qt3DCore::QNode::TrackFinalValues); - } -} - -void tst_QScene::lookupNodePropertyTrackData() -{ - // GIVEN - QScopedPointer scene(new Qt3DCore::QScene); - Qt3DCore::QNodeId fakeNodeId = Qt3DCore::QNodeId::createId(); - - // THEN -> default value for non existent id - Qt3DCore::QScene::NodePropertyTrackData trackData = scene->lookupNodePropertyTrackData(fakeNodeId); - QCOMPARE(trackData.trackedPropertiesOverrides.size(), 0); - QCOMPARE(trackData.defaultTrackMode, Qt3DCore::QNode::TrackFinalValues); - - // WHEN - trackData.trackedPropertiesOverrides.insert(QStringLiteral("383"), Qt3DCore::QNode::TrackAllValues); - trackData.defaultTrackMode = Qt3DCore::QNode::DontTrackValues; - scene->setPropertyTrackDataForNode(fakeNodeId, trackData); - - trackData = scene->lookupNodePropertyTrackData(fakeNodeId); - QCOMPARE(trackData.trackedPropertiesOverrides.size(), 1); - QCOMPARE(trackData.defaultTrackMode, Qt3DCore::QNode::DontTrackValues); -} - -void tst_QScene::removePropertyTrackData() -{ - // GIVEN - QScopedPointer scene(new Qt3DCore::QScene); - Qt3DCore::QNodeId fakeNodeId = Qt3DCore::QNodeId::createId(); - - // WHEN - Qt3DCore::QScene::NodePropertyTrackData trackData; - trackData.trackedPropertiesOverrides.insert(QStringLiteral("1584"), Qt3DCore::QNode::TrackAllValues); - trackData.defaultTrackMode = Qt3DCore::QNode::DontTrackValues; - scene->setPropertyTrackDataForNode(fakeNodeId, trackData); - scene->removePropertyTrackDataForNode(fakeNodeId); - - // THEN -> default value for non existent id - trackData = scene->lookupNodePropertyTrackData(fakeNodeId); - QCOMPARE(trackData.trackedPropertiesOverrides.size(), 0); - QCOMPARE(trackData.defaultTrackMode, Qt3DCore::QNode::TrackFinalValues); -} - -void tst_QScene::nodeSetAndUnsetPropertyTrackData() -{ - // GIVEN - QScopedPointer scene(new Qt3DCore::QScene); - Qt3DCore::QNode parentNode; - Qt3DCore::QNodePrivate::get(&parentNode)->setScene(scene.data()); - - Qt3DCore::QNode *childNode = new Qt3DCore::QNode(); - childNode->setPropertyTracking(QStringLiteral("883"), Qt3DCore::QNode::TrackAllValues); - childNode->setDefaultPropertyTrackingMode(Qt3DCore::QNode::DontTrackValues); - - // WHEN - childNode->setParent(&parentNode); - QCoreApplication::processEvents(); - - // THEN - QCOMPARE(Qt3DCore::QNodePrivate::get(childNode)->m_scene, scene.data()); - Qt3DCore::QScene::NodePropertyTrackData trackData = scene->lookupNodePropertyTrackData(childNode->id()); - QCOMPARE(trackData.defaultTrackMode, Qt3DCore::QNode::DontTrackValues); - QCOMPARE(trackData.trackedPropertiesOverrides.size(), 1); - QCOMPARE(trackData.trackedPropertiesOverrides[QStringLiteral("883")], Qt3DCore::QNode::TrackAllValues); - - // WHEN - const Qt3DCore::QNodeId childNodeId = childNode->id(); - delete childNode; - QCoreApplication::processEvents(); - - // THEN -> default value for non existent id - trackData = scene->lookupNodePropertyTrackData(childNodeId); - QCOMPARE(trackData.trackedPropertiesOverrides.size(), 0); - QCOMPARE(trackData.defaultTrackMode, Qt3DCore::QNode::TrackFinalValues); -} - -void tst_QScene::nodeUpdatePropertyTrackData() -{ - // GIVEN - QScopedPointer scene(new Qt3DCore::QScene); - Qt3DCore::QNode parentNode; - Qt3DCore::QNodePrivate::get(&parentNode)->setScene(scene.data()); - - Qt3DCore::QNode *childNode = new Qt3DCore::QNode(); - const QString propertyName = QStringLiteral("883"); - childNode->setPropertyTracking(propertyName, Qt3DCore::QNode::TrackFinalValues); - childNode->setDefaultPropertyTrackingMode(Qt3DCore::QNode::DontTrackValues); - - // WHEN - childNode->setParent(&parentNode); - QCoreApplication::processEvents(); - - // THEN - QCOMPARE(Qt3DCore::QNodePrivate::get(childNode)->m_scene, scene.data()); - Qt3DCore::QScene::NodePropertyTrackData trackData = scene->lookupNodePropertyTrackData(childNode->id()); - QCOMPARE(trackData.defaultTrackMode, Qt3DCore::QNode::DontTrackValues); - QCOMPARE(trackData.trackedPropertiesOverrides.size(), 1); - QCOMPARE(trackData.trackedPropertiesOverrides[propertyName], Qt3DCore::QNode::TrackFinalValues); - - // WHEN - childNode->setDefaultPropertyTrackingMode(Qt3DCore::QNode::TrackAllValues); - - // THEN - trackData = scene->lookupNodePropertyTrackData(childNode->id()); - QCOMPARE(trackData.defaultTrackMode, Qt3DCore::QNode::TrackAllValues); - - // WHEN - const QString propertyName2 = QStringLiteral("Viper"); - childNode->setPropertyTracking(propertyName2, Qt3DCore::QNode::DontTrackValues); - - // THEN - trackData = scene->lookupNodePropertyTrackData(childNode->id()); - QCOMPARE(trackData.trackedPropertiesOverrides.size(), 2); - QCOMPARE(trackData.trackedPropertiesOverrides[propertyName], Qt3DCore::QNode::TrackFinalValues); - QCOMPARE(trackData.trackedPropertiesOverrides[propertyName2], Qt3DCore::QNode::DontTrackValues); -} - QTEST_MAIN(tst_QScene) #include "tst_qscene.moc" diff --git a/tests/auto/quick3d/CMakeLists.txt b/tests/auto/quick3d/CMakeLists.txt index 504b7b2e9..33855345a 100644 --- a/tests/auto/quick3d/CMakeLists.txt +++ b/tests/auto/quick3d/CMakeLists.txt @@ -7,5 +7,4 @@ if(QT_FEATURE_private_tests) add_subdirectory(3dinput) add_subdirectory(3dcore) add_subdirectory(quick3dbuffer) - add_subdirectory(quick3dnode) endif() diff --git a/tests/auto/quick3d/quick3d.pro b/tests/auto/quick3d/quick3d.pro index dd67a3ef4..8abe04550 100644 --- a/tests/auto/quick3d/quick3d.pro +++ b/tests/auto/quick3d/quick3d.pro @@ -7,6 +7,5 @@ qtConfig(private_tests) { 3drender \ 3dinput \ 3dcore \ - quick3dbuffer \ - quick3dnode + quick3dbuffer } diff --git a/tests/auto/quick3d/quick3dnode/CMakeLists.txt b/tests/auto/quick3d/quick3dnode/CMakeLists.txt deleted file mode 100644 index 520cec50a..000000000 --- a/tests/auto/quick3d/quick3dnode/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -# Generated from quick3dnode.pro. - -##################################################################### -## tst_quick3dnode Test: -##################################################################### - -qt_add_test(tst_quick3dnode - SOURCES - ../../render/qmlscenereader/qmlscenereader.cpp ../../render/qmlscenereader/qmlscenereader.h - tst_quick3dnode.cpp - INCLUDE_DIRECTORIES - ../../render/qmlscenereader - PUBLIC_LIBRARIES - Qt::3DCore - Qt::3DCorePrivate - Qt::3DQuick - Qt::3DQuickPrivate - Qt::3DQuickRenderPrivate - Qt::3DRender - Qt::3DRenderPrivate - Qt::CorePrivate - Qt::Gui - Qt::Qml -) - -# Resources: -set(quick3dnode_resource_files - "quick3dnodev9.qml" -) - -qt_add_resource(tst_quick3dnode "quick3dnode" - PREFIX - "/" - FILES - ${quick3dnode_resource_files} -) - - -#### Keys ignored in scope 1:.:.:quick3dnode.pro:: -# TEMPLATE = "app" diff --git a/tests/auto/quick3d/quick3dnode/quick3dnode.pro b/tests/auto/quick3d/quick3dnode/quick3dnode.pro deleted file mode 100644 index 5b3038c42..000000000 --- a/tests/auto/quick3d/quick3dnode/quick3dnode.pro +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index afdbbbb66..000000000 --- a/tests/auto/quick3d/quick3dnode/quick3dnode.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - quick3dnodev9.qml - - diff --git a/tests/auto/quick3d/quick3dnode/quick3dnodev9.qml b/tests/auto/quick3d/quick3dnode/quick3dnodev9.qml deleted file mode 100644 index 5429faf4e..000000000 --- a/tests/auto/quick3d/quick3dnode/quick3dnodev9.qml +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Paul Lemire -** 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 deleted file mode 100644 index 38bf46a7a..000000000 --- a/tests/auto/quick3d/quick3dnode/tst_quick3dnode.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** 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 -#include -#include -#include - -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(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" diff --git a/tests/auto/render/updateshaderdatatransformjob/tst_updateshaderdatatransformjob.cpp b/tests/auto/render/updateshaderdatatransformjob/tst_updateshaderdatatransformjob.cpp index 025138f3c..e59543154 100644 --- a/tests/auto/render/updateshaderdatatransformjob/tst_updateshaderdatatransformjob.cpp +++ b/tests/auto/render/updateshaderdatatransformjob/tst_updateshaderdatatransformjob.cpp @@ -206,7 +206,7 @@ private Q_SLOTS: const QHash &props = backendShaderData->properties(); // THEN - QCOMPARE(props.size(), 3); + QCOMPARE(props.size(), 2); QVERIFY(props.contains(QStringLiteral("eyePosition"))); QVERIFY(props.contains(QStringLiteral("eyePositionTransformed"))); @@ -249,7 +249,7 @@ private Q_SLOTS: const QHash &props = backendShaderData->properties(); // THEN - QCOMPARE(props.size(), 3); + QCOMPARE(props.size(), 2); QVERIFY(props.contains(QStringLiteral("position"))); QVERIFY(props.contains(QStringLiteral("positionTransformed"))); -- cgit v1.2.3