diff options
Diffstat (limited to 'tests/auto/extras')
-rw-r--r-- | tests/auto/extras/data/tst_circulartickmarklabel.qml | 2 | ||||
-rw-r--r-- | tests/auto/extras/data/tst_common.qml | 19 | ||||
-rw-r--r-- | tests/auto/extras/data/tst_delaybutton.qml | 2 | ||||
-rw-r--r-- | tests/auto/extras/data/tst_dial.qml | 12 | ||||
-rw-r--r-- | tests/auto/extras/data/tst_gauge.qml | 4 | ||||
-rw-r--r-- | tests/auto/extras/data/tst_picture.qml | 2 | ||||
-rw-r--r-- | tests/auto/extras/data/tst_statusindicator.qml | 2 | ||||
-rw-r--r-- | tests/auto/extras/data/tst_togglebutton.qml | 2 |
8 files changed, 30 insertions, 15 deletions
diff --git a/tests/auto/extras/data/tst_circulartickmarklabel.qml b/tests/auto/extras/data/tst_circulartickmarklabel.qml index ecf4f661..deddc9b7 100644 --- a/tests/auto/extras/data/tst_circulartickmarklabel.qml +++ b/tests/auto/extras/data/tst_circulartickmarklabel.qml @@ -55,7 +55,7 @@ import "TestUtils.js" as TestUtils TestCase { id: testcase name: "Tests_CircularTickmarkLabel" - visible: windowShown + visible: true when: windowShown width: 400 height: 400 diff --git a/tests/auto/extras/data/tst_common.qml b/tests/auto/extras/data/tst_common.qml index 3a2d3fc1..dc554735 100644 --- a/tests/auto/extras/data/tst_common.qml +++ b/tests/auto/extras/data/tst_common.qml @@ -54,7 +54,7 @@ import QtQuick 2.1 TestCase { id: testCase name: "Tests_Common" - visible: windowShown + visible: true when: windowShown width: 400 height: 400 @@ -67,23 +67,29 @@ TestCase { { tag: "DelayButton" }, { tag: "Dial" }, { tag: "Gauge" }, - { tag: "PieMenu", qml: "import QtQuick.Controls 1.1; import QtQuick.Extras 1.4;" - + "PieMenu { visible: true; MenuItem { text: 'foo' } }"}, { tag: "StatusIndicator" }, { tag: "ToggleButton" }, - { tag: "Tumbler", qml: "import QtQuick.Extras 1.4; Tumbler { TumblerColumn { model: 10 } }" } + { tag: "Tumbler", qml: "import QtQuick.Extras 1.4; Tumbler { TumblerColumn { model: 10 } }" }, + { tag: "PieMenu", qml: "import QtQuick.Controls 1.1; import QtQuick.Extras 1.4;" + + "PieMenu { visible: true; MenuItem { text: 'foo' } }"} ]; } + function init() { + if (Qt.platform.os === "windows") + skip("QTBUG-53123"); + } + function cleanup() { - control.destroy(); + if (control) + control.destroy(); } function test_resize(data) { var qml = data.qml ? data.qml : "import QtQuick.Extras 1.4; " + data.tag + " { }"; control = Qt.createQmlObject(qml, testCase, ""); - var resizeAnimation = Qt.createQmlObject("import QtQuick 2.2; NumberAnimation {}", testCase, ""); + var resizeAnimation = Qt.createQmlObject("import QtQuick 2.2; NumberAnimation {}", control, ""); resizeAnimation.target = control; resizeAnimation.properties = "width,height"; resizeAnimation.duration = 100; @@ -91,6 +97,5 @@ TestCase { resizeAnimation.start(); // Shouldn't get any warnings. tryCompare(resizeAnimation, "running", false); - resizeAnimation.destroy(); } } diff --git a/tests/auto/extras/data/tst_delaybutton.qml b/tests/auto/extras/data/tst_delaybutton.qml index fc7d90ff..5475037e 100644 --- a/tests/auto/extras/data/tst_delaybutton.qml +++ b/tests/auto/extras/data/tst_delaybutton.qml @@ -54,7 +54,7 @@ import QtQuick 2.1 TestCase { id: testcase name: "Tests_DelayButton" - visible: windowShown + visible: true when: windowShown width: 400 height: 400 diff --git a/tests/auto/extras/data/tst_dial.qml b/tests/auto/extras/data/tst_dial.qml index f9c23dad..a519eb5b 100644 --- a/tests/auto/extras/data/tst_dial.qml +++ b/tests/auto/extras/data/tst_dial.qml @@ -55,7 +55,7 @@ import "TestUtils.js" as TestUtils TestCase { id: testcase name: "Tests_Dial" - visible: windowShown + visible: true when: windowShown width: 400 height: 400 @@ -378,4 +378,14 @@ TestCase { dial.destroy(); } + + function test_valueToAngle() { + var dial = Qt.createQmlObject("import QtQuick.Extras 1.4; Dial { }", testcase, ""); + verify(dial, "Dial: failed to create an instance"); + + compare(dial.__style.valueToAngle(0.0), dial.__panel.circularTickmarkLabel.minimumValueAngle); + compare(dial.__style.valueToAngle(1.0), dial.__panel.circularTickmarkLabel.maximumValueAngle); + + dial.destroy(); + } } diff --git a/tests/auto/extras/data/tst_gauge.qml b/tests/auto/extras/data/tst_gauge.qml index 7258dcd6..6fdd6be6 100644 --- a/tests/auto/extras/data/tst_gauge.qml +++ b/tests/auto/extras/data/tst_gauge.qml @@ -56,9 +56,9 @@ import "TestUtils.js" as TestUtils TestCase { id: testcase name: "Tests_Gauge" - visible: windowShown + visible: true when: windowShown - width: 60 + width: 200 height: 200 property var gauge diff --git a/tests/auto/extras/data/tst_picture.qml b/tests/auto/extras/data/tst_picture.qml index 115be774..e11d28fb 100644 --- a/tests/auto/extras/data/tst_picture.qml +++ b/tests/auto/extras/data/tst_picture.qml @@ -56,7 +56,7 @@ import QtQuick.Extras.Private 1.0 TestCase { id: testCase name: "Tests_Picture" - visible: windowShown + visible: true when: windowShown width: 400 height: 400 diff --git a/tests/auto/extras/data/tst_statusindicator.qml b/tests/auto/extras/data/tst_statusindicator.qml index f1621a87..257ec715 100644 --- a/tests/auto/extras/data/tst_statusindicator.qml +++ b/tests/auto/extras/data/tst_statusindicator.qml @@ -57,7 +57,7 @@ import QtQuick.Extras 1.4 TestCase { id: testCase name: "Tests_StatusIndicator" - visible: windowShown + visible: true when: windowShown width: 400 height: 400 diff --git a/tests/auto/extras/data/tst_togglebutton.qml b/tests/auto/extras/data/tst_togglebutton.qml index 4b887c83..8fd62515 100644 --- a/tests/auto/extras/data/tst_togglebutton.qml +++ b/tests/auto/extras/data/tst_togglebutton.qml @@ -54,7 +54,7 @@ import QtQuick 2.1 TestCase { id: testcase name: "Tests_ToggleButton" - visible: windowShown + visible: true when: windowShown width: 400 height: 400 |