summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-08-06 12:35:45 +0200
committerPaul Lemire <paul.lemire@kdab.com>2015-08-07 14:32:31 +0000
commitcb6fddc83aaf7b07ed93b253af9aecdf0de46109 (patch)
tree36507e066674408a55bd88ad72c42b6562139114
parentf402973ff7180b861ba18c4433c31aa591a64c45 (diff)
RenderMesh: remove unit tests
RenderMesh is replaced by RenderGeometryRenderer which is also unit tested Change-Id: Ia123350ba881aadd4728d083e0ceb1b4b76fa684 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--tests/auto/render/render.pro1
-rw-r--r--tests/auto/render/rendermesh/rendermesh.pro9
-rw-r--r--tests/auto/render/rendermesh/tst_rendermesh.cpp179
3 files changed, 0 insertions, 189 deletions
diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro
index b8b334c86..f008bee8a 100644
--- a/tests/auto/render/render.pro
+++ b/tests/auto/render/render.pro
@@ -10,7 +10,6 @@ contains(QT_CONFIG, private_tests) {
renderviewutils \
renderviews \
rendermaterial \
- rendermesh \
vsyncframeadvanceservice \
meshfunctors \
qmaterial \
diff --git a/tests/auto/render/rendermesh/rendermesh.pro b/tests/auto/render/rendermesh/rendermesh.pro
deleted file mode 100644
index c654f0dfa..000000000
--- a/tests/auto/render/rendermesh/rendermesh.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index 030f88a6f..000000000
--- a/tests/auto/render/rendermesh/tst_rendermesh.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/****************************************************************************
-**
-** 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;
-}
-
-// NOTE tst_rendermesh and RenderMesh will soon be removed
-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"