From ffc1cab21ade6fc4b0ab574dbb5507c677d32841 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 24 Apr 2017 15:10:16 +0200 Subject: tst_dialogs: make QML errors visible Change-Id: Ib466b1c42e232d75a022588e99e9e204a8c7bad9 Reviewed-by: Qt CI Bot Reviewed-by: Shawn Rutledge --- tests/auto/dialogs/tst_dialogs.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/auto/dialogs/tst_dialogs.cpp b/tests/auto/dialogs/tst_dialogs.cpp index 1f139966..20da6e43 100644 --- a/tests/auto/dialogs/tst_dialogs.cpp +++ b/tests/auto/dialogs/tst_dialogs.cpp @@ -87,7 +87,7 @@ void tst_dialogs::dialogImplicitWidth() component.loadUrl(testFileUrl("DialogImplicitSize.qml")); QObject *created = component.create(); QScopedPointer cleanup(created); - QVERIFY(created); + QVERIFY2(created, qPrintable(component.errorString())); QTRY_VERIFY(created->property("width").toInt() >= 400); QTRY_VERIFY(created->property("height").toInt() >= minimumHeight + heightMargins); @@ -100,7 +100,7 @@ void tst_dialogs::dialogContentResize() component.loadUrl(testFileUrl("DialogMinimumSize.qml")); QObject *created = component.create(); QScopedPointer cleanup(created); - QVERIFY(created); + QVERIFY2(created, qPrintable(component.errorString())); QTRY_COMPARE(created->property("width").toInt(), 400); QTRY_COMPARE(created->property("height").toInt(), 300); @@ -121,7 +121,7 @@ void tst_dialogs::fileDialogDefaultModality() window->setGeometry(240,240,1024,320); window->show(); QVERIFY(QTest::qWaitForWindowExposed(window)); - QVERIFY(window->rootObject()); + QVERIFY2(window->rootObject(), qPrintable(window->errors().value(0).toString())); // Click to show QObject *dlg = qvariant_cast(window->rootObject()->property("fileDialog")); @@ -167,7 +167,7 @@ void tst_dialogs::fileDialogNonModal() window->setGeometry(240,240,1024,320); window->show(); QVERIFY(QTest::qWaitForWindowExposed(window)); - QVERIFY(window->rootObject()); + QVERIFY2(window->rootObject(), qPrintable(window->errors().value(0).toString())); // Click to toggle visibility QObject *dlg = qvariant_cast(window->rootObject()->property("fileDialog")); @@ -196,7 +196,7 @@ void tst_dialogs::fileDialogNameFilters() window->setGeometry(240,240,1024,320); window->show(); QVERIFY(QTest::qWaitForWindowExposed(window)); - QVERIFY(window->rootObject()); + QVERIFY2(window->rootObject(), qPrintable(window->errors().value(0).toString())); QObject *dlg = qvariant_cast(window->rootObject()->property("fileDialog")); QStringList filters; -- cgit v1.2.1