diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-09 08:56:50 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-09 09:19:37 +0000 |
commit | 3cf7160277219ccc8ee04053a76a65f50587dd27 (patch) | |
tree | 152ef7328e89ac9ca6bc385e10017defec7d0d36 /tests/auto/controls | |
parent | 28063805bf22b77a93f22a4289ca8afa9f1cb201 (diff) |
tst_controls: use TestCase::createTemporaryObject()
Change-Id: Iec2e4fdba18402762c6d6580abf8e677d5ae583c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/controls')
-rw-r--r-- | tests/auto/controls/data/tst_abstractbutton.qml | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_pane.qml | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_popup.qml | 6 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_stackview.qml | 8 |
4 files changed, 6 insertions, 16 deletions
diff --git a/tests/auto/controls/data/tst_abstractbutton.qml b/tests/auto/controls/data/tst_abstractbutton.qml index 422d13b4..bddb952f 100644 --- a/tests/auto/controls/data/tst_abstractbutton.qml +++ b/tests/auto/controls/data/tst_abstractbutton.qml @@ -147,7 +147,7 @@ TestCase { } function test_keyEvents(data) { - var container = keyCatcher.createObject(testCase) + var container = createTemporaryObject(keyCatcher, testCase) verify(container) var control = button.createObject(container) @@ -161,7 +161,5 @@ TestCase { keyRelease(data.key) compare(container.lastKeyRelease, data.result) - - container.destroy() } } diff --git a/tests/auto/controls/data/tst_pane.qml b/tests/auto/controls/data/tst_pane.qml index f495a159..0d7e6536 100644 --- a/tests/auto/controls/data/tst_pane.qml +++ b/tests/auto/controls/data/tst_pane.qml @@ -152,15 +152,13 @@ TestCase { } function test_implicitContentItem() { - var control = pane.createObject(testCase, {width: 100, height: 100}) + var control = createTemporaryObject(pane, testCase, {width: 100, height: 100}) verify(control) compare(control.width, 100) compare(control.height, 100) compare(control.contentItem.width, control.availableWidth) compare(control.contentItem.height, control.availableHeight) - - control.destroy() } function test_press() { diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml index beae39d1..bec50ad0 100644 --- a/tests/auto/controls/data/tst_popup.qml +++ b/tests/auto/controls/data/tst_popup.qml @@ -197,7 +197,7 @@ TestCase { } function test_availableSize() { - var control = popupTemplate.createObject(testCase) + var control = createTemporaryObject(popupTemplate, testCase) verify(control) var availableWidthSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "availableWidthChanged"}) @@ -1247,12 +1247,10 @@ TestCase { } function test_windowParent() { - var control = popupControl.createObject(applicationWindow, {width: 100, height: 100}) + var control = createTemporaryObject(popupControl, applicationWindow, {width: 100, height: 100}) verify(control) control.open() verify(control.visible) - - control.destroy() } } diff --git a/tests/auto/controls/data/tst_stackview.qml b/tests/auto/controls/data/tst_stackview.qml index 37bd5222..8650df22 100644 --- a/tests/auto/controls/data/tst_stackview.qml +++ b/tests/auto/controls/data/tst_stackview.qml @@ -1022,7 +1022,7 @@ TestCase { } function test_pushSameItem() { - var control = stackView.createObject(testCase) + var control = createTemporaryObject(stackView, testCase) verify(control) control.push(item, StackView.Immediate) @@ -1045,12 +1045,10 @@ TestCase { verify(current !== item) compare(control.currentItem, current) compare(control.depth, 3) - - control.destroy() } function test_visible() { - var control = stackView.createObject(testCase) + var control = createTemporaryObject(stackView, testCase) verify(control) var item1 = component.createObject(control) @@ -1098,8 +1096,6 @@ TestCase { control.pop(StackView.Immediate) compare(item1.visible, true) compare(item1.StackView.visible, true) - - control.destroy() } function test_resolve() { |