summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire.ecortex@kdab.com>2015-05-08 09:43:00 +0200
committerPaul Lemire <paul.lemire@kdab.com>2015-05-13 14:15:44 +0000
commit50b3b06c2e232e6a19ad6ac948fc874b239750a1 (patch)
tree6b2ddd67778a58fbda3fe13e71c6177932009921
parentc19ab81d5547079c8dc28824071562d256637621 (diff)
Unit tests for RenderMaterial
Properly initialize the enabled flag in RenderMaterial and use Q_AUTOTEST_EXPORT to make it available to the unit tests Change-Id: Ie38169815f920f828effe03b52f6f32c85030523 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--src/render/backend/rendermaterial.cpp1
-rw-r--r--src/render/backend/rendermaterial_p.h2
-rw-r--r--tests/auto/render/render.pro3
-rw-r--r--tests/auto/render/rendermaterial/rendermaterial.pro9
-rw-r--r--tests/auto/render/rendermaterial/tst_rendermaterial.cpp187
5 files changed, 200 insertions, 2 deletions
diff --git a/src/render/backend/rendermaterial.cpp b/src/render/backend/rendermaterial.cpp
index d38fa698e..29c0ec3dd 100644
--- a/src/render/backend/rendermaterial.cpp
+++ b/src/render/backend/rendermaterial.cpp
@@ -55,6 +55,7 @@ namespace Render {
RenderMaterial::RenderMaterial()
: QBackendNode()
, m_textureProvider(Q_NULLPTR)
+ , m_enabled(true)
{
}
diff --git a/src/render/backend/rendermaterial_p.h b/src/render/backend/rendermaterial_p.h
index 0dc29768b..eb648c83b 100644
--- a/src/render/backend/rendermaterial_p.h
+++ b/src/render/backend/rendermaterial_p.h
@@ -59,7 +59,7 @@ class RenderTechnique;
class RenderEffect;
class MaterialManager;
-class RenderMaterial : public QBackendNode
+class Q_AUTOTEST_EXPORT RenderMaterial : public QBackendNode
{
public:
RenderMaterial();
diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro
index 86796dab1..62583bbb7 100644
--- a/tests/auto/render/render.pro
+++ b/tests/auto/render/render.pro
@@ -8,5 +8,6 @@ contains(QT_CONFIG, private_tests) {
qgraphicsutils \
rendershader \
renderviewutils \
- renderviews
+ renderviews \
+ rendermaterial
}
diff --git a/tests/auto/render/rendermaterial/rendermaterial.pro b/tests/auto/render/rendermaterial/rendermaterial.pro
new file mode 100644
index 000000000..545510ae8
--- /dev/null
+++ b/tests/auto/render/rendermaterial/rendermaterial.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+
+TARGET = tst_rendermaterial
+
+QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib
+
+CONFIG += testcase
+
+SOURCES += tst_rendermaterial.cpp
diff --git a/tests/auto/render/rendermaterial/tst_rendermaterial.cpp b/tests/auto/render/rendermaterial/tst_rendermaterial.cpp
new file mode 100644
index 000000000..dcd3edd5e
--- /dev/null
+++ b/tests/auto/render/rendermaterial/tst_rendermaterial.cpp
@@ -0,0 +1,187 @@
+/****************************************************************************
+**
+** 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/rendermaterial_p.h>
+
+#include <Qt3DRenderer/QMaterial>
+#include <Qt3DRenderer/QParameter>
+#include <Qt3DRenderer/QEffect>
+#include <Qt3DCore/QScenePropertyChange>
+
+
+using namespace Qt3D;
+using namespace Qt3D::Render;
+
+class tst_RenderMaterial : public QObject
+{
+ Q_OBJECT
+public:
+ tst_RenderMaterial() {}
+
+private slots:
+ void shouldHaveInitialState();
+ void shouldHavePropertiesMirroringFromItsPeer_data();
+ void shouldHavePropertiesMirroringFromItsPeer();
+ void shouldHandleParametersPropertyChange();
+ void shouldHandleEnablePropertyChange();
+};
+
+
+void tst_RenderMaterial::shouldHaveInitialState()
+{
+ // GIVEN
+ RenderMaterial backend;
+
+ // THEN
+ QVERIFY(backend.parameters().isEmpty());
+ QVERIFY(backend.effect().isNull());
+ QVERIFY(backend.isEnabled());
+}
+
+void tst_RenderMaterial::shouldHavePropertiesMirroringFromItsPeer_data()
+{
+ QTest::addColumn<QMaterial *>("frontendMaterial");
+
+ QMaterial *emptyMaterial = new QMaterial();
+ QTest::newRow("emptyMaterial") << emptyMaterial;
+
+ QMaterial *simpleMaterial = new QMaterial();
+ simpleMaterial->addParameter(new QParameter());
+ simpleMaterial->setEffect(new QEffect());
+ QTest::newRow("simpleMaterial") << simpleMaterial;
+
+ QMaterial *manyParametersMaterial = new QMaterial();
+ manyParametersMaterial->addParameter(new QParameter());
+ manyParametersMaterial->addParameter(new QParameter());
+ manyParametersMaterial->addParameter(new QParameter());
+ manyParametersMaterial->addParameter(new QParameter());
+ simpleMaterial->setEffect(new QEffect());
+ QTest::newRow("manyParametersMaterial") << manyParametersMaterial;
+
+ QMaterial *disabledSimpleMaterial = new QMaterial();
+ disabledSimpleMaterial->setEnabled(false);
+ disabledSimpleMaterial->addParameter(new QParameter());
+ disabledSimpleMaterial->setEffect(new QEffect());
+ QTest::newRow("simpleDisabledMaterial") << disabledSimpleMaterial;
+
+ QMaterial *manyParametersDisabledMaterial = new QMaterial();
+ manyParametersDisabledMaterial->setEnabled(false);
+ manyParametersDisabledMaterial->setEffect(new QEffect());
+ manyParametersDisabledMaterial->addParameter(new QParameter());
+ manyParametersDisabledMaterial->addParameter(new QParameter());
+ manyParametersDisabledMaterial->addParameter(new QParameter());
+ manyParametersDisabledMaterial->addParameter(new QParameter());
+ manyParametersDisabledMaterial->addParameter(new QParameter());
+ manyParametersDisabledMaterial->addParameter(new QParameter());
+ manyParametersDisabledMaterial->addParameter(new QParameter());
+ QTest::newRow("manyParametersDisabledMaterial") << manyParametersDisabledMaterial;
+}
+
+void tst_RenderMaterial::shouldHavePropertiesMirroringFromItsPeer()
+{
+ // WHEN
+ QFETCH(QMaterial *, frontendMaterial);
+ RenderMaterial backend;
+
+ // GIVEN
+ backend.setPeer(frontendMaterial);
+
+ // THEN
+ QVERIFY(backend.isEnabled() == frontendMaterial->isEnabled());
+ QCOMPARE(backend.effect(), frontendMaterial->effect() ? frontendMaterial->effect()->id() : QNodeId());
+ QCOMPARE(backend.parameters().count(), frontendMaterial->parameters().count());
+
+ int c = 0;
+ Q_FOREACH (QParameter *p, frontendMaterial->parameters())
+ QCOMPARE(p->id(), backend.parameters().at(c++));
+
+ delete frontendMaterial;
+}
+
+void tst_RenderMaterial::shouldHandleParametersPropertyChange()
+{
+ // GIVEN
+ QScopedPointer<QParameter> parameter(new QParameter());
+ RenderMaterial backend;
+
+ // WHEN
+ QScenePropertyChangePtr addChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, parameter->id()));
+ addChange->setValue(QVariant::fromValue(parameter->id()));
+ addChange->setPropertyName("parameter");
+ backend.sceneChangeEvent(addChange);
+
+ // THEN
+ QCOMPARE(backend.parameters().count(), 1);
+ QCOMPARE(backend.parameters().first(), parameter->id());
+
+ // WHEN
+ QScenePropertyChangePtr removeChange(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, parameter->id()));
+ removeChange->setValue(QVariant::fromValue(parameter->id()));
+ removeChange->setPropertyName("parameter");
+ backend.sceneChangeEvent(removeChange);
+
+ // THEN
+ QVERIFY(backend.parameters().isEmpty());
+}
+
+void tst_RenderMaterial::shouldHandleEnablePropertyChange()
+{
+ // GIVEN
+ RenderMaterial backend;
+
+ // 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_APPLESS_MAIN(tst_RenderMaterial)
+
+#include "tst_rendermaterial.moc"