summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2011-02-23 14:36:07 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2011-02-23 14:36:07 (GMT)
commitdc01a7829255a41bda606fb59f546d599b6654ba (patch)
tree3dd4133827556e5e88bffc9f2d987fb388252b2a /tests/auto
parentd9753717f322ffdd59017e91541fe27201940169 (diff)
downloadQt-dc01a7829255a41bda606fb59f546d599b6654ba.zip
Qt-dc01a7829255a41bda606fb59f546d599b6654ba.tar.gz
Qt-dc01a7829255a41bda606fb59f546d599b6654ba.tar.bz2
Fix ignored messages in platformsocketengine test
Reviewed-by: Markus Goetz
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/platformsocketengine/tst_platformsocketengine.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/platformsocketengine/tst_platformsocketengine.cpp b/tests/auto/platformsocketengine/tst_platformsocketengine.cpp
index 0ecb4ae..184371d 100644
--- a/tests/auto/platformsocketengine/tst_platformsocketengine.cpp
+++ b/tests/auto/platformsocketengine/tst_platformsocketengine.cpp
@@ -68,10 +68,12 @@
#include <QNetworkSession>
#include <QScopedPointer>
#define PLATFORMSOCKETENGINE QSymbianSocketEngine
+#define PLATFORMSOCKETENGINESTRING "QSymbianSocketEngine"
#include <private/qsymbiansocketengine_p.h>
#include <private/qcore_symbian_p.h>
#else
#define PLATFORMSOCKETENGINE QNativeSocketEngine
+#define PLATFORMSOCKETENGINESTRING "QNativeSocketEngine"
#include <private/qnativesocketengine_p.h>
#endif
@@ -148,10 +150,10 @@ void tst_PlatformSocketEngine::construction()
QVERIFY(socketDevice.peerPort() == 0);
QVERIFY(socketDevice.error() == QAbstractSocket::UnknownSocketError);
- QTest::ignoreMessage(QtWarningMsg, "QNativeSocketEngine::bytesAvailable() was called in QAbstractSocket::UnconnectedState");
+ QTest::ignoreMessage(QtWarningMsg, PLATFORMSOCKETENGINESTRING "::bytesAvailable() was called in QAbstractSocket::UnconnectedState");
QVERIFY(socketDevice.bytesAvailable() == 0);
- QTest::ignoreMessage(QtWarningMsg, "QNativeSocketEngine::hasPendingDatagrams() was called in QAbstractSocket::UnconnectedState");
+ QTest::ignoreMessage(QtWarningMsg, PLATFORMSOCKETENGINESTRING "::hasPendingDatagrams() was called in QAbstractSocket::UnconnectedState");
QVERIFY(!socketDevice.hasPendingDatagrams());
}
@@ -664,7 +666,7 @@ void tst_PlatformSocketEngine::invalidSend()
PLATFORMSOCKETENGINE socket;
QVERIFY(socket.initialize(QAbstractSocket::TcpSocket));
- QTest::ignoreMessage(QtWarningMsg, "QNativeSocketEngine::writeDatagram() was"
+ QTest::ignoreMessage(QtWarningMsg, PLATFORMSOCKETENGINESTRING "::writeDatagram() was"
" called by a socket other than QAbstractSocket::UdpSocket");
QCOMPARE(socket.writeDatagram("hei", 3, QHostAddress::LocalHost, 143),
(qlonglong) -1);