qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-enable QDebugMessageService test 

The lines were wrong and the signal handling was flawed. Otherwise the
test works fine.

Change-Id: I818fd3ec92b3413c938ee125a3bb2662cd71faa1
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
This commit is contained in:
Ulf Hermann 2015-09-14 18:11:59 +02:00
parent c04b5edd54
commit c47d865cb2
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/qml/debugger/debugger.pro
View File

@ -1,6 +1,7 @@
TEMPLATE = subdirs
PUBLICTESTS += \
qdebugmessageservice \
qqmlenginedebugservice \
qqmldebugjs \
qqmlinspector \

11
tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
View File

@ -212,21 +212,16 @@ void tst_QDebugMessageService::retrieveDebugOutput()
{
init();
int maxTries = 2;
while ((m_client->logBuffer.size() < 2)
|| (maxTries-- > 0))
QQmlDebugTest::waitForSignal(m_client, SIGNAL(debugOutput()), 1000);
QVERIFY(m_client->logBuffer.size() >= 2);
QTRY_VERIFY(m_client->logBuffer.size() >= 2);
const QString path =
QUrl::fromLocalFile(QQmlDataTest::instance()->testFile(QMLFILE)).toString();
LogEntry entry1(QtDebugMsg, QLatin1String("console.log"));
entry1.line = 48;
entry1.line = 40;
entry1.file = path;
entry1.function = QLatin1String("onCompleted");
LogEntry entry2(QtDebugMsg, QLatin1String("console.count: 1"));
entry2.line = 49;
entry2.line = 41;
entry2.file = path;
entry2.function = QLatin1String("onCompleted");