aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickview
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/quick/qquickview')
-rw-r--r--tests/auto/quick/qquickview/data/error2.qml4
-rw-r--r--tests/auto/quick/qquickview/tst_qquickview.cpp23
2 files changed, 22 insertions, 5 deletions
diff --git a/tests/auto/quick/qquickview/data/error2.qml b/tests/auto/quick/qquickview/data/error2.qml
new file mode 100644
index 0000000000..1d754b64f0
--- /dev/null
+++ b/tests/auto/quick/qquickview/data/error2.qml
@@ -0,0 +1,4 @@
+import QtQuick.Window 2.0
+
+Window {
+}
diff --git a/tests/auto/quick/qquickview/tst_qquickview.cpp b/tests/auto/quick/qquickview/tst_qquickview.cpp
index a980c69140..69e27984c7 100644
--- a/tests/auto/quick/qquickview/tst_qquickview.cpp
+++ b/tests/auto/quick/qquickview/tst_qquickview.cpp
@@ -182,10 +182,23 @@ void tst_QQuickView::errors()
{
{
QQuickView view;
+ QVERIFY(view.errors().isEmpty()); // don't crash
+ }
+ {
+ QQuickView view;
QQmlTestMessageHandler messageHandler;
view.setSource(testFileUrl("error1.qml"));
- QVERIFY(view.status() == QQuickView::Error);
- QVERIFY(view.errors().count() == 1);
+ QCOMPARE(view.status(), QQuickView::Error);
+ QCOMPARE(view.errors().count(), 1);
+ }
+
+ {
+ QQuickView view;
+ QQmlTestMessageHandler messageHandler;
+ view.setSource(testFileUrl("error2.qml"));
+ QCOMPARE(view.status(), QQuickView::Error);
+ QCOMPARE(view.errors().count(), 1);
+ view.show();
}
}
@@ -196,16 +209,16 @@ void tst_QQuickView::engine()
QQuickView *view = new QQuickView(engine, 0);
QVERIFY(view);
- QVERIFY(engine->incubationController() == view->incubationController());
+ QCOMPARE(engine->incubationController(), view->incubationController());
QQuickView *view2 = new QQuickView(engine, 0);
QVERIFY(view);
- QVERIFY(engine->incubationController() == view->incubationController());
+ QCOMPARE(engine->incubationController(), view->incubationController());
delete view;
QVERIFY(!engine->incubationController());
engine->setIncubationController(view2->incubationController());
- QVERIFY(engine->incubationController() == view2->incubationController());
+ QCOMPARE(engine->incubationController(), view2->incubationController());
delete view2;
QVERIFY(!engine->incubationController());