QtQuick1: Introduce messages to some tests.

Change-Id: If95a85c8aaff359a35ae21549f0142e47cb0cc10
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

2 files changed, 19 insertions, 8 deletions

diff --git a/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp b/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp
index 0547e1ee..bd4d74e1 100644
--- a/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp
+++ b/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp
@@ -41,6 +41,7 @@
 #include <QtTest/QtTest>
 #include <QtTest/QSignalSpy>
 #include <qdeclarativeview.h>
+#include <QDeclarativeError>
 #include <QGraphicsObject>
 
 class tst_QDeclarativeParticles : public QObject
@@ -63,10 +64,19 @@ tst_QDeclarativeParticles::tst_QDeclarativeParticles()
 {
 }
 
+static inline QByteArray msgDeclarativeErrors(const QList<QDeclarativeError> &errors)
+{
+    QString result;
+    QDebug debug(&result);
+    foreach (const QDeclarativeError &error, errors)
+        debug << error << '\n';
+    return result.toLocal8Bit();
+}
+
 void tst_QDeclarativeParticles::properties()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/particlestest.qml");
-    QVERIFY(canvas->rootObject());
+    QVERIFY2(canvas->rootObject(), msgDeclarativeErrors(canvas->errors()).constData());
 
     QObject* particles = canvas->rootObject()->findChild<QObject*>("particles");
     QVERIFY(particles);
@@ -105,7 +115,7 @@ void tst_QDeclarativeParticles::properties()
 void tst_QDeclarativeParticles::motionGravity()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/particlemotiontest.qml");
-    QVERIFY(canvas->rootObject());
+    QVERIFY2(canvas->rootObject(), msgDeclarativeErrors(canvas->errors()).constData());
 
     QObject* particles = canvas->rootObject()->findChild<QObject*>("particles");
     QVERIFY(particles);
@@ -145,7 +155,7 @@ void tst_QDeclarativeParticles::motionGravity()
 void tst_QDeclarativeParticles::motionWander()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/particlemotiontest.qml");
-    QVERIFY(canvas->rootObject());
+    QVERIFY2(canvas->rootObject(), msgDeclarativeErrors(canvas->errors()).constData());
 
     QObject* particles = canvas->rootObject()->findChild<QObject*>("particles");
     QVERIFY(particles);
@@ -193,7 +203,7 @@ void tst_QDeclarativeParticles::motionWander()
 void tst_QDeclarativeParticles::runs()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/particlestest.qml");
-    QVERIFY(canvas->rootObject());
+    QVERIFY2(canvas->rootObject(), msgDeclarativeErrors(canvas->errors()).constData());
 
     QObject* particles = canvas->rootObject()->findChild<QObject*>("particles");
     QVERIFY(particles);
diff --git a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
index 3536f06b..32c7e9d1 100644
--- a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
+++ b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
@@ -233,10 +233,11 @@ void tst_QDeclarativeViewer::loading()
     delete viewer;
 }
 
-static int numberOfWarnings = 0;
-static void checkWarnings(QtMsgType, const QMessageLogContext &, const QString &)
+static QStringList warnings;
+
+static void checkWarnings(QtMsgType, const QMessageLogContext &, const QString &warning)
 {
-    numberOfWarnings++;
+    warnings.push_back(warning);
 }
 
 void tst_QDeclarativeViewer::fileBrowser()
@@ -251,7 +252,7 @@ void tst_QDeclarativeViewer::fileBrowser()
     qInstallMessageHandler(previousMsgHandler);
 
     // QTBUG-15720
-    QVERIFY(numberOfWarnings == 0);
+    QVERIFY2(warnings.isEmpty(), qPrintable(warnings.join(QLatin1Char('\n'))));
 
     QApplication::setActiveWindow(viewer);
     QVERIFY(QTest::qWaitForWindowActive(viewer));