summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativeviewer
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2012-10-10 14:40:38 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-17 18:49:48 +0200
commit045a7219b0b8de8ea3843bc25c2622fa66408354 (patch)
tree71ed9dc3e7f0b05b464d19bdc993c1c8b70b081b /tests/auto/declarative/qdeclarativeviewer
parent79fed8757e26f946745eec9d8bba8b91aeb1a742 (diff)
QtQuick1: Introduce messages to some tests.
Change-Id: If95a85c8aaff359a35ae21549f0142e47cb0cc10 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativeviewer')
-rw-r--r--tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp9
1 files changed, 5 insertions, 4 deletions
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));