summaryrefslogtreecommitdiffstats
path: root/tests/auto/platformsocketengine
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2011-02-07 17:20:33 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2011-02-07 17:20:33 (GMT)
commit59a9938f91070ad3699fc6544848f0955ecf0bdd (patch)
tree99ad7312ddddf7233290115c7ea5daa3af0b83ec /tests/auto/platformsocketengine
parentb9307547c717606e08661cf474eeaf81cc0789e6 (diff)
parent44298c848ac254fe1942eb32eed7651dec5bf0e3 (diff)
downloadQt-59a9938f91070ad3699fc6544848f0955ecf0bdd.zip
Qt-59a9938f91070ad3699fc6544848f0955ecf0bdd.tar.gz
Qt-59a9938f91070ad3699fc6544848f0955ecf0bdd.tar.bz2
Merge remote branch 'qt/master' into symbian-socket-engine
Conflicts: src/network/access/qnetworkaccessmanager.cpp src/network/bearer/qnetworksession.cpp src/network/kernel/qnetworkproxy_symbian.cpp src/network/socket/qnativesocketengine_unix.cpp tests/auto/platformsocketengine/tst_platformsocketengine.cpp
Diffstat (limited to 'tests/auto/platformsocketengine')
-rw-r--r--tests/auto/platformsocketengine/tst_platformsocketengine.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/platformsocketengine/tst_platformsocketengine.cpp b/tests/auto/platformsocketengine/tst_platformsocketengine.cpp
index fa21ed8..0ecb4ae 100644
--- a/tests/auto/platformsocketengine/tst_platformsocketengine.cpp
+++ b/tests/auto/platformsocketengine/tst_platformsocketengine.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
@@ -184,9 +184,7 @@ void tst_PlatformSocketEngine::simpleConnectToIMAP()
QVERIFY(socketDevice.read(array.data(), array.size()) == available);
// Check that the greeting is what we expect it to be
- //QCOMPARE(array.constData(), QtNetworkSettings::expectedReplyIMAP().constData());
- QVERIFY(array.startsWith("* OK"));
- QVERIFY(array.endsWith("server ready\r\n"));
+ QVERIFY2(QtNetworkSettings::compareReplyIMAP(array), array.constData());
// Write a logout message
QByteArray array2 = "ZZZ LOGOUT\r\n";