Make tst_platformsocketengine work

Compile and instanciate the right engine.

Reviewed-by: Shane Kearns

6 files changed, 68 insertions, 62 deletions

diff --git a/tests/auto/network.pro b/tests/auto/network.pro
index 31c754c..5bf6a92 100644
--- a/tests/auto/network.pro
+++ b/tests/auto/network.pro
@@ -16,7 +16,7 @@ SUBDIRS=\
     qhttpnetworkconnection \
     qhttpnetworkreply \
     qhttpsocketengine \
-    qnativesocketengine \
+    platformsocketengine \
     qnetworkaccessmanager \
     qnetworkaddressentry \
     qnetworkconfiguration \
@@ -40,7 +40,7 @@ SUBDIRS=\
     qauthenticator \
     qhttpnetworkconnection \
     qhttpnetworkreply \
-    qnativesocketengine \
+    platformsocketengine \
     qsocketnotifier \
     qsocks5socketengine \
 
diff --git a/tests/auto/platformsocketengine/.gitignore b/tests/auto/platformsocketengine/.gitignore
index 4700e5e..afe9389 100644
--- a/tests/auto/platformsocketengine/.gitignore
+++ b/tests/auto/platformsocketengine/.gitignore
@@ -1 +1 @@
-tst_qnativesocketengine
+tst_platformsocketengine
diff --git a/tests/auto/platformsocketengine/platformsocketengine.pro b/tests/auto/platformsocketengine/platformsocketengine.pro
index 0275d37..04816af 100644
--- a/tests/auto/platformsocketengine/platformsocketengine.pro
+++ b/tests/auto/platformsocketengine/platformsocketengine.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
-SOURCES  += tst_qnativesocketengine.cpp
+SOURCES  += tst_platformsocketengine.cpp
 
-include(../qnativesocketengine/qsocketengine.pri)
+include(../platformsocketengine/platformsocketengine.pri)
 
 requires(contains(QT_CONFIG,private_tests))
 
@@ -10,4 +10,4 @@ MOC_DIR=tmp
 QT = core network
 
 symbian: TARGET.CAPABILITY = NetworkServices
-
+symbian: INCLUDEPATH += $$OS_LAYER_SYSTEMINCLUDE
\ No newline at end of file
diff --git a/tests/auto/platformsocketengine/tst_platformsocketengine.cpp b/tests/auto/platformsocketengine/tst_platformsocketengine.cpp
index 2b0b632..bede360 100644
--- a/tests/auto/platformsocketengine/tst_platformsocketengine.cpp
+++ b/tests/auto/platformsocketengine/tst_platformsocketengine.cpp
@@ -50,7 +50,6 @@
 
 
 #include <qdatastream.h>
-#include <private/qnativesocketengine_p.h>
 
 #include <qhostaddress.h>
 #include <qdatetime.h>
@@ -63,6 +62,13 @@
 
 #include <stddef.h>
 
+#ifdef Q_OS_SYMBIAN
+#define PLATFORMSOCKETENGINE QSymbianSocketEngine
+#include <private/qsymbiansocketengine_p.h>
+#else
+#define PLATFORMSOCKETENGINE QNativeSocketEngine
+#include <private/qnativesocketengine_p.h>
+#endif
 
 #include <qstringlist.h>
 
@@ -70,13 +76,13 @@
 
 //TESTED_FILES=network/qnativesocketengine.cpp network/qnativesocketengine_p.h network/qnativesocketengine_unix.cpp
 
-class tst_QNativeSocketEngine : public QObject
+class tst_PlatformSocketEngine : public QObject
 {
     Q_OBJECT
 
 public:
-    tst_QNativeSocketEngine();
-    virtual ~tst_QNativeSocketEngine();
+    tst_PlatformSocketEngine();
+    virtual ~tst_PlatformSocketEngine();
 
 
 public slots:
@@ -100,27 +106,27 @@ private slots:
     void receiveUrgentData();
 };
 
-tst_QNativeSocketEngine::tst_QNativeSocketEngine()
+tst_PlatformSocketEngine::tst_PlatformSocketEngine()
 {
     Q_SET_DEFAULT_IAP
 }
 
-tst_QNativeSocketEngine::~tst_QNativeSocketEngine()
+tst_PlatformSocketEngine::~tst_PlatformSocketEngine()
 {
 }
 
-void tst_QNativeSocketEngine::init()
+void tst_PlatformSocketEngine::init()
 {
 }
 
-void tst_QNativeSocketEngine::cleanup()
+void tst_PlatformSocketEngine::cleanup()
 {
 }
 
 //---------------------------------------------------------------------------
-void tst_QNativeSocketEngine::construction()
+void tst_PlatformSocketEngine::construction()
 {
-    QNativeSocketEngine socketDevice;
+    PLATFORMSOCKETENGINE socketDevice;
 
     QVERIFY(!socketDevice.isValid());
 
@@ -145,9 +151,9 @@ void tst_QNativeSocketEngine::construction()
 }
 
 //---------------------------------------------------------------------------
-void tst_QNativeSocketEngine::simpleConnectToIMAP()
+void tst_PlatformSocketEngine::simpleConnectToIMAP()
 {
-    QNativeSocketEngine socketDevice;
+    PLATFORMSOCKETENGINE socketDevice;
 
     // Initialize device
     QVERIFY(socketDevice.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol));
@@ -202,12 +208,12 @@ void tst_QNativeSocketEngine::simpleConnectToIMAP()
 }
 
 //---------------------------------------------------------------------------
-void tst_QNativeSocketEngine::udpLoopbackTest()
+void tst_PlatformSocketEngine::udpLoopbackTest()
 {
 #ifdef SYMBIAN_WINSOCK_CONNECTIVITY
     QSKIP("Not working on Emulator without WinPCAP", SkipAll);
 #endif
-    QNativeSocketEngine udpSocket;
+    PLATFORMSOCKETENGINE udpSocket;
 
     // Initialize device #1
     QVERIFY(udpSocket.initialize(QAbstractSocket::UdpSocket));
@@ -224,7 +230,7 @@ void tst_QNativeSocketEngine::udpLoopbackTest()
     QVERIFY(port != 0);
 
     // Initialize device #2
-    QNativeSocketEngine udpSocket2;
+    PLATFORMSOCKETENGINE udpSocket2;
     QVERIFY(udpSocket2.initialize(QAbstractSocket::UdpSocket));
 
     // Connect device #2 to #1
@@ -253,12 +259,12 @@ void tst_QNativeSocketEngine::udpLoopbackTest()
 }
 
 //---------------------------------------------------------------------------
-void tst_QNativeSocketEngine::udpIPv6LoopbackTest()
+void tst_PlatformSocketEngine::udpIPv6LoopbackTest()
 {
 #if defined(Q_OS_SYMBIAN)
     QSKIP("Symbian: IPv6 is not yet supported", SkipAll);
 #endif
-    QNativeSocketEngine udpSocket;
+    PLATFORMSOCKETENGINE udpSocket;
 
     // Initialize device #1
     bool init = udpSocket.initialize(QAbstractSocket::UdpSocket, QAbstractSocket::IPv6Protocol);
@@ -275,7 +281,7 @@ void tst_QNativeSocketEngine::udpIPv6LoopbackTest()
         QVERIFY(port != 0);
 
         // Initialize device #2
-        QNativeSocketEngine udpSocket2;
+        PLATFORMSOCKETENGINE udpSocket2;
         QVERIFY(udpSocket2.initialize(QAbstractSocket::UdpSocket, QAbstractSocket::IPv6Protocol));
 
         // Connect device #2 to #1
@@ -305,12 +311,12 @@ void tst_QNativeSocketEngine::udpIPv6LoopbackTest()
 }
 
 //---------------------------------------------------------------------------
-void tst_QNativeSocketEngine::broadcastTest()
+void tst_PlatformSocketEngine::broadcastTest()
 {
 #ifdef Q_OS_AIX
     QSKIP("Broadcast does not work on darko", SkipAll);
 #endif
-    QNativeSocketEngine broadcastSocket;
+    PLATFORMSOCKETENGINE broadcastSocket;
 
     // Initialize a regular Udp socket
     QVERIFY(broadcastSocket.initialize(QAbstractSocket::UdpSocket));
@@ -346,9 +352,9 @@ void tst_QNativeSocketEngine::broadcastTest()
 }
 
 //---------------------------------------------------------------------------
-void tst_QNativeSocketEngine::serverTest()
+void tst_PlatformSocketEngine::serverTest()
 {
-    QNativeSocketEngine server;
+    PLATFORMSOCKETENGINE server;
 
     // Initialize a Tcp socket
     QVERIFY(server.initialize(QAbstractSocket::TcpSocket));
@@ -363,7 +369,7 @@ void tst_QNativeSocketEngine::serverTest()
     QVERIFY(server.state() == QAbstractSocket::ListeningState);
 
     // Initialize a Tcp socket
-    QNativeSocketEngine client;
+    PLATFORMSOCKETENGINE client;
     QVERIFY(client.initialize(QAbstractSocket::TcpSocket));
     if (!client.connectToHost(QHostAddress("127.0.0.1"), port)) {
         QVERIFY(client.state() == QAbstractSocket::ConnectingState);
@@ -377,7 +383,7 @@ void tst_QNativeSocketEngine::serverTest()
 
     // A socket device is initialized on the server side, passing the
     // socket descriptor from accept(). It's pre-connected.
-    QNativeSocketEngine serverSocket;
+    PLATFORMSOCKETENGINE serverSocket;
     QVERIFY(serverSocket.initialize(socketDescriptor));
     QVERIFY(serverSocket.state() == QAbstractSocket::ConnectedState);
 
@@ -400,12 +406,12 @@ void tst_QNativeSocketEngine::serverTest()
 }
 
 //---------------------------------------------------------------------------
-void tst_QNativeSocketEngine::udpLoopbackPerformance()
+void tst_PlatformSocketEngine::udpLoopbackPerformance()
 {
 #ifdef SYMBIAN_WINSOCK_CONNECTIVITY
     QSKIP("Not working on Emulator without WinPCAP", SkipAll);
 #endif
-    QNativeSocketEngine udpSocket;
+    PLATFORMSOCKETENGINE udpSocket;
 
     // Initialize device #1
     QVERIFY(udpSocket.initialize(QAbstractSocket::UdpSocket));
@@ -422,7 +428,7 @@ void tst_QNativeSocketEngine::udpLoopbackPerformance()
     QVERIFY(port != 0);
 
     // Initialize device #2
-    QNativeSocketEngine udpSocket2;
+    PLATFORMSOCKETENGINE udpSocket2;
     QVERIFY(udpSocket2.initialize(QAbstractSocket::UdpSocket));
 
     // Connect device #2 to #1
@@ -454,9 +460,9 @@ void tst_QNativeSocketEngine::udpLoopbackPerformance()
 }
 
 //---------------------------------------------------------------------------
-void tst_QNativeSocketEngine::tcpLoopbackPerformance()
+void tst_PlatformSocketEngine::tcpLoopbackPerformance()
 {
-    QNativeSocketEngine server;
+    PLATFORMSOCKETENGINE server;
 
     // Initialize a Tcp socket
     QVERIFY(server.initialize(QAbstractSocket::TcpSocket));
@@ -471,7 +477,7 @@ void tst_QNativeSocketEngine::tcpLoopbackPerformance()
     QVERIFY(server.state() == QAbstractSocket::ListeningState);
 
     // Initialize a Tcp socket
-    QNativeSocketEngine client;
+    PLATFORMSOCKETENGINE client;
     QVERIFY(client.initialize(QAbstractSocket::TcpSocket));
 
     // Connect to our server
@@ -487,7 +493,7 @@ void tst_QNativeSocketEngine::tcpLoopbackPerformance()
 
     // A socket device is initialized on the server side, passing the
     // socket descriptor from accept(). It's pre-connected.
-    QNativeSocketEngine serverSocket;
+    PLATFORMSOCKETENGINE serverSocket;
     QVERIFY(serverSocket.initialize(socketDescriptor));
     QVERIFY(serverSocket.state() == QAbstractSocket::ConnectedState);
 
@@ -517,9 +523,9 @@ void tst_QNativeSocketEngine::tcpLoopbackPerformance()
 }
 
 //---------------------------------------------------------------------------
-void tst_QNativeSocketEngine::readWriteBufferSize()
+void tst_PlatformSocketEngine::readWriteBufferSize()
 {
-    QNativeSocketEngine device;
+    PLATFORMSOCKETENGINE device;
 
     QVERIFY(device.initialize(QAbstractSocket::TcpSocket));
 
@@ -539,15 +545,15 @@ void tst_QNativeSocketEngine::readWriteBufferSize()
 }
 
 //---------------------------------------------------------------------------
-void tst_QNativeSocketEngine::tooManySockets()
+void tst_PlatformSocketEngine::tooManySockets()
 {
 #if defined Q_OS_WIN
     QSKIP("Certain windows machines suffocate and spend too much time in this test.", SkipAll);
 #endif
-    QList<QNativeSocketEngine *> sockets;
-    QNativeSocketEngine *socketLayer = 0;
+    QList<PLATFORMSOCKETENGINE *> sockets;
+    PLATFORMSOCKETENGINE *socketLayer = 0;
     for (;;) {
-        socketLayer = new QNativeSocketEngine;
+        socketLayer = new PLATFORMSOCKETENGINE;
         sockets.append(socketLayer);
 
         if (!socketLayer->initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol))
@@ -560,20 +566,20 @@ void tst_QNativeSocketEngine::tooManySockets()
 }
 
 //---------------------------------------------------------------------------
-void tst_QNativeSocketEngine::bind()
+void tst_PlatformSocketEngine::bind()
 {
 #if !defined Q_OS_WIN && !defined Q_OS_SYMBIAN
-    QNativeSocketEngine binder;
+    PLATFORMSOCKETENGINE binder;
     QVERIFY(binder.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol));
     QVERIFY(!binder.bind(QHostAddress::Any, 82));
     QVERIFY(binder.error() == QAbstractSocket::SocketAccessError);
 #endif
 
-    QNativeSocketEngine binder2;
+    PLATFORMSOCKETENGINE binder2;
     QVERIFY(binder2.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol));
     QVERIFY(binder2.bind(QHostAddress::Any, 31180));
 
-    QNativeSocketEngine binder3;
+    PLATFORMSOCKETENGINE binder3;
     QVERIFY(binder3.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol));
     QVERIFY(!binder3.bind(QHostAddress::Any, 31180));
 
@@ -586,9 +592,9 @@ void tst_QNativeSocketEngine::bind()
 }
 
 //---------------------------------------------------------------------------
-void tst_QNativeSocketEngine::networkError()
+void tst_PlatformSocketEngine::networkError()
 {
-    QNativeSocketEngine client;
+    PLATFORMSOCKETENGINE client;
 
     QVERIFY(client.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol));
 
@@ -612,19 +618,19 @@ void tst_QNativeSocketEngine::networkError()
 }
 
 //---------------------------------------------------------------------------
-void tst_QNativeSocketEngine::setSocketDescriptor()
+void tst_PlatformSocketEngine::setSocketDescriptor()
 {
-    QNativeSocketEngine socket1;
+    PLATFORMSOCKETENGINE socket1;
     QVERIFY(socket1.initialize(QAbstractSocket::TcpSocket));
 
-    QNativeSocketEngine socket2;
+    PLATFORMSOCKETENGINE socket2;
     QVERIFY(socket2.initialize(socket1.socketDescriptor()));
 }
 
 //---------------------------------------------------------------------------
-void tst_QNativeSocketEngine::invalidSend()
+void tst_PlatformSocketEngine::invalidSend()
 {
-    QNativeSocketEngine socket;
+    PLATFORMSOCKETENGINE socket;
     QVERIFY(socket.initialize(QAbstractSocket::TcpSocket));
 
     QTest::ignoreMessage(QtWarningMsg, "QNativeSocketEngine::writeDatagram() was"
@@ -634,9 +640,9 @@ void tst_QNativeSocketEngine::invalidSend()
 }
 
 //---------------------------------------------------------------------------
-void tst_QNativeSocketEngine::receiveUrgentData()
+void tst_PlatformSocketEngine::receiveUrgentData()
 {
-    QNativeSocketEngine server;
+    PLATFORMSOCKETENGINE server;
 
     QVERIFY(server.initialize(QAbstractSocket::TcpSocket));
 
@@ -648,7 +654,7 @@ void tst_QNativeSocketEngine::receiveUrgentData()
     QVERIFY(server.listen());
     QVERIFY(server.state() == QAbstractSocket::ListeningState);
 
-    QNativeSocketEngine client;
+    PLATFORMSOCKETENGINE client;
     QVERIFY(client.initialize(QAbstractSocket::TcpSocket));
 
     if (!client.connectToHost(QHostAddress("127.0.0.1"), port)) {
@@ -660,7 +666,7 @@ void tst_QNativeSocketEngine::receiveUrgentData()
     int socketDescriptor = server.accept();
     QVERIFY(socketDescriptor > 0);
 
-    QNativeSocketEngine serverSocket;
+    PLATFORMSOCKETENGINE serverSocket;
     QVERIFY(serverSocket.initialize(socketDescriptor));
     QVERIFY(serverSocket.state() == QAbstractSocket::ConnectedState);
 
@@ -701,5 +707,5 @@ void tst_QNativeSocketEngine::receiveUrgentData()
 
 }
 
-QTEST_MAIN(tst_QNativeSocketEngine)
-#include "tst_qnativesocketengine.moc"
+QTEST_MAIN(tst_PlatformSocketEngine)
+#include "tst_platformsocketengine.moc"
diff --git a/tests/auto/qhttpsocketengine/qhttpsocketengine.pro b/tests/auto/qhttpsocketengine/qhttpsocketengine.pro
index d76ebb6..6df6192 100644
--- a/tests/auto/qhttpsocketengine/qhttpsocketengine.pro
+++ b/tests/auto/qhttpsocketengine/qhttpsocketengine.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 SOURCES  += tst_qhttpsocketengine.cpp
 
 
-include(../qnativesocketengine/qsocketengine.pri)
+include(../platformsocketengine/platformsocketengine.pri)
 
 MOC_DIR=tmp
 
diff --git a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro
index 171d428..c82c62d 100644
--- a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro
+++ b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 SOURCES  += tst_qsocks5socketengine.cpp
 
 
-include(../qnativesocketengine/qsocketengine.pri)
+include(../platformsocketengine/platformsocketengine.pri)
 
 
 MOC_DIR=tmp