summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2013-08-23 15:33:57 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-23 14:47:29 +0200
commit4031642ed61892bba4a7e56294085676924adce4 (patch)
tree4986b4aec495f509414466511ef6b007f85ce8ff
parent09b0cb956940f45deaf35392630bd05453558d43 (diff)
downloadqtquickcontrols-4031642ed61892bba4a7e56294085676924adce4.tar.gz
Cleanup and improve the SplitView auto test
Change-Id: Ia6ccc71f36c78af933305207a7e05d2e484bd752 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
-rw-r--r--tests/auto/controls/data/tst_splitview.qml34
1 files changed, 18 insertions, 16 deletions
diff --git a/tests/auto/controls/data/tst_splitview.qml b/tests/auto/controls/data/tst_splitview.qml
index 05bc16be..05101ff9 100644
--- a/tests/auto/controls/data/tst_splitview.qml
+++ b/tests/auto/controls/data/tst_splitview.qml
@@ -77,9 +77,9 @@ TestCase {
}
function test_01_splitView() {
- var component = splitView
- var view = component.createObject(testCase);
+ var view = splitView.createObject(testCase);
verify (view !== null, "splitview created is null")
+ waitForRendering(view)
verify (view.orientation === Qt.Horizontal)
compare (view.__items.length, 2)
compare (view.item1.x, 0)
@@ -94,9 +94,9 @@ TestCase {
}
function test_02_splitView_initial_orientation_vertical() {
- var component = splitView
- var view = component.createObject(testCase, {orientation:Qt.Vertical});
+ var view = splitView.createObject(testCase, {orientation:Qt.Vertical});
verify (view !== null, "splitview created is null")
+ waitForRendering(view)
compare (view.orientation, Qt.Vertical)
compare (view.__items.length, 2)
compare (view.item1.x, 0)
@@ -110,10 +110,10 @@ TestCase {
view.destroy()
}
- function test_03_orientation_change()
- {
- var component = splitView
- var view = component.createObject(testCase);
+ function test_03_orientation_change() {
+ var view = splitView.createObject(testCase);
+ verify (view !== null, "splitview created is null")
+ waitForRendering(view)
verify (view.orientation === Qt.Horizontal)
view.orientation = Qt.Vertical
@@ -141,10 +141,10 @@ TestCase {
view.destroy()
}
- function test_04_hide_item()
- {
- var component = splitView
- var view = component.createObject(testCase);
+ function test_04_hide_item() {
+ var view = splitView.createObject(testCase);
+ verify (view !== null, "splitview created is null")
+ waitForRendering(view)
verify (view.item1.visible)
verify (view.item2.visible)
view.item1.visible = false
@@ -158,12 +158,13 @@ TestCase {
compare (view.item2.y, 0)
compare (view.item2.width, testCase.width)
compare (view.item2.height, 500)
+ view.destroy()
}
- function test_05_hide_fillWidth_item()
- {
- var component = splitView
- var view = component.createObject(testCase);
+ function test_05_hide_fillWidth_item() {
+ var view = splitView.createObject(testCase);
+ verify (view !== null, "splitview created is null")
+ waitForRendering(view)
verify (view.item1.visible)
verify (view.item2.visible)
view.item2.visible = false
@@ -177,5 +178,6 @@ TestCase {
compare (view.item2.y, 0)
compare (view.item2.width, testCase.width - view.item1.width - handleWidth)
compare (view.item2.height, 500)
+ view.destroy()
}
}