Quick tests: Introduce QQmlMessageHandler.

Add QQmlMessageHandler class that can be used to record messages
into a QStringList. It also makes sure that the old message
handler is reinstalled if the test fails.

Task-number: QTBUG-28611
Change-Id: I0fff7bc11e188cf47178d9573e5f2eead693bc10
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

1 files changed, 3 insertions, 14 deletions

diff --git a/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp b/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp
index 99179f533b..af2a032a30 100644
--- a/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp
+++ b/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include <qtest.h>
+#include "../../shared/util.h"
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlcontext.h>
 #include <QtQml/qqmlpropertymap.h>
@@ -294,19 +295,9 @@ public slots:
     void testSlot() {}
 };
 
-namespace
-{
-    QStringList messages;
-    void msgHandler(QtMsgType, const QMessageLogContext &, const QString &msg)
-    {
-        messages << msg;
-    }
-}
-
 void tst_QQmlPropertyMap::metaObjectAccessibility()
 {
-    messages.clear();
-    QtMessageHandler old = qInstallMessageHandler(msgHandler);
+    QQmlTestMessageHandler messageHandler;
 
     QQmlEngine engine;
 
@@ -318,9 +309,7 @@ void tst_QQmlPropertyMap::metaObjectAccessibility()
 
     QCOMPARE(map.metaObject()->className(), "MyEnhancedPropertyMap");
 
-    qInstallMessageHandler(old);
-
-    QCOMPARE(messages.count(), 0);
+    QVERIFY2(messageHandler.messages().isEmpty(), qPrintable(messageHandler.messageString()));
 }
 
 QTEST_MAIN(tst_QQmlPropertyMap)