diff --git a/tests/auto/qmltest/fontloader/tst_fontloader.qml b/tests/auto/qmltest/fontloader/tst_fontloader.qml
index 4d79a170f386530952042cd2c6a73a0e3e4b9194..001442e54150b92b8bed4daa3155cc9a90c979cc 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 a97569146244abb70d920615fd5c8785592ceee5..603993a092477fc5001ec6d14fe24b367a6ab6ee 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 7230638cd10874f5a29f18e72b2db3cf484f68ec..0589e7c46bbe87beea347614eb1e3ff15be49cd8 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 edfa127c5963b451685e3f30388b748bb72703a5..6e5124253cbf4c26063acf704dba982502e0f5ba 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<br>Line 2<br>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)
}
}
}