From 86249e8abe200b1e0114f90d6ffe186f664533c8 Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Thu, 16 May 2013 09:28:40 +0200 Subject: Autotest: fix misuses of tryCompare Change-Id: Ia06527a0a3c3cfd68ecb3372316de476e02e6c26 Reviewed-by: Albert Astals Cid Reviewed-by: Alan Alpert --- tests/auto/qmltest/fontloader/tst_fontloader.qml | 19 ++++++++----------- tests/auto/qmltest/listmodel/tst_listmodel.qml | 12 ++++++------ tests/auto/qmltest/listview/tst_listview.qml | 20 +++++++++++--------- tests/auto/qmltest/textedit/tst_textedit.qml | 7 ++++--- 4 files changed, 29 insertions(+), 29 deletions(-) (limited to 'tests') diff --git a/tests/auto/qmltest/fontloader/tst_fontloader.qml b/tests/auto/qmltest/fontloader/tst_fontloader.qml index 4d79a170f3..001442e541 100644 --- a/tests/auto/qmltest/fontloader/tst_fontloader.qml +++ b/tests/auto/qmltest/fontloader/tst_fontloader.qml @@ -66,31 +66,28 @@ Item { compare(fontloader.status, FontLoader.Null) compare(testinput.font.family, "") fontloader.source = "tarzeau_ocr_a.ttf"; - tryCompare(fontloader.status, FontLoader.Loading) - tryCompare(fontloader.status, FontLoader.Ready) + tryCompare(fontloader, 'status', FontLoader.Ready) compare(testinput.font.family, "OCRA") fontloader.source = "dummy.ttf"; - tryCompare(fontloader.status, FontLoader.Error) + tryCompare(fontloader, 'status', FontLoader.Error) compare(testinput.font.family, "") fontloader.source = ""; fontloader.name = "Courier"; - tryCompare(fontloader.status, FontLoader.Ready) + tryCompare(fontloader, 'status', FontLoader.Ready) compare(testinput.font.family, "Courier") } function test_fontswitching() { compare(fontswitch.status, FontLoader.Null) fontswitch.source = "tarzeau_ocr_a.ttf"; - tryCompare(fontswitch.status, FontLoader.Loading) - tryCompare(fontswitch.status, FontLoader.Ready) - tryCompare(fontswitch.name, "OCRA") + tryCompare(fontswitch, 'status', FontLoader.Ready) + compare(fontswitch.name, "OCRA") fontswitch.source = ""; fontswitch.name = "Courier"; - tryCompare(fontswitch.status, FontLoader.Ready) - tryCompare(fontswitch.name, "Courier") + tryCompare(fontswitch, 'status', FontLoader.Ready) + compare(fontswitch.name, "Courier") fontswitch.source = "tarzeau_ocr_a.ttf"; - tryCompare(fontswitch.status, FontLoader.Loading) - tryCompare(fontswitch.status, FontLoader.Ready) + tryCompare(fontswitch, 'status', FontLoader.Ready) compare(fontswitch.name, "OCRA") } } diff --git a/tests/auto/qmltest/listmodel/tst_listmodel.qml b/tests/auto/qmltest/listmodel/tst_listmodel.qml index a975691462..603993a092 100644 --- a/tests/auto/qmltest/listmodel/tst_listmodel.qml +++ b/tests/auto/qmltest/listmodel/tst_listmodel.qml @@ -95,28 +95,28 @@ Item { } function test_altermodeled() { - tryCompare(altermodel.count, 2) + tryCompare(altermodel, 'count', 2) compare(altermodel.get(0).name, "AlterModelElement0") compare(altermodel.get(1).name, "AlterModelElement1") altermodel.append({"name":"AlterModelElement2"}) - tryCompare(altermodel.count, 3) + tryCompare(altermodel, 'count', 3) compare(altermodel.get(0).name, "AlterModelElement0") compare(altermodel.get(1).name, "AlterModelElement1") compare(altermodel.get(2).name, "AlterModelElement2") altermodel.insert(2,{"name":"AlterModelElement1.5"}) - tryCompare(altermodel.count, 4) + tryCompare(altermodel, 'count', 4) compare(altermodel.get(0).name, "AlterModelElement0") compare(altermodel.get(1).name, "AlterModelElement1") compare(altermodel.get(2).name, "AlterModelElement1.5") compare(altermodel.get(3).name, "AlterModelElement2") - tryCompare(altermodel.count, 4) + tryCompare(altermodel, 'count', 4) altermodel.move(2,1,1); compare(altermodel.get(0).name, "AlterModelElement0") compare(altermodel.get(1).name, "AlterModelElement1.5") compare(altermodel.get(2).name, "AlterModelElement1") compare(altermodel.get(3).name, "AlterModelElement2") altermodel.remove(1,2) - tryCompare(altermodel.count, 2) + tryCompare(altermodel, 'count', 2) compare(altermodel.get(0).name, "AlterModelElement0") compare(altermodel.get(1).name, "AlterModelElement2") altermodel.set(1,{"name":"AlterModelElement1"}) @@ -125,7 +125,7 @@ Item { altermodel.setProperty(0, "name", "AlteredProperty") compare(altermodel.get(0).name, "AlteredProperty") altermodel.clear() - tryCompare(altermodel.count, 0) + tryCompare(altermodel, 'count', 0) compare(altermodel.get(0), undefined) } } diff --git a/tests/auto/qmltest/listview/tst_listview.qml b/tests/auto/qmltest/listview/tst_listview.qml index 7230638cd1..0589e7c46b 100644 --- a/tests/auto/qmltest/listview/tst_listview.qml +++ b/tests/auto/qmltest/listview/tst_listview.qml @@ -53,6 +53,7 @@ Item { ListView { id: viewmanyitems model: manyitems + delegate: Text { text: model.name } } ListView { @@ -159,15 +160,16 @@ Item { manyitems.append({"name":"Item"+i}) } compare(manyitems.count, row.numitems) - tryCompare(viewmanyitems.count, row.numitems) + tryCompare(viewmanyitems, 'count', row.numitems) + } function test_modelchange() { - tryCompare(modelchange.count, 1) + tryCompare(modelchange, 'count', 1) modelchange.currentIndex = 0; compare(modelchange.currentItem.text, "FirstModelElement0") modelchange.model = secondmodel; - tryCompare(modelchange.count, 2) + tryCompare(modelchange, 'count', 2) modelchange.currentIndex = 0; compare(modelchange.currentItem.text, "SecondModelElement0") modelchange.currentIndex = 1; @@ -175,13 +177,13 @@ Item { } function test_modelaltered() { - tryCompare(modelalter.count, 2) + tryCompare(modelalter, 'count', 2) modelalter.currentIndex = 0; compare(modelalter.currentItem.text, "AlterModelElement0") modelalter.currentIndex = 1; compare(modelalter.currentItem.text, "AlterModelElement1") altermodel.append({"name":"AlterModelElement2"}) - tryCompare(modelalter.count, 3) + tryCompare(modelalter, 'count', 3) modelalter.currentIndex = 0; compare(modelalter.currentItem.text, "AlterModelElement0") modelalter.currentIndex = 1; @@ -189,7 +191,7 @@ Item { modelalter.currentIndex = 2; compare(modelalter.currentItem.text, "AlterModelElement2") altermodel.insert(2,{"name":"AlterModelElement1.5"}) - tryCompare(modelalter.count, 4) + tryCompare(modelalter, 'count', 4) modelalter.currentIndex = 0; compare(modelalter.currentItem.text, "AlterModelElement0") modelalter.currentIndex = 1; @@ -199,7 +201,7 @@ Item { modelalter.currentIndex = 3; compare(modelalter.currentItem.text, "AlterModelElement2") altermodel.move(2,1,1); - tryCompare(modelalter.count, 4) + tryCompare(modelalter, 'count', 4) modelalter.currentIndex = 0; compare(modelalter.currentItem.text, "AlterModelElement0") modelalter.currentIndex = 1; @@ -209,7 +211,7 @@ Item { modelalter.currentIndex = 3; compare(modelalter.currentItem.text, "AlterModelElement2") altermodel.remove(1,2) - tryCompare(modelalter.count, 2) + tryCompare(modelalter, 'count', 2) modelalter.currentIndex = 0; compare(modelalter.currentItem.text, "AlterModelElement0") modelalter.currentIndex = 1; @@ -221,7 +223,7 @@ Item { compare(modelalter.currentItem.text, "AlterModelElement1") altermodel.clear() modelalter.forceLayout() - tryCompare(modelalter.count, 0) + tryCompare(modelalter, 'count', 0) compare(modelalter.currentItem, null) } diff --git a/tests/auto/qmltest/textedit/tst_textedit.qml b/tests/auto/qmltest/textedit/tst_textedit.qml index edfa127c59..6e5124253c 100644 --- a/tests/auto/qmltest/textedit/tst_textedit.qml +++ b/tests/auto/qmltest/textedit/tst_textedit.qml @@ -179,11 +179,12 @@ Item { compare(txtlines.lineCount, 3) txtlines.text = txtlines.styledtextvalue; compare(txtlines.text, "Line 1
Line 2
Line 3") - tryCompare(txtlines.lineCount, 1) + tryCompare(txtlines, 'lineCount', 1) txtlines.textFormat = Text.StyledText; - tryCompare(txtlines.lineCount, 3) + expectFail("", "QTBUG-31191") + tryCompare(txtlines, 'lineCount', 3) txtlines.textFormat = Text.RichText; - tryCompare(txtlines.lineCount, 3) + tryCompare(txtlines, 'lineCount', 3) } } } -- cgit v1.2.3