diff options
Diffstat (limited to 'tests/auto/controls/data/tst_switchdelegate.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_switchdelegate.qml | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/tests/auto/controls/data/tst_switchdelegate.qml b/tests/auto/controls/data/tst_switchdelegate.qml index 23117ce7..54b8c4b0 100644 --- a/tests/auto/controls/data/tst_switchdelegate.qml +++ b/tests/auto/controls/data/tst_switchdelegate.qml @@ -58,21 +58,20 @@ TestCase { Component { id: signalSequenceSpy SignalSequenceSpy { - signals: ["pressed", "released", "canceled", "clicked", "pressedChanged", "checkedChanged"] + signals: ["pressed", "released", "canceled", "clicked", "toggled", "pressedChanged", "checkedChanged"] } } // TODO: data-fy tst_checkbox (rename to tst_check?) so we don't duplicate its tests here? function test_defaults() { - var control = switchDelegate.createObject(testCase); + var control = createTemporaryObject(switchDelegate, testCase); verify(control); verify(!control.checked); - control.destroy(); } function test_checked() { - var control = switchDelegate.createObject(testCase); + var control = createTemporaryObject(switchDelegate, testCase); verify(control); mouseClick(control); @@ -80,15 +79,12 @@ TestCase { mouseClick(control); verify(!control.checked); - - control.destroy(); } function test_baseline() { - var control = switchDelegate.createObject(testCase); + var control = createTemporaryObject(switchDelegate, testCase); verify(control); compare(control.baselineOffset, control.contentItem.y + control.contentItem.baselineOffset); - control.destroy(); } function test_pressed_data() { @@ -99,7 +95,7 @@ TestCase { } function test_pressed(data) { - var control = switchDelegate.createObject(testCase, {padding: 10}) + var control = createTemporaryObject(switchDelegate, testCase, {padding: 10}) verify(control) // stays pressed when dragged outside @@ -110,12 +106,10 @@ TestCase { compare(control.pressed, true) mouseRelease(control, -1, control.height / 2, Qt.LeftButton) compare(control.pressed, false) - - control.destroy() } function test_mouse() { - var control = switchDelegate.createObject(testCase) + var control = createTemporaryObject(switchDelegate, testCase) verify(control) // check @@ -127,6 +121,7 @@ TestCase { verify(spy.success) spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }], ["checkedChanged", { "pressed": false, "checked": true }], + "toggled", "released", "clicked"] mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton) @@ -142,6 +137,7 @@ TestCase { verify(spy.success) spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": true }], ["checkedChanged", { "pressed": false, "checked": false }], + "toggled", "released", "clicked"] mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton) @@ -159,6 +155,7 @@ TestCase { compare(control.pressed, true) spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }], ["checkedChanged", { "pressed": false, "checked": true }], + "toggled", "released", "clicked"] mouseRelease(control, control.width * 2, control.height / 2, Qt.LeftButton) @@ -176,6 +173,7 @@ TestCase { compare(control.pressed, true) spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": true }], ["checkedChanged", { "pressed": false, "checked": false }], + "toggled", "released", "clicked"] mouseRelease(control, -control.width, control.height / 2, Qt.LeftButton) @@ -192,12 +190,10 @@ TestCase { compare(control.checked, false) compare(control.pressed, false) verify(spy.success) - - control.destroy() } function test_drag() { - var control = switchDelegate.createObject(testCase, {leftPadding: 100, rightPadding: 100}) + var control = createTemporaryObject(switchDelegate, testCase, {leftPadding: 100, rightPadding: 100}) verify(control) var spy = signalSequenceSpy.createObject(control, {target: control}) @@ -221,6 +217,7 @@ TestCase { spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }], ["checkedChanged", { "pressed": false, "checked": true }], + "toggled", "released", "clicked"] mouseRelease(control.indicator, control.indicator.width) @@ -255,6 +252,7 @@ TestCase { spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": true }], ["checkedChanged", { "pressed": false, "checked": false }], + "toggled", "released", "clicked"] mouseRelease(control, control.width) @@ -289,6 +287,7 @@ TestCase { spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }], ["checkedChanged", { "pressed": false, "checked": true }], + "toggled", "released", "clicked"] mouseRelease(control, control.width) @@ -296,7 +295,5 @@ TestCase { compare(control.checked, true) compare(control.pressed, false) verify(spy.success) - - control.destroy() } } |