summaryrefslogtreecommitdiffstats
path: root/tests/auto/render/qcameralens/tst_qcameralens.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/render/qcameralens/tst_qcameralens.cpp')
-rw-r--r--tests/auto/render/qcameralens/tst_qcameralens.cpp172
1 files changed, 45 insertions, 127 deletions
diff --git a/tests/auto/render/qcameralens/tst_qcameralens.cpp b/tests/auto/render/qcameralens/tst_qcameralens.cpp
index 131c3a9d5..241515d7b 100644
--- a/tests/auto/render/qcameralens/tst_qcameralens.cpp
+++ b/tests/auto/render/qcameralens/tst_qcameralens.cpp
@@ -32,9 +32,7 @@
#include <Qt3DRender/private/qcameralens_p.h>
#include <QObject>
#include <QSignalSpy>
-#include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
-#include <Qt3DCore/qnodecreatedchange.h>
-#include "testpostmanarbiter.h"
+#include "testarbiter.h"
class tst_QCameraLens : public QObject
{
@@ -351,64 +349,6 @@ private Q_SLOTS:
}
}
- void checkCreationData()
- {
- // GIVEN
- Qt3DRender::QCameraLens cameraLens;
-
- cameraLens.setNearPlane(0.5);
- cameraLens.setFarPlane(1005.0f);
- cameraLens.setFieldOfView(35.0f);
- cameraLens.setAspectRatio(16.0f/9.0f);
- cameraLens.setExposure(1.0f);
-
- // WHEN
- QVector<Qt3DCore::QNodeCreatedChangeBasePtr> creationChanges;
-
- {
- Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(&cameraLens);
- creationChanges = creationChangeGenerator.creationChanges();
- }
-
- // THEN
- {
- QCOMPARE(creationChanges.size(), 1);
-
- const auto creationChangeData = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DRender::QCameraLensData>>(creationChanges.first());
- const Qt3DRender::QCameraLensData cloneData = creationChangeData->data;
-
- QCOMPARE(cameraLens.projectionMatrix(), cloneData.projectionMatrix);
- QCOMPARE(cameraLens.exposure(), cloneData.exposure);
- QCOMPARE(cameraLens.id(), creationChangeData->subjectId());
- QCOMPARE(cameraLens.isEnabled(), true);
- QCOMPARE(cameraLens.isEnabled(), creationChangeData->isNodeEnabled());
- QCOMPARE(cameraLens.metaObject(), creationChangeData->metaObject());
- }
-
- // WHEN
- cameraLens.setEnabled(false);
-
- {
- Qt3DCore::QNodeCreatedChangeGenerator creationChangeGenerator(&cameraLens);
- creationChanges = creationChangeGenerator.creationChanges();
- }
-
- // THEN
- {
- QCOMPARE(creationChanges.size(), 1);
-
- const auto creationChangeData = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DRender::QCameraLensData>>(creationChanges.first());
- const Qt3DRender::QCameraLensData cloneData = creationChangeData->data;
-
- QCOMPARE(cameraLens.projectionMatrix(), cloneData.projectionMatrix);
- QCOMPARE(cameraLens.exposure(), cloneData.exposure);
- QCOMPARE(cameraLens.id(), creationChangeData->subjectId());
- QCOMPARE(cameraLens.isEnabled(), false);
- QCOMPARE(cameraLens.isEnabled(), creationChangeData->isNodeEnabled());
- QCOMPARE(cameraLens.metaObject(), creationChangeData->metaObject());
- }
- }
-
void checkProjectionTypeUpdate()
{
// GIVEN
@@ -422,11 +362,10 @@ private Q_SLOTS:
QCoreApplication::processEvents();
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 1);
- QCOMPARE(arbiter.dirtyNodes.front(), &cameraLens);
+ QCOMPARE(arbiter.dirtyNodes().size(), 1);
+ QCOMPARE(arbiter.dirtyNodes().front(), &cameraLens);
- arbiter.dirtyNodes.clear();
+ arbiter.clear();
}
{
@@ -435,8 +374,7 @@ private Q_SLOTS:
QCoreApplication::processEvents();
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 0);
+ QCOMPARE(arbiter.dirtyNodes().size(), 0);
}
}
@@ -453,11 +391,10 @@ private Q_SLOTS:
cameraLens.setNearPlane(5.0f);
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 1);
- QCOMPARE(arbiter.dirtyNodes.front(), &cameraLens);
+ QCOMPARE(arbiter.dirtyNodes().size(), 1);
+ QCOMPARE(arbiter.dirtyNodes().front(), &cameraLens);
- arbiter.dirtyNodes.clear();
+ arbiter.clear();
}
{
@@ -465,8 +402,7 @@ private Q_SLOTS:
cameraLens.setNearPlane(5.0f);
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 0);
+ QCOMPARE(arbiter.dirtyNodes().size(), 0);
}
}
@@ -483,11 +419,10 @@ private Q_SLOTS:
cameraLens.setFarPlane(5.0f);
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 1);
- QCOMPARE(arbiter.dirtyNodes.front(), &cameraLens);
+ QCOMPARE(arbiter.dirtyNodes().size(), 1);
+ QCOMPARE(arbiter.dirtyNodes().front(), &cameraLens);
- arbiter.dirtyNodes.clear();
+ arbiter.clear();
}
{
@@ -495,8 +430,7 @@ private Q_SLOTS:
cameraLens.setFarPlane(5.0f);
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 0);
+ QCOMPARE(arbiter.dirtyNodes().size(), 0);
}
}
@@ -513,11 +447,10 @@ private Q_SLOTS:
cameraLens.setFieldOfView(5.0f);
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 1);
- QCOMPARE(arbiter.dirtyNodes.front(), &cameraLens);
+ QCOMPARE(arbiter.dirtyNodes().size(), 1);
+ QCOMPARE(arbiter.dirtyNodes().front(), &cameraLens);
- arbiter.dirtyNodes.clear();
+ arbiter.clear();
}
{
@@ -525,8 +458,7 @@ private Q_SLOTS:
cameraLens.setFieldOfView(5.0f);
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 0);
+ QCOMPARE(arbiter.dirtyNodes().size(), 0);
}
}
@@ -543,11 +475,10 @@ private Q_SLOTS:
cameraLens.setAspectRatio(9.0f);
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 1);
- QCOMPARE(arbiter.dirtyNodes.front(), &cameraLens);
+ QCOMPARE(arbiter.dirtyNodes().size(), 1);
+ QCOMPARE(arbiter.dirtyNodes().front(), &cameraLens);
- arbiter.dirtyNodes.clear();
+ arbiter.clear();
}
{
@@ -555,8 +486,7 @@ private Q_SLOTS:
cameraLens.setAspectRatio(9.0f);
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 0);
+ QCOMPARE(arbiter.dirtyNodes().size(), 0);
}
}
@@ -573,11 +503,10 @@ private Q_SLOTS:
cameraLens.setLeft(0.0f);
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 1);
- QCOMPARE(arbiter.dirtyNodes.front(), &cameraLens);
+ QCOMPARE(arbiter.dirtyNodes().size(), 1);
+ QCOMPARE(arbiter.dirtyNodes().front(), &cameraLens);
- arbiter.dirtyNodes.clear();
+ arbiter.clear();
}
{
@@ -585,8 +514,7 @@ private Q_SLOTS:
cameraLens.setLeft(0.0f);
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 0);
+ QCOMPARE(arbiter.dirtyNodes().size(), 0);
}
}
@@ -603,11 +531,10 @@ private Q_SLOTS:
cameraLens.setRight(24.0f);
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 1);
- QCOMPARE(arbiter.dirtyNodes.front(), &cameraLens);
+ QCOMPARE(arbiter.dirtyNodes().size(), 1);
+ QCOMPARE(arbiter.dirtyNodes().front(), &cameraLens);
- arbiter.dirtyNodes.clear();
+ arbiter.clear();
}
{
@@ -615,8 +542,7 @@ private Q_SLOTS:
cameraLens.setRight(24.0f);
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 0);
+ QCOMPARE(arbiter.dirtyNodes().size(), 0);
}
}
@@ -633,11 +559,10 @@ private Q_SLOTS:
cameraLens.setBottom(-12.0f);
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 1);
- QCOMPARE(arbiter.dirtyNodes.front(), &cameraLens);
+ QCOMPARE(arbiter.dirtyNodes().size(), 1);
+ QCOMPARE(arbiter.dirtyNodes().front(), &cameraLens);
- arbiter.dirtyNodes.clear();
+ arbiter.clear();
}
{
@@ -645,8 +570,7 @@ private Q_SLOTS:
cameraLens.setBottom(-12.0f);
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 0);
+ QCOMPARE(arbiter.dirtyNodes().size(), 0);
}
}
@@ -663,11 +587,10 @@ private Q_SLOTS:
cameraLens.setTop(12.0f);
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 1);
- QCOMPARE(arbiter.dirtyNodes.front(), &cameraLens);
+ QCOMPARE(arbiter.dirtyNodes().size(), 1);
+ QCOMPARE(arbiter.dirtyNodes().front(), &cameraLens);
- arbiter.dirtyNodes.clear();
+ arbiter.clear();
}
{
@@ -675,8 +598,7 @@ private Q_SLOTS:
cameraLens.setTop(12.0f);
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 0);
+ QCOMPARE(arbiter.dirtyNodes().size(), 0);
}
}
@@ -693,11 +615,10 @@ private Q_SLOTS:
cameraLens.setExposure(2.0f);
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 1);
- QCOMPARE(arbiter.dirtyNodes.front(), &cameraLens);
+ QCOMPARE(arbiter.dirtyNodes().size(), 1);
+ QCOMPARE(arbiter.dirtyNodes().front(), &cameraLens);
- arbiter.dirtyNodes.clear();
+ arbiter.clear();
}
{
@@ -705,8 +626,7 @@ private Q_SLOTS:
cameraLens.setExposure(2.0f);
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 0);
+ QCOMPARE(arbiter.dirtyNodes().size(), 0);
}
}
@@ -726,11 +646,10 @@ private Q_SLOTS:
cameraLens.setProjectionMatrix(m);
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.dirtyNodes.size(), 1);
- QCOMPARE(arbiter.dirtyNodes.front(), &cameraLens);
+ QCOMPARE(arbiter.dirtyNodes().size(), 1);
+ QCOMPARE(arbiter.dirtyNodes().front(), &cameraLens);
- arbiter.dirtyNodes.clear();
+ arbiter.clear();
}
{
@@ -738,8 +657,7 @@ private Q_SLOTS:
cameraLens.setProjectionMatrix(m);
// THEN
- QCOMPARE(arbiter.events.size(), 0);
- QCOMPARE(arbiter.events.size(), 0);
+ QCOMPARE(arbiter.dirtyNodes().size(), 0);
}
}