summaryrefslogtreecommitdiffstats
path: root/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-08-04 11:02:56 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-08-04 11:30:41 (GMT)
commitcd10d1a8dbb3b77c2d4e9c389e134b1f3cc3c2cf (patch)
tree39fa997e3391ffdcc24cdf96ea0c0b5b62391a99 /tests/auto/qtcpsocket/tst_qtcpsocket.cpp
parent4b07c9d95087cc69956bfe309cd9b4eec26235ec (diff)
downloadQt-cd10d1a8dbb3b77c2d4e9c389e134b1f3cc3c2cf.zip
Qt-cd10d1a8dbb3b77c2d4e9c389e134b1f3cc3c2cf.tar.gz
Qt-cd10d1a8dbb3b77c2d4e9c389e134b1f3cc3c2cf.tar.bz2
Trailing whitespace and tab/space fixes for auto tests
Diffstat (limited to 'tests/auto/qtcpsocket/tst_qtcpsocket.cpp')
-rw-r--r--tests/auto/qtcpsocket/tst_qtcpsocket.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
index ed84273..718fcba 100644
--- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
@@ -902,12 +902,12 @@ void tst_QTcpSocket::disconnectWhileConnecting()
socket->disconnectFromHost();
}
- connect(socket, SIGNAL(disconnected()), SLOT(exitLoopSlot()));
-#ifndef Q_OS_SYMBIAN
+ connect(socket, SIGNAL(disconnected()), SLOT(exitLoopSlot()));
+#ifndef Q_OS_SYMBIAN
enterLoop(10);
-#else
+#else
enterLoop(30);
-#endif
+#endif
QVERIFY2(!timeout(), "Network timeout");
QVERIFY(socket->state() == QAbstractSocket::UnconnectedState);
if (!closeDirectly) {
@@ -971,11 +971,11 @@ protected:
QTcpSocket *socket = server->nextPendingConnection();
while (!quit) {
-#ifndef Q_OS_SYMBIAN
+#ifndef Q_OS_SYMBIAN
if (socket->waitForDisconnected(500))
-#else
+#else
if (socket->waitForDisconnected(5000))
-#endif
+#endif
break;
if (socket->error() != QAbstractSocket::SocketTimeoutError)
return;
@@ -1023,11 +1023,11 @@ void tst_QTcpSocket::disconnectWhileConnectingNoEventLoop()
socket->disconnectFromHost();
}
-#ifndef Q_OS_SYMBIAN
+#ifndef Q_OS_SYMBIAN
QVERIFY2(socket->waitForDisconnected(10000), "Network timeout");
-#else
+#else
QVERIFY2(socket->waitForDisconnected(30000), "Network timeout");
-#endif
+#endif
QVERIFY(socket->state() == QAbstractSocket::UnconnectedState);
if (!closeDirectly) {
QCOMPARE(int(socket->openMode()), int(QIODevice::ReadWrite));
@@ -1073,11 +1073,11 @@ void tst_QTcpSocket::disconnectWhileLookingUp()
// let anything queued happen
QEventLoop loop;
-#ifndef Q_OS_SYMBIAN
+#ifndef Q_OS_SYMBIAN
QTimer::singleShot(50, &loop, SLOT(quit()));
-#else
+#else
QTimer::singleShot(5000, &loop, SLOT(quit()));
-#endif
+#endif
loop.exec();
// recheck
@@ -1754,7 +1754,7 @@ void tst_QTcpSocket::waitForConnectedInHostLookupSlot2()
QFAIL("Network timeout");
QVERIFY(foo.attemptedToConnect);
- QCOMPARE(foo.count, 1);
+ QCOMPARE(foo.count, 1);
}
#endif
@@ -1774,7 +1774,7 @@ void tst_QTcpSocket::readyReadSignalsAfterWaitForReadyRead()
QCOMPARE(readyReadSpy.count(), 1);
QString s = socket->readLine();
-#ifdef TEST_QNETWORK_PROXY
+#ifdef TEST_QNETWORK_PROXY
QNetworkProxy::ProxyType proxyType = QNetworkProxy::applicationProxy().type();
if(proxyType == QNetworkProxy::NoProxy) {
QCOMPARE(s.toLatin1().constData(), "* OK [CAPABILITY IMAP4REV1] aspiriniks Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
@@ -1782,8 +1782,8 @@ void tst_QTcpSocket::readyReadSignalsAfterWaitForReadyRead()
QCOMPARE(s.toLatin1().constData(), "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] aspiriniks Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
}
#else
- QCOMPARE(s.toLatin1().constData(), QtNetworkSettings::expectedReplyIMAP().constData());
-#endif
+ QCOMPARE(s.toLatin1().constData(), QtNetworkSettings::expectedReplyIMAP().constData());
+#endif
QCOMPARE(socket->bytesAvailable(), qint64(0));
QCoreApplication::instance()->processEvents();
@@ -2002,7 +2002,7 @@ void tst_QTcpSocket::suddenRemoteDisconnect()
#if defined(Q_OS_WINCE)
QSKIP("stressTest subprocess needs Qt3Support", SkipAll);
#elif defined( Q_OS_SYMBIAN )
- QSKIP("Symbian: QProcess IO is not yet supported, fix when supported", SkipAll);
+ QSKIP("Symbian: QProcess IO is not yet supported, fix when supported", SkipAll);
#else
QFETCH(QString, client);
QFETCH(QString, server);