summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2011-11-29 08:25:32 (GMT)
committerKai Koehne <kai.koehne@nokia.com>2011-11-29 08:30:50 (GMT)
commitca0e1b517c150dadd1c1cd400b93004c9953642a (patch)
tree5b17366d3722bb58f2f8e5c4962a4aef2c74d472
parente2773a9fc4450dbc8cb1e0736252e7520b5e6bd1 (diff)
downloadQt-ca0e1b517c150dadd1c1cd400b93004c9953642a.zip
Qt-ca0e1b517c150dadd1c1cd400b93004c9953642a.tar.gz
Qt-ca0e1b517c150dadd1c1cd400b93004c9953642a.tar.bz2
Adapt autotests to commit e2773a9
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> Change-Id: I30f996099346668f7b8067246c98b9ccc137ba57
-rw-r--r--tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp4
-rw-r--r--tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp4
-rw-r--r--tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
index be9b402..3c6ba9b 100644
--- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
+++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
@@ -294,7 +294,7 @@ void tst_QDeclarativeDebug::initTestCase()
qRegisterMetaType<QDeclarativeDebugWatch::State>();
qmlRegisterType<NonScriptProperty>("Test", 1, 0, "NonScriptPropertyElement");
- QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 3768...");
+ QTest::ignoreMessage(QtDebugMsg, "QDeclarativeDebugServer: Waiting for connection on port 3768...");
m_engine = new QDeclarativeEngine(this);
QList<QByteArray> qml;
@@ -375,7 +375,7 @@ void tst_QDeclarativeDebug::initTestCase()
m_conn = new QDeclarativeDebugConnection(this);
m_conn->connectToHost("127.0.0.1", 3768);
- QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Connection established");
+ QTest::ignoreMessage(QtDebugMsg, "QDeclarativeDebugServer: Connection established");
bool ok = m_conn->waitForConnected();
QVERIFY(ok);
QTRY_VERIFY(QDeclarativeDebugService::hasDebuggingClient());
diff --git a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
index 4846d67..eb673bf 100644
--- a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
+++ b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
@@ -69,7 +69,7 @@ private slots:
void tst_QDeclarativeDebugClient::initTestCase()
{
- QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 13770...");
+ QTest::ignoreMessage(QtDebugMsg, "QDeclarativeDebugServer: Waiting for connection on port 13770...");
new QDeclarativeEngine(this);
m_conn = new QDeclarativeDebugConnection(this);
@@ -79,7 +79,7 @@ void tst_QDeclarativeDebugClient::initTestCase()
m_conn->connectToHost("127.0.0.1", 13770);
- QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Connection established");
+ QTest::ignoreMessage(QtDebugMsg, "QDeclarativeDebugServer: Connection established");
bool ok = m_conn->waitForConnected();
QVERIFY(ok);
diff --git a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
index 85d459b..62fb5ad 100644
--- a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
+++ b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
@@ -73,13 +73,13 @@ private slots:
void tst_QDeclarativeDebugService::initTestCase()
{
- QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 13769...");
+ QTest::ignoreMessage(QtDebugMsg, "QDeclarativeDebugServer: Waiting for connection on port 13769...");
new QDeclarativeEngine(this);
m_conn = new QDeclarativeDebugConnection(this);
m_conn->connectToHost("127.0.0.1", 13769);
- QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Connection established");
+ QTest::ignoreMessage(QtDebugMsg, "QDeclarativeDebugServer: Connection established");
bool ok = m_conn->waitForConnected();
QVERIFY(ok);