From 95cebd34ebc5b4d39b11dc91610309a35e488663 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Tue, 27 Sep 2011 19:53:01 +1000
Subject: Remove Symbian-specific code from tests.

Symbian is not a supported platform for Qt5, so this code is no longer
required.

Change-Id: I1172e6a42d518490e63e9599bf10579df08259aa
Reviewed-on: http://codereview.qt-project.org/5657
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---
 tests/auto/networkselftest/networkselftest.pro     |  5 -----
 tests/auto/networkselftest/tst_networkselftest.cpp | 20 --------------------
 2 files changed, 25 deletions(-)

(limited to 'tests/auto/networkselftest')

diff --git a/tests/auto/networkselftest/networkselftest.pro b/tests/auto/networkselftest/networkselftest.pro
index 2742fcb297..4440dc6cfd 100644
--- a/tests/auto/networkselftest/networkselftest.pro
+++ b/tests/auto/networkselftest/networkselftest.pro
@@ -8,11 +8,6 @@ wince*: {
     addFiles.path = .
     DEPLOYMENT += addFiles
     DEFINES += SRCDIR=\\\"\\\"
-} else:symbian {
-    addFiles.files = rfc3252.txt
-    addFiles.path = .
-    DEPLOYMENT += addFiles
-    TARGET.CAPABILITY = NetworkServices ReadUserData
 } else:vxworks*: {
     DEFINES += SRCDIR=\\\"\\\"
 } else {
diff --git a/tests/auto/networkselftest/tst_networkselftest.cpp b/tests/auto/networkselftest/tst_networkselftest.cpp
index c21fd03f86..82ea045732 100644
--- a/tests/auto/networkselftest/tst_networkselftest.cpp
+++ b/tests/auto/networkselftest/tst_networkselftest.cpp
@@ -50,13 +50,6 @@
 #include <QtNetwork/qnetworksession.h>
 #endif
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-// Current path (C:\private\<UID>) contains only ascii chars
-//#define SRCDIR QDir::currentPath()
-#define SRCDIR "."
-#endif
-
 #include "../network-settings.h"
 
 class tst_NetworkSelfTest: public QObject
@@ -345,7 +338,6 @@ static void netChat(int port, const QList<Chat> &chat)
 
 tst_NetworkSelfTest::tst_NetworkSelfTest()
 {
-    Q_SET_DEFAULT_IAP
 }
 
 tst_NetworkSelfTest::~tst_NetworkSelfTest()
@@ -450,11 +442,6 @@ void tst_NetworkSelfTest::remotePortsOpen_data()
 
 void tst_NetworkSelfTest::remotePortsOpen()
 {
-#ifdef Q_OS_SYMBIAN
-    if (qstrcmp(QTest::currentDataTag(), "http-proxy-auth-ntlm") == 0)
-        QSKIP("NTML authentication not yet supported in Symbian", SkipSingle);
-#endif
-
     QFETCH(int, portNumber);
     QTcpSocket socket;
     socket.connectToHost(QtNetworkSettings::serverName(), portNumber);
@@ -532,9 +519,6 @@ static QList<Chat> ftpChat(const QByteArray &userSuffix = QByteArray())
 //            << Chat::expect("213 40\r\n")
 
             << Chat::send("QUIT\r\n");
-#ifdef Q_OS_SYMBIAN
-    if (userSuffix.length() == 0) // received but unacknowledged packets are discarded by TCP RST, so this doesn't work with frox proxy
-#endif
         rv  << Chat::expect("221")
             << Chat::discardUntil("\r\n");
 
@@ -877,9 +861,6 @@ void tst_NetworkSelfTest::httpProxyBasicAuth()
 
 void tst_NetworkSelfTest::httpProxyNtlmAuth()
 {
-#ifdef Q_OS_SYMBIAN
-    QSKIP("NTML authentication not yet supported in Symbian", SkipAll);
-#else
     netChat(3130, QList<Chat>()
             // test auth required response
             << Chat::send("GET http://" + QtNetworkSettings::serverName().toLatin1() + "/ HTTP/1.0\r\n"
@@ -892,7 +873,6 @@ void tst_NetworkSelfTest::httpProxyNtlmAuth()
             << Chat::discardUntil("\r\nProxy-Authenticate: NTLM\r\n")
             << Chat::DiscardUntilDisconnect
             );
-#endif
 }
 
 // SOCKSv5 is a binary protocol
-- 
cgit v1.2.3