summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@qt.io>2016-11-18 13:12:13 +0200
committerTomi Korpipää <tomi.korpipaa@qt.io>2016-11-18 11:17:22 +0000
commite584f8753a39d3364aa50b4b89bafa4a0209af7c (patch)
treed6438e2c66dd3ae5310bce8e0b49bae84cf228cc /tests
parent4ff14c23b271747cc7a23fd72499d2032d692185 (diff)
Allow light position modification by user
Change-Id: I7efd56754bae16990fd11081493da0a37698f76b Task-number: QTRD-1803 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/cpptest/q3dscene-light/tst_light.cpp7
-rw-r--r--tests/auto/qmltest/scene3d/tst_light.qml13
2 files changed, 12 insertions, 8 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/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)
}
}
- */
}