summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/cpptest/q3dscene-light/tst_light.cpp7
-rw-r--r--tests/auto/cpptest/q3dscene/tst_scene.cpp16
-rw-r--r--tests/auto/qmltest/scene3d/tst_light.qml13
-rw-r--r--tests/auto/qmltest/scene3d/tst_scene.qml101
4 files changed, 58 insertions, 79 deletions
diff --git a/tests/auto/cpptest/q3dscene-light/tst_light.cpp b/tests/auto/cpptest/q3dscene-light/tst_light.cpp
index ccaec13e..d5eb4507 100644
--- a/tests/auto/cpptest/q3dscene-light/tst_light.cpp
+++ b/tests/auto/cpptest/q3dscene-light/tst_light.cpp
@@ -81,8 +81,7 @@ void tst_light::initialProperties()
{
QVERIFY(m_light);
- // TODO: Has no adjustable properties yet.
- // Keeping this as a placeholder for future implementations (QTRD-2406)
+ QCOMPARE(m_light->isAutoPosition(), false);
// Common (from Q3DObject)
QVERIFY(!m_light->parentScene());
@@ -93,9 +92,11 @@ void tst_light::initializeProperties()
{
QVERIFY(m_light);
- m_light->setPosition(QVector3D(1.0, 1.0, 1.0));
+ m_light->setAutoPosition(true);
+ QCOMPARE(m_light->isAutoPosition(), true);
// Common (from Q3DObject)
+ m_light->setPosition(QVector3D(1.0, 1.0, 1.0));
QCOMPARE(m_light->position(), QVector3D(1.0, 1.0, 1.0));
}
diff --git a/tests/auto/cpptest/q3dscene/tst_scene.cpp b/tests/auto/cpptest/q3dscene/tst_scene.cpp
index 25658246..1336f400 100644
--- a/tests/auto/cpptest/q3dscene/tst_scene.cpp
+++ b/tests/auto/cpptest/q3dscene/tst_scene.cpp
@@ -111,21 +111,25 @@ void tst_scene::initializeProperties()
m_scene->setPrimarySubViewport(QRect(0, 0, 50, 50));
m_scene->setSecondarySubViewport(QRect(50, 50, 100, 100));
m_scene->setSecondarySubviewOnTop(false);
- m_scene->setSelectionQueryPosition(QPoint(0, 0));
m_scene->setSlicingActive(true);
+ m_scene->setSelectionQueryPosition(QPoint(0, 0));
QCOMPARE(m_scene->activeCamera(), camera1);
QCOMPARE(m_scene->activeLight(), light1);
QCOMPARE(m_scene->devicePixelRatio(), 2.0f);
QCOMPARE(m_scene->graphPositionQuery(), QPoint(0, 0)); // TODO: When doing signal checks, add tests to check that queries return something (asynchronously)
- // TODO: subviewports are not set (QTRD-1807)
- //QCOMPARE(m_scene->primarySubViewport(), QRect(0, 0, 50, 50));
- //QCOMPARE(m_scene->secondarySubViewport(), QRect(50, 50, 100, 100));
+ QCOMPARE(m_scene->primarySubViewport(), QRect(0, 0, 50, 50));
+ QCOMPARE(m_scene->secondarySubViewport(), QRect(50, 50, 100, 100));
QCOMPARE(m_scene->isSecondarySubviewOnTop(), false);
QCOMPARE(m_scene->selectionQueryPosition(), QPoint(0, 0)); // TODO: When doing signal checks, add tests to check that queries return something (asynchronously)
QCOMPARE(m_scene->isSlicingActive(), true);
- // TODO: viewport is not set by subviewports (QTRD-1807)
- //QCOMPARE(m_scene->viewport(), QRect(0, 0, 100, 100));
+ QCOMPARE(m_scene->viewport(), QRect(0, 0, 150, 150));
+
+ m_scene->setPrimarySubViewport(QRect());
+ m_scene->setSecondarySubViewport(QRect());
+
+ QCOMPARE(m_scene->primarySubViewport(), QRect(0, 0, 30, 30));
+ QCOMPARE(m_scene->secondarySubViewport(), QRect(0, 0, 150, 150));
}
void tst_scene::invalidProperties()
diff --git a/tests/auto/qmltest/scene3d/tst_light.qml b/tests/auto/qmltest/scene3d/tst_light.qml
index 35d1e0ca..68602316 100644
--- a/tests/auto/qmltest/scene3d/tst_light.qml
+++ b/tests/auto/qmltest/scene3d/tst_light.qml
@@ -28,7 +28,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDataVisualization 1.2
+import QtDataVisualization 1.3
import QtTest 1.0
Item {
@@ -36,26 +36,26 @@ Item {
height: 150
width: 150
- // TODO: Has no adjustable properties yet.
- // Keeping this as a placeholder for future implementations (QTRD-2406)
- /*
Light3D {
id: initial
}
Light3D {
id: initialized
+ autoPosition: true
}
Light3D {
id: change
+ autoPosition: true
}
TestCase {
name: "Light3D Initial"
function test_initial() {
+ compare(initial.autoPosition, false)
}
}
@@ -63,6 +63,7 @@ Item {
name: "Light3D Initialized"
function test_initialized() {
+ compare(initialized.autoPosition, true)
}
}
@@ -70,7 +71,9 @@ Item {
name: "Light3D Change"
function test_change() {
+ compare(change.autoPosition, true)
+ change.autoPosition = false
+ compare(change.autoPosition, false)
}
}
- */
}
diff --git a/tests/auto/qmltest/scene3d/tst_scene.qml b/tests/auto/qmltest/scene3d/tst_scene.qml
index e653a781..08a55662 100644
--- a/tests/auto/qmltest/scene3d/tst_scene.qml
+++ b/tests/auto/qmltest/scene3d/tst_scene.qml
@@ -70,30 +70,21 @@ Item {
compare(initial.scene.devicePixelRatio, 1.0)
compare(initial.scene.graphPositionQuery, Qt.point(-1, -1))
compare(initial.scene.invalidSelectionPoint, Qt.point(-1, -1))
- // TODO: subviewports are not set (QTRD-1807)
- //compare(initial.scene.primarySubViewport.x, 0)
- //compare(initial.scene.primarySubViewport.y, 0)
- //compare(initial.scene.primarySubViewport.width, 0)
- //compare(initial.scene.primarySubViewport.height, 0)
- // For some reason comparing like this fails in 5.8.0 (QRect vs. QRectF)
- //compare(initial.scene.primarySubViewport, Qt.rect(0, 0, 0, 0))
- // TODO: subviewports are not set (QTRD-1807)
- //compare(initial.scene.secondarySubViewport.x, 0)
- //compare(initial.scene.secondarySubViewport.y, 0)
- //compare(initial.scene.secondarySubViewport.width, 0)
- //compare(initial.scene.secondarySubViewport.height, 0)
- // For some reason comparing like this fails in 5.8.0 (QRect vs. QRectF)
- //compare(initial.scene.secondarySubViewport, Qt.rect(0, 0, 0, 0))
+ compare(initial.scene.primarySubViewport.x, 0)
+ compare(initial.scene.primarySubViewport.y, 0)
+ compare(initial.scene.primarySubViewport.width, 0)
+ compare(initial.scene.primarySubViewport.height, 0)
+ compare(initial.scene.secondarySubViewport.x, 0)
+ compare(initial.scene.secondarySubViewport.y, 0)
+ compare(initial.scene.secondarySubViewport.width, 0)
+ compare(initial.scene.secondarySubViewport.height, 0)
compare(initial.scene.secondarySubviewOnTop, true)
compare(initial.scene.selectionQueryPosition, Qt.point(-1, -1))
compare(initial.scene.slicingActive, false)
- // TODO: viewport is not set by subviewports (QTRD-1807)
- //compare(initial.scene.viewport.x, 0)
- //compare(initial.scene.viewport.y, 0)
- //compare(initial.scene.viewport.width, 0)
- //compare(initial.scene.viewport.height, 0)
- // For some reason comparing like this fails in 5.8.0 (QRect vs. QRectF)
- //compare(initial.scene.viewport, Qt.rect(0, 0, 0, 0))
+ compare(initial.scene.viewport.x, 0)
+ compare(initial.scene.viewport.y, 0)
+ compare(initial.scene.viewport.width, 0)
+ compare(initial.scene.viewport.height, 0)
}
}
@@ -104,30 +95,21 @@ Item {
compare(initialized.scene.activeCamera.zoomLevel, 200)
compare(initialized.scene.devicePixelRatio, 2.0)
compare(initialized.scene.graphPositionQuery, Qt.point(0, 0))
- // TODO: subviewports are not set (QTRD-1807)
- //compare(initialized.scene.primarySubViewport.x, 0)
- //compare(initialized.scene.primarySubViewport.y, 0)
- //compare(initialized.scene.primarySubViewport.width, 50)
- //compare(initialized.scene.primarySubViewport.height, 50)
- // For some reason comparing like this fails in 5.8.0 (QRect vs. QRectF)
- //compare(initialized.scene.primarySubViewport, Qt.rect(0, 0, 50, 50))
- // TODO: subviewports are not set (QTRD-1807)
- //compare(initialized.scene.secondarySubViewport.x, 50)
- //compare(initialized.scene.secondarySubViewport.y, 50)
- //compare(initialized.scene.secondarySubViewport.width, 100)
- //compare(initialized.scene.secondarySubViewport.height, 100)
- // For some reason comparing like this fails in 5.8.0 (QRect vs. QRectF)
- //compare(initialized.scene.secondarySubViewport, Qt.rect(50, 50, 100, 100))
+ compare(initialized.scene.primarySubViewport.x, 0)
+ compare(initialized.scene.primarySubViewport.y, 0)
+ compare(initialized.scene.primarySubViewport.width, 50)
+ compare(initialized.scene.primarySubViewport.height, 50)
+ compare(initialized.scene.secondarySubViewport.x, 50)
+ compare(initialized.scene.secondarySubViewport.y, 50)
+ compare(initialized.scene.secondarySubViewport.width, 100)
+ compare(initialized.scene.secondarySubViewport.height, 100)
compare(initialized.scene.secondarySubviewOnTop, false)
compare(initialized.scene.selectionQueryPosition, Qt.point(0, 0))
compare(initialized.scene.slicingActive, true)
- // TODO: viewport is not set by subviewports (QTRD-1807)
- //compare(initialized.scene.viewport.x, 50)
- //compare(initialized.scene.viewport.y, 50)
- //compare(initialized.scene.viewport.width, 100)
- //compare(initialized.scene.viewport.height, 100)
- // For some reason comparing like this fails in 5.8.0 (QRect vs. QRectF)
- //compare(initialized.scene.viewport, Qt.rect(0, 0, 100, 100))
+ compare(initialized.scene.viewport.x, 0)
+ compare(initialized.scene.viewport.y, 0)
+ compare(initialized.scene.viewport.width, 150)
+ compare(initialized.scene.viewport.height, 150)
}
}
@@ -152,30 +134,21 @@ Item {
compare(change.scene.activeCamera.zoomLevel, 200)
compare(change.scene.devicePixelRatio, 2.0)
compare(change.scene.graphPositionQuery, Qt.point(0, 0))
- // TODO: subviewports are not set (QTRD-1807)
- //compare(change.scene.primarySubViewport.x, 0)
- //compare(change.scene.primarySubViewport.y, 0)
- //compare(change.scene.primarySubViewport.width, 50)
- //compare(change.scene.primarySubViewport.height, 50)
- // For some reason comparing like this fails in 5.8.0 (QRect vs. QRectF)
- //compare(change.scene.primarySubViewport, Qt.rect(0, 0, 50, 50))
- // TODO: subviewports are not set (QTRD-1807)
- //compare(change.scene.secondarySubViewport.x, 50)
- //compare(change.scene.secondarySubViewport.y, 50)
- //compare(change.scene.secondarySubViewport.width, 100)
- //compare(change.scene.secondarySubViewport.height, 100)
- // For some reason comparing like this fails in 5.8.0 (QRect vs. QRectF)
- //compare(change.scene.secondarySubViewport, Qt.rect(50, 50, 100, 100))
+ compare(change.scene.primarySubViewport.x, 0)
+ compare(change.scene.primarySubViewport.y, 0)
+ compare(change.scene.primarySubViewport.width, 50)
+ compare(change.scene.primarySubViewport.height, 50)
+ compare(change.scene.secondarySubViewport.x, 50)
+ compare(change.scene.secondarySubViewport.y, 50)
+ compare(change.scene.secondarySubViewport.width, 100)
+ compare(change.scene.secondarySubViewport.height, 100)
compare(change.scene.secondarySubviewOnTop, false)
compare(change.scene.selectionQueryPosition, Qt.point(0, 0))
compare(change.scene.slicingActive, true)
- // TODO: viewport is not set by subviewports (QTRD-1807)
- //compare(change.scene.viewport.x, 0)
- //compare(change.scene.viewport.y, 0)
- //compare(change.scene.viewport.width, 100)
- //compare(change.scene.viewport.height, 100)
- // For some reason comparing like this fails in 5.8.0 (QRect vs. QRectF)
- //compare(change.scene.viewport, Qt.rect(0, 0, 100, 100))
+ compare(change.scene.viewport.x, 0)
+ compare(change.scene.viewport.y, 0)
+ compare(change.scene.viewport.width, 150)
+ compare(change.scene.viewport.height, 150)
}
}
@@ -188,8 +161,6 @@ Item {
compare(invalid.scene.primarySubViewport.y, 0)
compare(invalid.scene.primarySubViewport.width, 0)
compare(invalid.scene.primarySubViewport.height, 0)
- // For some reason comparing like this fails in 5.8.0 (QRect vs. QRectF)
- //compare(change.scene.primarySubViewport, Qt.rect(0, 0, 0, 0))
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 22:21:02 +0000