summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2014-10-15 13:02:04 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2014-10-15 13:04:16 +0300
commit9f6123afc34fd4fb1ea3eb60636b11dc6d911103 (patch)
tree316713f28aa15607d331f46c1f71761d9c1575f7 /tests/auto
parent3607a9c92b6544dfeab59ac8d83ba1517e7cdc93 (diff)
Added tests for QML input
Also updated missing inheritance to docs Task-number: QTRD-3368 Change-Id: I7b091009d7d89d601215bb4484b8eac7274bcf14 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qmltest/input3d/tst_input.qml83
-rw-r--r--tests/auto/qmltest/input3d/tst_touch.qml83
-rw-r--r--tests/auto/qmltest/qmltest.pro8
3 files changed, 170 insertions, 4 deletions
diff --git a/tests/auto/qmltest/input3d/tst_input.qml b/tests/auto/qmltest/input3d/tst_input.qml
new file mode 100644
index 00000000..fefb585e
--- /dev/null
+++ b/tests/auto/qmltest/input3d/tst_input.qml
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtDataVisualization 1.2
+import QtTest 1.0
+
+Item {
+ id: top
+ width: 150
+ height: 150
+
+ InputHandler3D {
+ id: initial
+ }
+
+ InputHandler3D {
+ id: initialized
+ rotationEnabled: false
+ selectionEnabled: false
+ zoomAtTargetEnabled: false
+ zoomEnabled: false
+ }
+
+ InputHandler3D {
+ id: change
+ }
+
+ TestCase {
+ name: "InputHandler3D Initial"
+
+ function test_initial() {
+ compare(initial.rotationEnabled, true)
+ compare(initial.selectionEnabled, true)
+ compare(initial.zoomAtTargetEnabled, true)
+ compare(initial.zoomEnabled, true)
+ }
+ }
+
+ TestCase {
+ name: "InputHandler3D Initialized"
+
+ function test_initialized() {
+ compare(initialized.rotationEnabled, false)
+ compare(initialized.selectionEnabled, false)
+ compare(initialized.zoomAtTargetEnabled, false)
+ compare(initialized.zoomEnabled, false)
+ }
+ }
+
+ TestCase {
+ name: "InputHandler3D Change"
+
+ function test_change() {
+ change.rotationEnabled = false
+ change.selectionEnabled = false
+ change.zoomAtTargetEnabled = false
+ change.zoomEnabled = false
+
+ compare(change.rotationEnabled, false)
+ compare(change.selectionEnabled, false)
+ compare(change.zoomAtTargetEnabled, false)
+ compare(change.zoomEnabled, false)
+ }
+
+ // TODO: QTRD-3380 (mouse events)
+ }
+}
diff --git a/tests/auto/qmltest/input3d/tst_touch.qml b/tests/auto/qmltest/input3d/tst_touch.qml
new file mode 100644
index 00000000..626da68f
--- /dev/null
+++ b/tests/auto/qmltest/input3d/tst_touch.qml
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtDataVisualization 1.2
+import QtTest 1.0
+
+Item {
+ id: top
+ width: 150
+ height: 150
+
+ TouchInputHandler3D {
+ id: initial
+ }
+
+ TouchInputHandler3D {
+ id: initialized
+ rotationEnabled: false
+ selectionEnabled: false
+ zoomAtTargetEnabled: false
+ zoomEnabled: false
+ }
+
+ TouchInputHandler3D {
+ id: change
+ }
+
+ TestCase {
+ name: "TouchInputHandler3D Initial"
+
+ function test_initial() {
+ compare(initial.rotationEnabled, true)
+ compare(initial.selectionEnabled, true)
+ compare(initial.zoomAtTargetEnabled, true)
+ compare(initial.zoomEnabled, true)
+ }
+ }
+
+ TestCase {
+ name: "TouchInputHandler3D Initialized"
+
+ function test_initialized() {
+ compare(initialized.rotationEnabled, false)
+ compare(initialized.selectionEnabled, false)
+ compare(initialized.zoomAtTargetEnabled, false)
+ compare(initialized.zoomEnabled, false)
+ }
+ }
+
+ TestCase {
+ name: "TouchInputHandler3D Change"
+
+ function test_change() {
+ change.rotationEnabled = false
+ change.selectionEnabled = false
+ change.zoomAtTargetEnabled = false
+ change.zoomEnabled = false
+
+ compare(change.rotationEnabled, false)
+ compare(change.selectionEnabled, false)
+ compare(change.zoomAtTargetEnabled, false)
+ compare(change.zoomEnabled, false)
+
+ // TODO: QTRD-3380 (mouse events)
+ }
+ }
+}
diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro
index f660f759..ac52caaf 100644
--- a/tests/auto/qmltest/qmltest.pro
+++ b/tests/auto/qmltest/qmltest.pro
@@ -23,12 +23,12 @@ OTHER_FILES += bars3d\tst_basic.qml \
custom3d\tst_customvolume.qml \
scene3d\tst_scene.qml \
scene3d\tst_camera.qml \
- scene3d\tst_light.qml #\
+ scene3d\tst_light.qml \
+ input3d\tst_input.qml \
+ input3d\tst_touch.qml #\
# axis3d\tst_category.qml \
# axis3d\tst_value.qml \
-# axis3d\tst_logvalue.qml
-
-# TODO: Check new QML types in 1.2
+# axis3d\tst_logvalue.qml \
RESOURCES += \
qmltest.qrc