summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-12-09 12:21:53 +0100
committerPaul Lemire <paul.lemire@kdab.com>2016-01-13 16:09:39 +0000
commit261a744010b0cd05172584a46e1d7de8fd5c8c9e (patch)
tree7a4777e603040ac5d2d66d04f1f07a0cfd25f7d5
parentb20f3ffb11ae77751947fd0e31e24ae61e150916 (diff)
Updated Entity unit tests
Change-Id: I4de1a5662b50781e06bcfc8474c895e77cbd8851 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r--tests/auto/render/entity/tst_entity.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/tests/auto/render/entity/tst_entity.cpp b/tests/auto/render/entity/tst_entity.cpp
index 0d828c5e2..a6e713bc8 100644
--- a/tests/auto/render/entity/tst_entity.cpp
+++ b/tests/auto/render/entity/tst_entity.cpp
@@ -48,6 +48,7 @@
#include <Qt3DRender/QGeometryRenderer>
#include <Qt3DRender/QObjectPicker>
#include <Qt3DRender/QBoundingVolumeDebug>
+#include <Qt3DRender/QComputeJob>
typedef Qt3DCore::QNodeId (*UuidMethod)(Qt3DRender::Render::Entity *);
typedef QList<Qt3DCore::QNodeId> (*UuidListMethod)(Qt3DRender::Render::Entity *);
@@ -65,6 +66,7 @@ QNodeId materialUuid(Entity *entity) { return entity->componentUuid<Material>();
QNodeId geometryRendererUuid(Entity *entity) { return entity->componentUuid<GeometryRenderer>(); }
QNodeId objectPickerUuid(Entity *entity) { return entity->componentUuid<ObjectPicker>(); }
QNodeId boundingVolumeDebugUuid(Entity *entity) { return entity->componentUuid<BoundingVolumeDebug>(); }
+QNodeId computeJobUuid(Entity *entity) { return entity->componentUuid<ComputeJob>(); }
QList<QNodeId> layersUuid(Entity *entity) { return entity->componentsUuid<Layer>(); }
QList<QNodeId> shadersUuid(Entity *entity) { return entity->componentsUuid<ShaderData>(); }
@@ -90,7 +92,8 @@ private slots:
<< new QObjectPicker
<< new QLayer
<< new QShaderData
- << new QBoundingVolumeDebug;
+ << new QBoundingVolumeDebug
+ << new QComputeJob;
QTest::newRow("all components") << components;
}
@@ -108,6 +111,7 @@ private slots:
QVERIFY(entity.componentUuid<GeometryRenderer>().isNull());
QVERIFY(entity.componentUuid<ObjectPicker>().isNull());
QVERIFY(entity.componentUuid<BoundingVolumeDebug>().isNull());
+ QVERIFY(entity.componentUuid<ComputeJob>().isNull());
QVERIFY(entity.componentsUuid<Layer>().isEmpty());
QVERIFY(entity.componentsUuid<ShaderData>().isEmpty());
QVERIFY(!entity.isBoundingVolumeDirty());
@@ -128,6 +132,7 @@ private slots:
QVERIFY(!entity.componentUuid<ObjectPicker>().isNull());
QVERIFY(!entity.componentUuid<BoundingVolumeDebug>().isNull());
QVERIFY(!entity.componentsUuid<Layer>().isEmpty());
+ QVERIFY(!entity.componentsUuid<Layer>().isEmpty());
QVERIFY(!entity.componentsUuid<ShaderData>().isEmpty());
QVERIFY(entity.isBoundingVolumeDirty());
@@ -142,6 +147,7 @@ private slots:
QVERIFY(entity.componentUuid<ObjectPicker>().isNull());
QVERIFY(entity.componentUuid<BoundingVolumeDebug>().isNull());
QVERIFY(entity.componentsUuid<Layer>().isEmpty());
+ QVERIFY(entity.componentsUuid<Layer>().isEmpty());
QVERIFY(entity.componentsUuid<ShaderData>().isEmpty());
QVERIFY(!entity.isBoundingVolumeDirty());
}
@@ -168,6 +174,9 @@ private slots:
component = new QBoundingVolumeDebug;
QTest::newRow("boundingVolumeDebug") << component << reinterpret_cast<void*>(boundingVolumeDebugUuid);
+
+ component = new QComputeJob;
+ QTest::newRow("computeJob") << component << reinterpret_cast<void*>(computeJobUuid);
}
void shouldHandleSingleComponentEvents()