1 files changed, 15 insertions, 28 deletions
diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml
index b93a8a21..2ed29aec 100644
--- a/tests/auto/controls/data/tst_checkbox.qml
+++ b/tests/auto/controls/data/tst_checkbox.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.2
 import QtTest 1.0
-import QtQuick.Controls 2.1
+import QtQuick.Controls 2.2
 
 TestCase {
     id: testCase
@@ -58,12 +58,12 @@ TestCase {
     Component {
         id: signalSequenceSpy
         SignalSequenceSpy {
-            signals: ["pressed", "released", "canceled", "clicked", "pressedChanged", "checkedChanged", "checkStateChanged"]
+            signals: ["pressed", "released", "canceled", "clicked", "toggled", "pressedChanged", "checkedChanged", "checkStateChanged"]
         }
     }
 
     function test_text() {
-        var control = checkBox.createObject(testCase)
+        var control = createTemporaryObject(checkBox, testCase)
         verify(control)
 
         compare(control.text, "")
@@ -71,12 +71,10 @@ TestCase {
         compare(control.text, "CheckBox")
         control.text = ""
         compare(control.text, "")
-
-        control.destroy()
     }
 
     function test_checked() {
-        var control = checkBox.createObject(testCase)
+        var control = createTemporaryObject(checkBox, testCase)
         verify(control)
 
         var sequenceSpy = signalSequenceSpy.createObject(control, {target: control})
@@ -99,12 +97,10 @@ TestCase {
         compare(control.checked, false)
         compare(control.checkState, Qt.Unchecked)
         verify(sequenceSpy.success)
-
-        control.destroy()
     }
 
     function test_checkState() {
-        var control = checkBox.createObject(testCase)
+        var control = createTemporaryObject(checkBox, testCase)
         verify(control)
 
         var sequenceSpy = signalSequenceSpy.createObject(control, {target: control})
@@ -127,12 +123,10 @@ TestCase {
         compare(control.checked, false)
         compare(control.checkState, Qt.Unchecked)
         verify(sequenceSpy.success)
-
-        control.destroy()
     }
 
     function test_mouse() {
-        var control = checkBox.createObject(testCase)
+        var control = createTemporaryObject(checkBox, testCase)
         verify(control)
 
         var sequenceSpy = signalSequenceSpy.createObject(control, {target: control})
@@ -147,6 +141,7 @@ TestCase {
         sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }],
                                         ["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }],
                                         ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }],
+                                        "toggled",
                                         "released",
                                         "clicked"]
         mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton)
@@ -164,6 +159,7 @@ TestCase {
         sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }],
                                         ["checkStateChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }],
                                         ["checkedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }],
+                                        "toggled",
                                         "released",
                                         "clicked"]
         mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton)
@@ -198,12 +194,10 @@ TestCase {
         compare(control.checkState, Qt.Unchecked)
         compare(control.pressed, false)
         verify(sequenceSpy.success)
-
-        control.destroy()
     }
 
     function test_keys() {
-        var control = checkBox.createObject(testCase)
+        var control = createTemporaryObject(checkBox, testCase)
         verify(control)
 
         var sequenceSpy = signalSequenceSpy.createObject(control, {target: control})
@@ -219,6 +213,7 @@ TestCase {
                                         ["pressedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }],
                                         ["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }],
                                         ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }],
+                                        "toggled",
                                         "released",
                                         "clicked"]
         keyClick(Qt.Key_Space)
@@ -232,6 +227,7 @@ TestCase {
                                         ["pressedChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }],
                                         ["checkStateChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }],
                                         ["checkedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }],
+                                        "toggled",
                                         "released",
                                         "clicked"]
         keyClick(Qt.Key_Space)
@@ -248,8 +244,6 @@ TestCase {
             compare(control.checked, false)
             verify(sequenceSpy.success)
         }
-
-        control.destroy()
     }
 
     Component {
@@ -261,7 +255,7 @@ TestCase {
     }
 
     function test_checked_binding() {
-        var container = checkedBoundBoxes.createObject(testCase)
+        var container = createTemporaryObject(checkedBoundBoxes, testCase)
         verify(container)
 
         compare(container.cb1.checked, false)
@@ -280,8 +274,6 @@ TestCase {
         compare(container.cb1.checkState, Qt.Unchecked)
         compare(container.cb2.checked, false)
         compare(container.cb2.checkState, Qt.Unchecked)
-
-        container.destroy()
     }
 
     Component {
@@ -293,7 +285,7 @@ TestCase {
     }
 
     function test_checkState_binding() {
-        var container = checkStateBoundBoxes.createObject(testCase)
+        var container = createTemporaryObject(checkStateBoundBoxes, testCase)
         verify(container)
 
         compare(container.cb1.checked, false)
@@ -324,12 +316,10 @@ TestCase {
 
         compare(container.cb1.tristate, true)
         compare(container.cb2.tristate, true)
-
-        container.destroy()
     }
 
     function test_tristate() {
-        var control = checkBox.createObject(testCase)
+        var control = createTemporaryObject(checkBox, testCase)
 
         var sequenceSpy = signalSequenceSpy.createObject(control, {target: control})
 
@@ -424,14 +414,11 @@ TestCase {
         compare(control.checked, true)
         compare(control.checkState, Qt.PartiallyChecked)
         verify(sequenceSpy.success)
-
-        control.destroy()
     }
 
     function test_baseline() {
-        var control = checkBox.createObject(testCase)
+        var control = createTemporaryObject(checkBox, testCase)
         verify(control)
         compare(control.baselineOffset, control.contentItem.y + control.contentItem.baselineOffset)
-        control.destroy()
     }
 }