diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2015-05-08 17:14:17 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2015-05-14 14:10:29 +0000 |
commit | 4b42d218cada780a3ff5716b41c9f26f5b2d2d6b (patch) | |
tree | 8283a42470ba359a989f9e2b4599e4a156a672cd | |
parent | 062293f800946feb523dd7abbcd3e06863f8f9b2 (diff) |
Unit tests for RenderMesh
Set enabled to true by default on a RenderMesh
Change-Id: I269505ab74f05fa81dae5eceef4c0afe24f10031
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r-- | src/render/backend/rendermesh.cpp | 3 | ||||
-rw-r--r-- | src/render/backend/rendermesh_p.h | 2 | ||||
-rw-r--r-- | tests/auto/render/render.pro | 3 | ||||
-rw-r--r-- | tests/auto/render/rendermesh/rendermesh.pro | 9 | ||||
-rw-r--r-- | tests/auto/render/rendermesh/tst_rendermesh.cpp | 178 |
5 files changed, 193 insertions, 2 deletions
diff --git a/src/render/backend/rendermesh.cpp b/src/render/backend/rendermesh.cpp index 1fcd65dd4..839de8853 100644 --- a/src/render/backend/rendermesh.cpp +++ b/src/render/backend/rendermesh.cpp @@ -57,6 +57,7 @@ namespace Render { /*! * \class RenderMesh + * \internal * * Monitor a frontend Mesh for source changes. If the source is changed, * the QMeshData returned is either a valid QMeshData corresponding to the source @@ -70,6 +71,7 @@ RenderMesh::RenderMesh() : QBackendNode() , m_meshDirty(true) , m_meshDataManager(Q_NULLPTR) + , m_enabled(true) { } @@ -109,6 +111,7 @@ void RenderMesh::sceneChangeEvent(const QSceneChangePtr &e) QMeshData *RenderMesh::meshData() const { + Q_ASSERT(m_meshDataManager); return m_meshDataManager->data(m_meshDataHandle); } diff --git a/src/render/backend/rendermesh_p.h b/src/render/backend/rendermesh_p.h index 0a7f5e1fc..600c141a8 100644 --- a/src/render/backend/rendermesh_p.h +++ b/src/render/backend/rendermesh_p.h @@ -62,7 +62,7 @@ class RenderEntity; class RenderMaterial; class RenderTechnique; -class RenderMesh : public QBackendNode +class Q_AUTOTEST_EXPORT RenderMesh : public QBackendNode { public: RenderMesh(); diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro index 62583bbb7..5393ec79c 100644 --- a/tests/auto/render/render.pro +++ b/tests/auto/render/render.pro @@ -9,5 +9,6 @@ contains(QT_CONFIG, private_tests) { rendershader \ renderviewutils \ renderviews \ - rendermaterial + rendermaterial \ + rendermesh } diff --git a/tests/auto/render/rendermesh/rendermesh.pro b/tests/auto/render/rendermesh/rendermesh.pro new file mode 100644 index 000000000..c654f0dfa --- /dev/null +++ b/tests/auto/render/rendermesh/rendermesh.pro @@ -0,0 +1,9 @@ +TEMPLATE = app + +TARGET = tst_rendermesh + +QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib + +CONFIG += testcase + +SOURCES += tst_rendermesh.cpp diff --git a/tests/auto/render/rendermesh/tst_rendermesh.cpp b/tests/auto/render/rendermesh/tst_rendermesh.cpp new file mode 100644 index 000000000..e79b95371 --- /dev/null +++ b/tests/auto/render/rendermesh/tst_rendermesh.cpp @@ -0,0 +1,178 @@ +/**************************************************************************** +** +** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtTest/QTest> +#include <Qt3DRenderer/private/meshdatamanager_p.h> +#include <Qt3DRenderer/private/rendermesh_p.h> +#include <Qt3DRenderer/QAbstractMesh> +#include <Qt3DRenderer/QAbstractMeshFunctor> +#include <Qt3DRenderer/QCylinderMesh> +#include <Qt3DRenderer/QPlaneMesh> +#include <Qt3DRenderer/QCuboidMesh> +#include <Qt3DRenderer/QSphereMesh> +#include <Qt3DRenderer/QTorusMesh> +#include <Qt3DRenderer/QMesh> +#include <Qt3DCore/QScenePropertyChange> + + +using namespace Qt3D; +using namespace Qt3D::Render; + +class tst_RenderMesh : public QObject +{ + Q_OBJECT +public: + tst_RenderMesh() {} + +private slots: + void shouldHaveInitialState(); + void shouldHavePropertiesMirroringFromItsPeer_data(); + void shouldHavePropertiesMirroringFromItsPeer(); + void shouldHandleMeshFunctorPropertyChange(); + void shouldHandleEnablePropertyChange(); +}; + + +void tst_RenderMesh::shouldHaveInitialState() +{ + // GIVEN + RenderMesh backend; + + // THEN + QVERIFY(backend.meshFunctor().isNull()); + QVERIFY(backend.isEnabled()); +} + +void tst_RenderMesh::shouldHavePropertiesMirroringFromItsPeer_data() +{ + QTest::addColumn<QAbstractMesh *>("frontendMesh"); + + QTest::newRow("planeMesh") << (QAbstractMesh *)new QPlaneMesh(); + QTest::newRow("cuboidMesh") << (QAbstractMesh *)new QCuboidMesh(); + QTest::newRow("sphereMesh") << (QAbstractMesh *)new QSphereMesh(); + QTest::newRow("torusMesh") << (QAbstractMesh *)new QTorusMesh(); + QTest::newRow("cylinderMesh") << (QAbstractMesh *)new QCylinderMesh(); + QTest::newRow("mesh") << (QAbstractMesh *)new QMesh(); +} + +void tst_RenderMesh::shouldHavePropertiesMirroringFromItsPeer() +{ + // GIVEN + QFETCH(QAbstractMesh *, frontendMesh); + RenderMesh backend; + QScopedPointer<MeshDataManager> manager(new MeshDataManager()); + backend.setMeshDataManager(manager.data()); + + // WHEN + backend.setPeer(frontendMesh); + + // THEN + QVERIFY(backend.isEnabled() == frontendMesh->isEnabled()); + QVERIFY(backend.meshFunctor()); + QVERIFY(*backend.meshFunctor() == *frontendMesh->meshFunctor()); + + delete frontendMesh; +} + +void tst_RenderMesh::shouldHandleMeshFunctorPropertyChange() +{ + // GIVEN + RenderMesh backend; + QScopedPointer<MeshDataManager> manager(new MeshDataManager()); + backend.setMeshDataManager(manager.data()); + + QScopedPointer<QPlaneMesh> planeMesh(new QPlaneMesh()); + QScopedPointer<QSphereMesh> sphereMesh(new QSphereMesh()); + QAbstractMeshFunctorPtr meshFunctor(planeMesh->meshFunctor()); + + // THEN + QVERIFY(backend.meshFunctor() != meshFunctor); + + // WHEN + QScenePropertyChangePtr updateChange(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, QNodeId())); + + updateChange->setValue(QVariant::fromValue(meshFunctor)); + updateChange->setPropertyName("meshFunctor"); + backend.sceneChangeEvent(updateChange); + + // THEN + QVERIFY(backend.meshFunctor() == meshFunctor); + + // GIVEN + meshFunctor = sphereMesh->meshFunctor(); + + // THEN + QVERIFY(backend.meshFunctor() != meshFunctor); + + // WHEN + QScenePropertyChangePtr secondUpdateChange(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, QNodeId())); + secondUpdateChange->setValue(QVariant::fromValue(meshFunctor)); + secondUpdateChange->setPropertyName("meshFunctor"); + backend.sceneChangeEvent(secondUpdateChange); + + // THEN + QVERIFY(backend.meshFunctor() == meshFunctor); +} + +void tst_RenderMesh::shouldHandleEnablePropertyChange() +{ + // GIVEN + RenderMesh backend; + QScopedPointer<MeshDataManager> manager(new MeshDataManager()); + backend.setMeshDataManager(manager.data()); + + // WHEN + QScenePropertyChangePtr updateChange(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, QNodeId())); + updateChange->setValue(false); + updateChange->setPropertyName("enabled"); + backend.sceneChangeEvent(updateChange); + + // THEN + QVERIFY(!backend.isEnabled()); + + // WHEN + QScenePropertyChangePtr secondUpdateChange(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, QNodeId())); + secondUpdateChange->setValue(true); + secondUpdateChange->setPropertyName("enabled"); + backend.sceneChangeEvent(secondUpdateChange); + + // THEN + QVERIFY(backend.isEnabled()); +} + +QTEST_MAIN(tst_RenderMesh) + +#include "tst_rendermesh.moc" |