aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickview/tst_qquickview.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-07-24 15:32:22 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-07-27 18:45:21 +0000
commite6846850a51cbe2a8cc8b9398430d1dd4f6ac7b3 (patch)
treeee08e04b3f0eca16f7f12f2c2392eee9dbae41d8 /tests/auto/quick/qquickview/tst_qquickview.cpp
parent0959281be22c2d3317f010ac117010fdf990df7a (diff)
tests/quick: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).
- Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: Ib9f4c2486af23c47990be4b9e004b965de226dcc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests/auto/quick/qquickview/tst_qquickview.cpp')
-rw-r--r--tests/auto/quick/qquickview/tst_qquickview.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/quick/qquickview/tst_qquickview.cpp b/tests/auto/quick/qquickview/tst_qquickview.cpp
index 7ee24bf3d4..2f054e278a 100644
--- a/tests/auto/quick/qquickview/tst_qquickview.cpp
+++ b/tests/auto/quick/qquickview/tst_qquickview.cpp
@@ -184,16 +184,16 @@ void tst_QQuickView::errors()
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"));
- QVERIFY(view.status() == QQuickView::Error);
- QVERIFY(view.errors().count() == 1);
+ QCOMPARE(view.status(), QQuickView::Error);
+ QCOMPARE(view.errors().count(), 1);
view.show();
}
}
@@ -205,16 +205,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());