FCL/sf/mw/qt: comparison tests/auto/qtcpsocket/tst

equal deleted inserted replaced

-:41300fa6a67c
+:f7bc934e204c
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
 #include <QTextStream>
 #include <QThread>
 #include <QTime>
 #include <QTimer>
 #include <QDebug>
-#ifndef TEST_QNETWORK_PROXY
-#define TEST_QNETWORK_PROXY
-#endif
 // RVCT compiles also unused inline methods
 # include <QNetworkProxy>
 #ifdef Q_OS_LINUX
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #endif
+#include "private/qhostinfo_p.h"
 #include "../network-settings.h"
 Q_DECLARE_METATYPE(QAbstractSocket::SocketError)
 Q_DECLARE_METATYPE(QAbstractSocket::SocketState)
 void connectToMultiIP();
 void moveToThread0();
 void increaseReadBufferSize();
 void taskQtBug5799ConnectionErrorWaitForConnected();
 void taskQtBug5799ConnectionErrorEventLoop();
-#ifdef TEST_QNETWORK_PROXY
 void invalidProxy_data();
 void invalidProxy();
 void proxyFactory_data();
 void proxyFactory();
-#endif
 protected slots:
 void nonBlockingIMAP_hostFound();
 void nonBlockingIMAP_connected();
 void nonBlockingIMAP_closed();
 QTest::addColumn<int>("proxyType");
 QTest::addColumn<bool>("ssl");
 qDebug() << QtNetworkSettings::serverName();
 QTest::newRow("WithoutProxy") << false << 0 << false;
-#ifdef TEST_QNETWORK_PROXY
 QTest::newRow("WithSocks5Proxy") << true << int(Socks5Proxy) << false;
 QTest::newRow("WithSocks5ProxyAuth") << true << int(Socks5Proxy | AuthBasic) << false;
 QTest::newRow("WithHttpProxy") << true << int(HttpProxy) << false;
 QTest::newRow("WithHttpProxyBasicAuth") << true << int(HttpProxy | AuthBasic) << false;
 //    QTest::newRow("WithHttpProxyNtlmAuth") << true << int(HttpProxy | AuthNtlm) << false;
-#endif
 #ifndef QT_NO_OPENSSL
 QTest::newRow("WithoutProxy SSL") << false << 0 << true;
-#ifdef TEST_QNETWORK_PROXY
 QTest::newRow("WithSocks5Proxy SSL") << true << int(Socks5Proxy) << true;
 QTest::newRow("WithSocks5AuthProxy SSL") << true << int(Socks5Proxy | AuthBasic) << true;
 QTest::newRow("WithHttpProxy SSL") << true << int(HttpProxy) << true;
 QTest::newRow("WithHttpProxyBasicAuth SSL") << true << int(HttpProxy | AuthBasic) << true;
 //    QTest::newRow("WithHttpProxyNtlmAuth SSL") << true << int(HttpProxy | AuthNtlm) << true;
 #endif
-#endif
 }
 void tst_QTcpSocket::init()
 {
 QFETCH_GLOBAL(bool, setProxy);
 if (setProxy) {
-#ifdef TEST_QNETWORK_PROXY
 QFETCH_GLOBAL(int, proxyType);
 QString fluke = QHostInfo::fromName(QtNetworkSettings::serverName()).addresses().first().toString();
 QNetworkProxy proxy;
 switch (proxyType) {
 case HttpProxy | AuthNtlm:
 proxy = QNetworkProxy(QNetworkProxy::HttpProxy, fluke, 3130);
 break;
 }
 QNetworkProxy::setApplicationProxy(proxy);
-#endif
+}
-}
+qt_qhostinfo_clear_cache();
 }
 QTcpSocket *tst_QTcpSocket::newSocket() const
 {
 QTcpSocket *socket;
 return socket;
 }
 void tst_QTcpSocket::cleanup()
 {
-#ifdef TEST_QNETWORK_PROXY
 QNetworkProxy::setApplicationProxy(QNetworkProxy::DefaultProxy);
-#endif
 }
 void tst_QTcpSocket::proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *auth)
 {
 ++proxyAuthCalled;
 return;                 // we let the proxies do the lookup now
 // just connect and disconnect, then make sure nothing weird happened
 QTcpSocket *socket = newSocket();
 socket->connectToHost(QtNetworkSettings::serverName(), 21);
-QVERIFY(socket->state() == QAbstractSocket::HostLookupState);
+// check that connect is in progress
+QVERIFY(socket->state() != QAbstractSocket::UnconnectedState);
 QFETCH(bool, doClose);
 if (doClose) {
 socket->close();
 QVERIFY(socket->openMode() == QIODevice::NotOpen);
 //----------------------------------------------------------------------------------
 void tst_QTcpSocket::dontCloseOnTimeout()
 {
 QTcpServer server;
-#ifdef TEST_QNETWORK_PROXY
 server.setProxy(QNetworkProxy(QNetworkProxy::NoProxy));
-#endif
 QVERIFY(server.listen());
 QHostAddress serverAddress = QHostAddress::LocalHost;
 if (!(server.serverAddress() == QHostAddress::Any))
 serverAddress = server.serverAddress();
 timer.start(15000);
 connect(tmpSocket, SIGNAL(hostFound()), this, SLOT(hostLookupSlot()));
 tmpSocket->connectToHost(QtNetworkSettings::serverName(), 143);
-loop.exec();
+// only execute the loop if not already connected
+if (tmpSocket->state() != QAbstractSocket::ConnectedState)
+loop.exec();
 QCOMPARE(timerSpy.count(), 0);
 delete tmpSocket;
 }
 QVERIFY(socket->waitForReadyRead(10000));
 QCOMPARE(readyReadSpy.count(), 1);
 QString s = socket->readLine();
-#ifdef TEST_QNETWORK_PROXY
-QNetworkProxy::ProxyType proxyType = QNetworkProxy::applicationProxy().type();
-#endif
 QCOMPARE(s.toLatin1().constData(), QtNetworkSettings::expectedReplyIMAP().constData());
 QCOMPARE(socket->bytesAvailable(), qint64(0));
 QCoreApplication::instance()->processEvents();
 QCOMPARE(socket->bytesAvailable(), qint64(0));
 QVERIFY2(socket.state() == QAbstractSocket::UnconnectedState, "Socket connected unexpectedly!");
 QVERIFY2(socket.error() == QAbstractSocket::ConnectionRefusedError,
 QString("Could not reach server: %1").arg(socket.errorString()).toLocal8Bit());
 }
-#ifdef TEST_QNETWORK_PROXY
 void tst_QTcpSocket::invalidProxy_data()
 {
 QTest::addColumn<int>("type");
 QTest::addColumn<QString>("host");
 QTest::addColumn<int>("port");
 // Sometimes, error codes change for the better
 QTEST(int(socket->error()), "expectedError");
 delete socket;
 }
-#endif
 QTEST_MAIN(tst_QTcpSocket)
 #include "tst_qtcpsocket.moc"

changeset 7	f7bc934e204c
parent 3	41300fa6a67c