diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-09-27 19:53:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 06:41:42 +0200 |
| commit | 95cebd34ebc5b4d39b11dc91610309a35e488663 (patch) | |
| tree | 90ceffef5acea093dd2b8f8f7e8c30593023b85a /tests/auto/network | |
| parent | ab061e3e436fab35eac8666f3e950e98f66c4d3e (diff) | |
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>
Diffstat (limited to 'tests/auto/network')
67 files changed, 71 insertions, 926 deletions
diff --git a/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro b/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro index 4dea3c9c8c..8e44eae43b 100644 --- a/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro +++ b/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro @@ -3,12 +3,10 @@ QT += network QT -= gui SOURCES += tst_qabstractnetworkcache.cpp -wince*|symbian: { +wince* { testFiles.files = tests testFiles.path = . DEPLOYMENT += testFiles } -symbian: TARGET.CAPABILITY = NetworkServices - CONFIG += insignificant_test # QTBUG-20686; note, assumed unstable on all platforms diff --git a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp index 244c9b13b5..1491d64c58 100644 --- a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp +++ b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp @@ -121,8 +121,6 @@ public: tst_QAbstractNetworkCache::tst_QAbstractNetworkCache() { - Q_SET_DEFAULT_IAP - QCoreApplication::setOrganizationName(QLatin1String("Trolltech")); QCoreApplication::setApplicationName(QLatin1String("autotest_qabstractnetworkcache")); QCoreApplication::setApplicationVersion(QLatin1String("1.0")); diff --git a/tests/auto/network/access/qftp/qftp.pro b/tests/auto/network/access/qftp/qftp.pro index 8f63d6e26e..2aa80b346b 100644 --- a/tests/auto/network/access/qftp/qftp.pro +++ b/tests/auto/network/access/qftp/qftp.pro @@ -9,12 +9,6 @@ wince*: { addFiles.path = . DEPLOYMENT += addFiles DEFINES += SRCDIR=\\\"\\\" -} else:symbian { - addFiles.files = rfc3252.txt - addFiles.path = . - DEPLOYMENT += addFiles - TARGET.EPOCHEAPSIZE="0x100 0x1000000" - TARGET.CAPABILITY = NetworkServices } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } diff --git a/tests/auto/network/access/qftp/tst_qftp.cpp b/tests/auto/network/access/qftp/tst_qftp.cpp index 117ac92ed7..8636d6500e 100644 --- a/tests/auto/network/access/qftp/tst_qftp.cpp +++ b/tests/auto/network/access/qftp/tst_qftp.cpp @@ -60,12 +60,6 @@ //TESTED_CLASS= //TESTED_FILES= -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -// Application private dir is default serach path for files, so SRCDIR can be set to empty -#define SRCDIR "" -#endif - #ifndef QT_NO_BEARERMANAGEMENT Q_DECLARE_METATYPE(QNetworkConfiguration) #endif @@ -1358,8 +1352,8 @@ void tst_QFtp::abort_data() QTest::newRow( "get_fluke01" ) << QtNetworkSettings::serverName() << (uint)21 << QString("qtest/bigfile") << QByteArray(); QTest::newRow( "get_fluke02" ) << QtNetworkSettings::serverName() << (uint)21 << QString("qtest/rfc3252") << QByteArray(); - // Qt/CE and Symbian test environment has to less memory for this test -#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) + // Qt/CE test environment has too little memory for this test +#if !defined(Q_OS_WINCE) QByteArray bigData( 10*1024*1024, 0 ); #else QByteArray bigData( 1*1024*1024, 0 ); diff --git a/tests/auto/network/access/qhttp/qhttp.pro b/tests/auto/network/access/qhttp/qhttp.pro index f01f60f3d7..81a67caab3 100644 --- a/tests/auto/network/access/qhttp/qhttp.pro +++ b/tests/auto/network/access/qhttp/qhttp.pro @@ -13,15 +13,6 @@ wince*: { addFiles.path = . DEPLOYMENT += addFiles webFiles cgi DEFINES += SRCDIR=\\\"\\\" -} else:symbian { - webFiles.files = webserver/* - webFiles.path = webserver - cgi.files = webserver/cgi-bin/* - cgi.path = webserver/cgi-bin - addFiles.files = rfc3252.txt trolltech - addFiles.path = . - DEPLOYMENT += addFiles webFiles cgi - TARGET.CAPABILITY = NetworkServices } else:vxworks*: { DEFINES += SRCDIR=\\\"\\\" } else { diff --git a/tests/auto/network/access/qhttp/tst_qhttp.cpp b/tests/auto/network/access/qhttp/tst_qhttp.cpp index 8875232714..a0c4a4ebd4 100644 --- a/tests/auto/network/access/qhttp/tst_qhttp.cpp +++ b/tests/auto/network/access/qhttp/tst_qhttp.cpp @@ -62,12 +62,6 @@ //TESTED_CLASS= //TESTED_FILES= -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -// And underlying Open C have application private dir in default search path -#define SRCDIR "" -#endif - Q_DECLARE_METATYPE(QHttpResponseHeader) class tst_QHttp : public QObject @@ -196,7 +190,6 @@ const int bytesDone_init = -10; tst_QHttp::tst_QHttp() { - Q_SET_DEFAULT_IAP } tst_QHttp::~tst_QHttp() diff --git a/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro index 1ce5d8a092..2a4c737c53 100644 --- a/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro +++ b/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro @@ -5,9 +5,4 @@ requires(contains(QT_CONFIG,private_tests)) QT = core-private network-private -symbian: TARGET.CAPABILITY = NetworkServices -symbian: { - INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE -} - CONFIG+=insignificant_test # QTBUG-20981, crashes sometimes diff --git a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp index 2d30f6bca1..bbc1d21068 100644 --- a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp +++ b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp @@ -118,7 +118,6 @@ private Q_SLOTS: tst_QHttpNetworkConnection::tst_QHttpNetworkConnection() { - Q_SET_DEFAULT_IAP } void tst_QHttpNetworkConnection::initTestCase() diff --git a/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro b/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro index 8ce9f6f760..5c61de3101 100644 --- a/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro +++ b/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro @@ -4,4 +4,3 @@ INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib requires(contains(QT_CONFIG,private_tests)) QT = core-private network-private -symbian: TARGET.CAPABILITY = NetworkServices diff --git a/tests/auto/network/access/qnetworkaccessmanager/qnetworkaccessmanager.pro b/tests/auto/network/access/qnetworkaccessmanager/qnetworkaccessmanager.pro index 3ccbffbde8..6869afeb79 100644 --- a/tests/auto/network/access/qnetworkaccessmanager/qnetworkaccessmanager.pro +++ b/tests/auto/network/access/qnetworkaccessmanager/qnetworkaccessmanager.pro @@ -1,6 +1,3 @@ load(qttest_p4) SOURCES += tst_qnetworkaccessmanager.cpp QT = core network - -symbian: TARGET.CAPABILITY = NetworkServices - diff --git a/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro b/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro index ae0941e964..eb57e3efe5 100644 --- a/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro +++ b/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro @@ -2,6 +2,3 @@ load(qttest_p4) QT -= gui QT += network SOURCES += tst_qnetworkcachemetadata.cpp - -symbian: TARGET.CAPABILITY = NetworkServices - diff --git a/tests/auto/network/access/qnetworkcookie/qnetworkcookie.pro b/tests/auto/network/access/qnetworkcookie/qnetworkcookie.pro index 2f31138daf..95d8b6ea1f 100644 --- a/tests/auto/network/access/qnetworkcookie/qnetworkcookie.pro +++ b/tests/auto/network/access/qnetworkcookie/qnetworkcookie.pro @@ -2,4 +2,3 @@ load(qttest_p4) SOURCES += tst_qnetworkcookie.cpp QT = core network -symbian: TARGET.CAPABILITY = NetworkServices diff --git a/tests/auto/network/access/qnetworkcookiejar/qnetworkcookiejar.pro b/tests/auto/network/access/qnetworkcookiejar/qnetworkcookiejar.pro index 4e5f01745a..2aecebf071 100644 --- a/tests/auto/network/access/qnetworkcookiejar/qnetworkcookiejar.pro +++ b/tests/auto/network/access/qnetworkcookiejar/qnetworkcookiejar.pro @@ -2,4 +2,3 @@ load(qttest_p4) SOURCES += tst_qnetworkcookiejar.cpp QT = core core-private network network-private -symbian: TARGET.CAPABILITY = NetworkServices diff --git a/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro b/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro index c05171dac7..c48699dc55 100644 --- a/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro +++ b/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro @@ -2,6 +2,3 @@ load(qttest_p4) QT -= gui QT += network SOURCES += tst_qnetworkdiskcache.cpp - -symbian: TARGET.CAPABILITY = NetworkServices - diff --git a/tests/auto/network/access/qnetworkreply/echo/echo.pro b/tests/auto/network/access/qnetworkreply/echo/echo.pro index 74b0bfcab3..1f05fd9a54 100644 --- a/tests/auto/network/access/qnetworkreply/echo/echo.pro +++ b/tests/auto/network/access/qnetworkreply/echo/echo.pro @@ -2,5 +2,3 @@ SOURCES += main.cpp QT = core CONFIG -= app_bundle debug_and_release_target CONFIG += console - -symbian:TARGET.CAPABILITY="ALL -TCB" diff --git a/tests/auto/network/access/qnetworkreply/qnetworkreply.pro b/tests/auto/network/access/qnetworkreply/qnetworkreply.pro index 86d3155c05..fd8454c235 100644 --- a/tests/auto/network/access/qnetworkreply/qnetworkreply.pro +++ b/tests/auto/network/access/qnetworkreply/qnetworkreply.pro @@ -4,4 +4,3 @@ SUBDIRS = test requires(contains(QT_CONFIG,private_tests)) !wince*:SUBDIRS += echo -symbian: TARGET.CAPABILITY = NetworkServices diff --git a/tests/auto/network/access/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro index dba1c69dbb..b73cd34218 100644 --- a/tests/auto/network/access/qnetworkreply/test/test.pro +++ b/tests/auto/network/access/qnetworkreply/test/test.pro @@ -13,12 +13,12 @@ win32 { } } -!symbian:DEFINES += SRCDIR=\\\"$$PWD/..\\\" +DEFINES += SRCDIR=\\\"$$PWD/..\\\" QT = core-private network-private RESOURCES += ../qnetworkreply.qrc -symbian|wince*:{ +wince* { # For cross compiled targets, reference data files need to be deployed addFiles.files = ../empty ../rfc3252.txt ../resource ../bigfile ../*.jpg addFiles.path = . @@ -28,11 +28,3 @@ symbian|wince*:{ certFiles.path = . DEPLOYMENT += certFiles } - -symbian:{ - # Symbian toolchain does not support correct include semantics - INCLUDEPATH+=..\\..\\..\\..\\include\\QtNetwork\\private - # bigfile test case requires more heap - TARGET.EPOCHEAPSIZE="0x100 0x10000000" - TARGET.CAPABILITY="ALL -TCB" -} diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index dd9fe8ee82..f668930ffa 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -77,10 +77,6 @@ #include "private/qnetworkaccessmanager_p.h" -#ifdef Q_OS_SYMBIAN -#define SRCDIR "." -#endif - #include "../../../network-settings.h" Q_DECLARE_METATYPE(QSharedPointer<char>) @@ -754,7 +750,7 @@ public: QTcpSocket *active = new QTcpSocket(this); active->connectToHost("127.0.0.1", server.serverPort()); -#ifndef Q_OS_SYMBIAN + // need more time as working with embedded // device and testing from emualtor // things tend to get slower @@ -763,13 +759,7 @@ public: if (!server.waitForNewConnection(1000)) return false; -#else - if (!active->waitForConnected(100)) - return false; - if (!server.waitForNewConnection(100)) - return false; -#endif QTcpSocket *passive = server.nextPendingConnection(); passive->setParent(this); @@ -1089,8 +1079,6 @@ tst_QNetworkReply::tst_QNetworkReply() #endif qRegisterMetaType<QNetworkReply::NetworkError>(); - Q_SET_DEFAULT_IAP - testFileName = QDir::currentPath() + "/testfile"; uniqueExtension = createUniqueExtension(); cookieJar = new MyCookieJar; @@ -1637,7 +1625,7 @@ void tst_QNetworkReply::getErrors_data() << int(QNetworkReply::ContentOperationNotPermittedError) << 0 << true; QTest::newRow("file-exist") << QUrl::fromLocalFile(QDir::currentPath() + "/this-file-doesnt-exist.txt").toString() << int(QNetworkReply::ContentNotFoundError) << 0 << true; -#if !defined Q_OS_WIN && !defined(Q_OS_SYMBIAN) +#if !defined Q_OS_WIN QTest::newRow("file-is-wronly") << QUrl::fromLocalFile(wronlyFileName).toString() << int(QNetworkReply::ContentAccessDenied) << 0 << true; #endif @@ -3763,8 +3751,8 @@ void tst_QNetworkReply::ioPutToFileFromProcess_data() void tst_QNetworkReply::ioPutToFileFromProcess() { -#if defined(Q_OS_WINCE) || defined (Q_OS_SYMBIAN) - QSKIP("Currently no stdin/out supported for Windows CE / Symbian OS", SkipAll); +#if defined(Q_OS_WINCE) + QSKIP("Currently no stdin/out supported for Windows CE", SkipAll); #else #ifdef Q_OS_WIN @@ -4625,14 +4613,7 @@ void tst_QNetworkReply::downloadProgress_data() QTest::newRow("empty") << 0; QTest::newRow("small") << 4; -#ifndef Q_OS_SYMBIAN QTest::newRow("big") << 4096; -#else - // it can run even with 4096 - // but it takes lot time - //especially on emulator - QTest::newRow("big") << 1024; -#endif } void tst_QNetworkReply::downloadProgress() @@ -5264,13 +5245,7 @@ void tst_QNetworkReply::httpConnectionCount() break; } -#ifdef Q_OS_SYMBIAN - // see in qhttpnetworkconnection.cpp - // hardcoded defaultChannelCount = 3 - QCOMPARE(pendingConnectionCount, 3); -#else QCOMPARE(pendingConnectionCount, 6); -#endif } void tst_QNetworkReply::httpReUsingConnectionSequential_data() @@ -5798,7 +5773,7 @@ void tst_QNetworkReply::getFromHttpIntoBuffer2() QFETCH(bool, useDownloadBuffer); // On my Linux Desktop the results are already visible with 128 kB, however we use this to have good results. -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_WINCE_WM) +#if defined(Q_WS_WINCE_WM) // Show some mercy to non-desktop platform/s enum {UploadSize = 4*1024*1024}; // 4 MB #else diff --git a/tests/auto/network/access/qnetworkrequest/qnetworkrequest.pro b/tests/auto/network/access/qnetworkrequest/qnetworkrequest.pro index f96fd3bb02..f576ba221f 100644 --- a/tests/auto/network/access/qnetworkrequest/qnetworkrequest.pro +++ b/tests/auto/network/access/qnetworkrequest/qnetworkrequest.pro @@ -2,4 +2,3 @@ load(qttest_p4) SOURCES += tst_qnetworkrequest.cpp QT = core network -symbian: TARGET.CAPABILITY = NetworkServices diff --git a/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro b/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro index ca463bdc99..8910fbc209 100644 --- a/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro +++ b/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro @@ -4,10 +4,6 @@ HEADERS += ../qbearertestcommon.h QT = core network -symbian { - TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData -} - maemo6|maemo5 { CONFIG += link_pkgconfig diff --git a/tests/auto/network/bearer/qnetworkconfiguration/tst_qnetworkconfiguration.cpp b/tests/auto/network/bearer/qnetworkconfiguration/tst_qnetworkconfiguration.cpp index a8add01e06..a2c9acea6e 100644 --- a/tests/auto/network/bearer/qnetworkconfiguration/tst_qnetworkconfiguration.cpp +++ b/tests/auto/network/bearer/qnetworkconfiguration/tst_qnetworkconfiguration.cpp @@ -52,7 +52,7 @@ */ #include <QNetworkAccessManager> -#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) && !defined (Q_OS_SYMBIAN) +#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) #include <stdio.h> #include <iapconf.h> #endif @@ -73,7 +73,7 @@ private slots: void isRoamingAvailable(); private: -#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) && !defined (Q_OS_SYMBIAN) +#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) Maemo::IAPConf *iapconf; Maemo::IAPConf *iapconf2; Maemo::IAPConf *gprsiap; @@ -85,7 +85,7 @@ private: void tst_QNetworkConfiguration::initTestCase() { -#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) && !defined (Q_OS_SYMBIAN) +#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) iapconf = new Maemo::IAPConf("007"); iapconf->setValue("ipv4_type", "AUTO"); iapconf->setValue("wlan_wepkey1", "connt"); @@ -158,7 +158,7 @@ void tst_QNetworkConfiguration::initTestCase() void tst_QNetworkConfiguration::cleanupTestCase() { -#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) && !defined (Q_OS_SYMBIAN) +#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) iapconf->clear(); delete iapconf; iapconf2->clear(); diff --git a/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro b/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro index d9c1d6bba6..8dfd3402bc 100644 --- a/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro +++ b/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro @@ -4,10 +4,6 @@ HEADERS += ../qbearertestcommon.h QT = core network -symbian { - TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData -} - maemo6|maemo5 { CONFIG += link_pkgconfig diff --git a/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp b/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp index d29ef77347..9ced5464a0 100644 --- a/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp +++ b/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp @@ -45,7 +45,7 @@ #include <QtNetwork/qnetworkconfiguration.h> #include <QtNetwork/qnetworkconfigmanager.h> -#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) && !defined (Q_OS_SYMBIAN) +#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) #include <stdio.h> #include <iapconf.h> #endif @@ -68,7 +68,7 @@ private slots: void configurationFromIdentifier(); private: -#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) && !defined (Q_OS_SYMBIAN) +#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) Maemo::IAPConf *iapconf; Maemo::IAPConf *iapconf2; Maemo::IAPConf *gprsiap; @@ -80,7 +80,7 @@ private: void tst_QNetworkConfigurationManager::initTestCase() { -#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) && !defined (Q_OS_SYMBIAN) +#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) iapconf = new Maemo::IAPConf("007"); iapconf->setValue("ipv4_type", "AUTO"); iapconf->setValue("wlan_wepkey1", "connt"); @@ -154,7 +154,7 @@ void tst_QNetworkConfigurationManager::initTestCase() void tst_QNetworkConfigurationManager::cleanupTestCase() { -#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) && !defined (Q_OS_SYMBIAN) +#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) iapconf->clear(); delete iapconf; iapconf2->clear(); diff --git a/tests/auto/network/bearer/qnetworksession/lackey/lackey.pro b/tests/auto/network/bearer/qnetworksession/lackey/lackey.pro index 5db6743c65..1605b31d94 100644 --- a/tests/auto/network/bearer/qnetworksession/lackey/lackey.pro +++ b/tests/auto/network/bearer/qnetworksession/lackey/lackey.pro @@ -7,9 +7,3 @@ DESTDIR = ./ win32:CONFIG += console mac:CONFIG -= app_bundle - -symbian { - # Needed for interprocess communication and opening QNetworkSession - TARGET.CAPABILITY = NetworkControl NetworkServices -} - diff --git a/tests/auto/network/bearer/qnetworksession/lackey/main.cpp b/tests/auto/network/bearer/qnetworksession/lackey/main.cpp index 73c52cdc8d..2b0f50f23e 100644 --- a/tests/auto/network/bearer/qnetworksession/lackey/main.cpp +++ b/tests/auto/network/bearer/qnetworksession/lackey/main.cpp @@ -83,7 +83,7 @@ int main(int argc, char** argv) return NO_DISCOVERED_CONFIGURATIONS_ERROR; } - // Cannot read/write to processes on WinCE or Symbian. + // Cannot read/write to processes on WinCE. // Easiest alternative is to use sockets for IPC. QLocalSocket oopSocket; diff --git a/tests/auto/network/bearer/qnetworksession/qnetworksession.pro b/tests/auto/network/bearer/qnetworksession/qnetworksession.pro index 34761e53cf..a85925bc17 100644 --- a/tests/auto/network/bearer/qnetworksession/qnetworksession.pro +++ b/tests/auto/network/bearer/qnetworksession/qnetworksession.pro @@ -1,3 +1,2 @@ TEMPLATE = subdirs SUBDIRS = lackey test -symbian: TARGET.CAPABILITY = NetworkServices diff --git a/tests/auto/network/bearer/qnetworksession/test/test.pro b/tests/auto/network/bearer/qnetworksession/test/test.pro index fff5770721..97a6cdce5f 100644 --- a/tests/auto/network/bearer/qnetworksession/test/test.pro +++ b/tests/auto/network/bearer/qnetworksession/test/test.pro @@ -15,10 +15,6 @@ CONFIG(debug_and_release) { DESTDIR = .. } -symbian { - TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData PowerMgmt -} - maemo6|maemo5 { CONFIG += link_pkgconfig diff --git a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp index 0c35a552f6..f000cd3d84 100644 --- a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp +++ b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp @@ -48,7 +48,7 @@ #include <QtNetwork/qnetworkconfigmanager.h> #include <QtNetwork/qnetworksession.h> -#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) && !defined (Q_OS_SYMBIAN) +#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) #include <stdio.h> #include <iapconf.h> #endif @@ -82,11 +82,6 @@ private slots: void repeatedOpenClose_data(); void repeatedOpenClose(); - void sessionStop_data(); - void sessionStop(); - - void roamingErrorCodes(); - void sessionProperties_data(); void sessionProperties(); @@ -105,7 +100,7 @@ private: int inProcessSessionManagementCount; -#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) && !defined (Q_OS_SYMBIAN) +#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) Maemo::IAPConf *iapconf; Maemo::IAPConf *iapconf2; Maemo::IAPConf *gprsiap; @@ -134,13 +129,11 @@ void tst_QNetworkSession::initTestCase() testsToRun["outOfProcessSession"] = true; testsToRun["invalidSession"] = true; testsToRun["repeatedOpenClose"] = true; - testsToRun["roamingErrorCodes"] = true; - testsToRun["sessionStop"] = true; testsToRun["sessionProperties"] = true; testsToRun["userChoiceSession"] = true; testsToRun["sessionOpenCloseStop"] = true; - -#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) && !defined (Q_OS_SYMBIAN) + +#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) iapconf = new Maemo::IAPConf("007"); iapconf->setValue("ipv4_type", "AUTO"); iapconf->setValue("wlan_wepkey1", "connt"); @@ -226,7 +219,7 @@ void tst_QNetworkSession::cleanupTestCase() "inProcessSessionManagement()"); } -#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) && !defined (Q_OS_SYMBIAN) +#if defined(Q_OS_UNIX) && !defined(QT_NO_ICD) iapconf->clear(); delete iapconf; iapconf2->clear(); @@ -348,7 +341,7 @@ void tst_QNetworkSession::invalidSession() qDebug() << "Add the WLAN IAP back (waiting 60 seconds): " << invalidatedConfig.name(); QTest::qWait(60000); } - + QNetworkConfiguration definedConfig = suitableConfiguration("WLAN",QNetworkConfiguration::InternetAccessPoint); if (definedConfig.isValid()) { // 4. Verify that opening a session with defined configuration emits error and enters notavailable-state @@ -363,11 +356,6 @@ void tst_QNetworkSession::invalidSession() updateConfigurations(); definedSession.open(); -#ifdef Q_OS_SYMBIAN - // On symbian, the connection opening is tried even with defined state. - qDebug("Waiting for 10 seconds to all signals to propagate."); - QTest::qWait(10000); -#endif updateConfigurations(); QVERIFY(definedConfig.isValid()); // Session remains valid @@ -377,10 +365,9 @@ void tst_QNetworkSession::invalidSession() QVERIFY(sessionError == QNetworkSession::InvalidConfigurationError); qDebug() << "Turn the WLAN IAP back on (waiting 60 seconds): " << definedConfig.name(); QTest::qWait(60000); - updateConfigurations(); + updateConfigurations(); QVERIFY(definedConfig.state() == QNetworkConfiguration::Discovered); } - #endif } @@ -433,11 +420,8 @@ void tst_QNetworkSession::sessionProperties() // QNetworkSession::interface() should return an invalid interface unless // session is in the connected state. #ifndef QT_NO_NETWORKINTERFACE -#if !(defined(Q_OS_SYMBIAN) && defined(__WINS__)) - // On Symbian emulator, the support for data bearers is limited QCOMPARE(session.state() == QNetworkSession::Connected, session.interface().isValid()); #endif -#endif if (!configuration.isValid()) { QVERIFY(configuration.state() == QNetworkConfiguration::Undefined && @@ -506,202 +490,6 @@ void tst_QNetworkSession::repeatedOpenClose() } } -void tst_QNetworkSession::roamingErrorCodes() -{ - if (!testsToRun["roamingErrorCodes"]) { - QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll); - } -#ifndef Q_OS_SYMBIAN - QSKIP("Roaming supported on Symbian.", SkipAll); -#else - QNetworkConfiguration wlanIapConfig = suitableConfiguration("WLAN", QNetworkConfiguration::InternetAccessPoint); - if (!wlanIapConfig.isValid()) { - QSKIP("No WLAN IAP accessible, skipping test.", SkipAll); - } - // Check that opening and closing two sessions on same config work gracefully: - QNetworkSession iapSession(wlanIapConfig); - QVERIFY(openSession(&iapSession)); - QNetworkSession adminIapSession(wlanIapConfig); - QVERIFY(openSession(&adminIapSession)); - QVERIFY(closeSession(&iapSession, false)); // false == not a last session based on the configuration - QVERIFY(closeSession(&adminIapSession)); - - // Open configurations again, force close bearer and check that errors are emitted correctly - // on the other session - QVERIFY(openSession(&iapSession)); - QVERIFY(openSession(&adminIapSession)); - QSignalSpy errorSpy(&iapSession, SIGNAL(error(QNetworkSession::SessionError))); - adminIapSession.stop(); // requires NetworkControl capabilities - QTRY_VERIFY(!errorSpy.isEmpty()); // wait for error signals - QNetworkSession::SessionError error = qvariant_cast<QNetworkSession::SessionError>(errorSpy.first().at(0)); - QTest::qWait(2000); // Wait for a moment to all platform signals to propagate - QVERIFY(error == QNetworkSession::SessionAbortedError); - QVERIFY(iapSession.state() == QNetworkSession::Disconnected); - QVERIFY(adminIapSession.state() == QNetworkSession::Disconnected); -#endif // Q_OS_SYMBIAN -} - - -void tst_QNetworkSession::sessionStop_data() { - QTest::addColumn<QString>("bearerType"); - QTest::addColumn<QNetworkConfiguration::Type>("configurationType"); - - QTest::newRow("SNAP") << "bearer_type_not_relevant_with_SNAPs" << QNetworkConfiguration::ServiceNetwork; - QTest::newRow("WLAN_IAP") << "WLAN" << QNetworkConfiguration::InternetAccessPoint; - QTest::newRow("Cellular_IAP") << "cellular" << QNetworkConfiguration::InternetAccessPoint; -} - -void tst_QNetworkSession::sessionStop() -{ - if (!testsToRun["sessionStop"]) { - QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll); - } -#ifndef Q_OS_SYMBIAN - QSKIP("Testcase contains mainly Symbian specific checks, because it is only platform to really support interface (IAP-level) Stop.", SkipAll); -#endif - QFETCH(QString, bearerType); - QFETCH(QNetworkConfiguration::Type, configurationType); - - int configWaitdelayInMs = 2000; - - updateConfigurations(); - printConfigurations(); - - QNetworkConfiguration config = suitableConfiguration(bearerType, configurationType); - if (!config.isValid()) { - QSKIP("No suitable configurations, skipping this round of session stop test.", SkipSingle); - } - qDebug() << "Using following configuration to open and stop a session: " << config.name(); - - QNetworkSession openedSession(config); - QNetworkSession closedSession(config); - QNetworkSession innocentSession(config); - QNetworkConfigurationManager mgr; - - QSignalSpy closedSessionOpenedSpy(&closedSession, SIGNAL(opened())); - QSignalSpy closedSessionClosedSpy(&closedSession, SIGNAL(closed())); - QSignalSpy closedSessionStateChangedSpy(&closedSession, SIGNAL(stateChanged(QNetworkSession::State))); - QSignalSpy closedErrorSpy(&closedSession, SIGNAL(error(QNetworkSession::SessionError))); - - QSignalSpy openedSessionClosedSpy(&openedSession, SIGNAL(closed())); - QSignalSpy openedSessionStateChangedSpy(&openedSession, SIGNAL(stateChanged(QNetworkSession::State))); - - QSignalSpy innocentSessionClosedSpy(&innocentSession, SIGNAL(closed())); - QSignalSpy innocentSessionStateChangedSpy(&innocentSession, SIGNAL(stateChanged(QNetworkSession::State))); - QSignalSpy innocentErrorSpy(&innocentSession, SIGNAL(error(QNetworkSession::SessionError))); - QNetworkSession::SessionError sessionError; - - // 1. Verify that stopping an opened session works (the simplest usecase). - qDebug("----------1. Verify that stopping an opened session works (the simplest usecase)"); - QSignalSpy configChangeSpy(&mgr, SIGNAL(configurationChanged(QNetworkConfiguration))); - QVERIFY(openSession(&openedSession)); - qDebug("Waiting for %d ms to get all configurationChange signals from platform.", configWaitdelayInMs); - // Clear signals caused by opening - closedSessionOpenedSpy.clear(); - closedSessionClosedSpy.clear(); - closedSessionStateChangedSpy.clear(); - closedErrorSpy.clear(); - openedSessionStateChangedSpy.clear(); - openedSessionClosedSpy.clear(); - - openedSession.stop(); - - qDebug("Waiting for %d ms to get all configurationChange signals from platform.", configWaitdelayInMs); - QTest::qWait(configWaitdelayInMs); // Wait to get all relevant configurationChange() signals - - // First to closing, then to disconnected - QVERIFY(openedSessionStateChangedSpy.count() == 2); - QVERIFY(!openedSessionClosedSpy.isEmpty()); - QVERIFY(openedSession.state() == QNetworkSession::Disconnected); - QVERIFY(config.state() != QNetworkConfiguration::Active); - - // 2. Verify that stopping a session based on non-connected configuration does nothing - qDebug("----------2. Verify that stopping a session based on non-connected configuration does nothing"); - QNetworkSession::State closedSessionOriginalState = closedSession.state(); - // Clear all possible signals - configChangeSpy.clear(); - closedSessionOpenedSpy.clear(); - closedSessionClosedSpy.clear(); - closedSessionStateChangedSpy.clear(); - closedErrorSpy.clear(); - - closedSession.stop(); - qDebug("Waiting for %d ms to get all configurationChange signals from platform.", configWaitdelayInMs); - QTest::qWait(configWaitdelayInMs); // Wait to get all relevant configurationChange() signals - - QVERIFY(closedSessionOpenedSpy.isEmpty()); - QVERIFY(closedSessionClosedSpy.isEmpty()); - QVERIFY(closedSessionStateChangedSpy.isEmpty()); - QVERIFY(closedErrorSpy.isEmpty()); - QVERIFY(closedSession.state() == closedSessionOriginalState); // State remains - - // 3. Check that stopping a opened session affects also other opened session based on the same configuration. - if (config.type() == QNetworkConfiguration::InternetAccessPoint) { - qDebug("----------3. Check that stopping a opened session affects also other opened session based on the same configuration."); - - QVERIFY(openSession(&openedSession)); - QVERIFY(openSession(&innocentSession)); - - configChangeSpy.clear(); - innocentSessionClosedSpy.clear(); - innocentSessionStateChangedSpy.clear(); - innocentErrorSpy.clear(); - - openedSession.stop(); - qDebug("Waiting for %d ms to get all configurationChange signals from platform.", configWaitdelayInMs); - QTest::qWait(configWaitdelayInMs); // Wait to get all relevant configurationChange() signals - QTest::qWait(configWaitdelayInMs); // Wait to get all relevant configurationChange() signals - - QVERIFY(!innocentSessionClosedSpy.isEmpty()); - QVERIFY(!innocentSessionStateChangedSpy.isEmpty()); - QVERIFY(!innocentErrorSpy.isEmpty()); - QVERIFY(innocentSession.state() == QNetworkSession::Disconnected); - QVERIFY(openedSession.state() == QNetworkSession::Disconnected); - sessionError = qvariant_cast<QNetworkSession::SessionError>(innocentErrorSpy.first().at(0)); - QVERIFY(sessionError == QNetworkSession::SessionAbortedError); - - innocentSessionClosedSpy.clear(); - innocentSessionStateChangedSpy.clear(); - innocentErrorSpy.clear(); - } else { - qDebug("----------3. Skip for SNAP configuration."); - } - // 4. Check that stopping a non-opened session stops the other session based on the - // same configuration if configuration is IAP. Stopping closed SNAP session has no impact on other opened SNAP session. - if (config.type() == QNetworkConfiguration::ServiceNetwork) { - qDebug("----------4. Skip for SNAP configuration."); - } else if (config.type() == QNetworkConfiguration::InternetAccessPoint) { - qDebug("----------4. Check that stopping a non-opened session stops the other session based on the same configuration"); - qDebug("----------4.1 Opening innocent session"); - QVERIFY(openSession(&innocentSession)); - qDebug("Waiting for %d ms after open to make sure all platform indications are propagated", configWaitdelayInMs); - QTest::qWait(configWaitdelayInMs); - qDebug("----------4.2 Calling closedSession.stop()"); - closedSession.stop(); - qDebug("Waiting for %d ms to get all configurationChange signals from platform..", configWaitdelayInMs); - QTest::qWait(configWaitdelayInMs); // Wait to get all relevant configurationChange() signals - - QTest::qWait(configWaitdelayInMs); - QTest::qWait(configWaitdelayInMs); - - QVERIFY(!innocentSessionClosedSpy.isEmpty()); - QVERIFY(!innocentSessionStateChangedSpy.isEmpty()); - QVERIFY(!innocentErrorSpy.isEmpty()); - QVERIFY(innocentSession.state() == QNetworkSession::Disconnected); - QVERIFY(closedSession.state() == QNetworkSession::Disconnected); - sessionError = qvariant_cast<QNetworkSession::SessionError>(innocentErrorSpy.first().at(0)); - QVERIFY(sessionError == QNetworkSession::SessionAbortedError); - QVERIFY(config.state() == QNetworkConfiguration::Discovered); - } - - // 5. Sanity check that stopping invalid session does not crash - qDebug("----------5. Sanity check that stopping invalid session does not crash"); - QNetworkSession invalidSession(QNetworkConfiguration(), 0); - QVERIFY(invalidSession.state() == QNetworkSession::Invalid); - invalidSession.stop(); - QVERIFY(invalidSession.state() == QNetworkSession::Invalid); -} - void tst_QNetworkSession::userChoiceSession_data() { QTest::addColumn<QNetworkConfiguration>("configuration"); @@ -746,21 +534,7 @@ void tst_QNetworkSession::userChoiceSession() bool expectStateChange = session.state() != QNetworkSession::Connected; session.open(); - -#if defined(Q_OS_SYMBIAN) - // Opening & closing multiple connections in a row sometimes - // results hanging of connection opening on Symbian devices - // => If first open fails, wait a moment and try again. - if (!session.waitForOpened()) { - qDebug("**** Session open Timeout - Wait 5 seconds and try once again ****"); - session.close(); - QTest::qWait(5000); // Wait a while before trying to open session again - session.open(); - session.waitForOpened(); - } -#else session.waitForOpened(); -#endif if (session.isOpen()) QVERIFY(!sessionOpenedSpy.isEmpty() || !errorSpy.isEmpty()); @@ -795,12 +569,8 @@ void tst_QNetworkSession::userChoiceSession() QVERIFY(session.state() == QNetworkSession::Connected); #ifndef QT_NO_NETWORKINTERFACE -#if !(defined(Q_OS_SYMBIAN) && defined(__WINS__)) - // On Symbian emulator, the support for data bearers is limited QVERIFY(session.interface().isValid()); #endif -#endif - const QString userChoiceIdentifier = session.sessionProperty("UserChoiceConfiguration").toString(); @@ -898,21 +668,7 @@ void tst_QNetworkSession::sessionOpenCloseStop() bool expectStateChange = previousState != QNetworkSession::Connected; session.open(); - -#if defined(Q_OS_SYMBIAN) - // Opening & closing multiple connections in a row sometimes - // results hanging of connection opening on Symbian devices - // => If first open fails, wait a moment and try again. - if (!session.waitForOpened()) { - qDebug("**** Session open Timeout - Wait 5 seconds and try once again ****"); - session.close(); - QTest::qWait(5000); // Wait a while before trying to open session again - session.open(); - session.waitForOpened(); - } -#else session.waitForOpened(); -#endif // Wait until the configuration is uptodate as well, it may be signaled 'connected' // bit later than the session @@ -962,11 +718,8 @@ void tst_QNetworkSession::sessionOpenCloseStop() QVERIFY(session.state() == QNetworkSession::Connected); #ifndef QT_NO_NETWORKINTERFACE -#if !(defined(Q_OS_SYMBIAN) && defined(__WINS__)) - // On Symbian emulator, the support for data bearers is limited QVERIFY(session.interface().isValid()); #endif -#endif } else { QFAIL("Timeout waiting for session to open."); } @@ -1002,10 +755,7 @@ void tst_QNetworkSession::sessionOpenCloseStop() QVERIFY(session.isOpen()); QVERIFY(session.state() == QNetworkSession::Connected); #ifndef QT_NO_NETWORKINTERFACE -#if !(defined(Q_OS_SYMBIAN) && defined(__WINS__)) - // On Symbian emulator, the support for data bearers is limited QVERIFY(session.interface().isValid()); -#endif if (errorSpy2.isEmpty()) { QCOMPARE(session.interface().hardwareAddress(), session2.interface().hardwareAddress()); QCOMPARE(session.interface().index(), session2.interface().index()); @@ -1018,12 +768,7 @@ void tst_QNetworkSession::sessionOpenCloseStop() if (forceSessionStop && session2.isOpen()) { // Test forcing the second session to stop the interface. QNetworkSession::State previousState = session.state(); -#ifdef Q_CC_NOKIAX86 - // For S60 emulator builds: RConnection::Stop does not work on all Emulators - bool expectStateChange = false; -#else bool expectStateChange = previousState != QNetworkSession::Disconnected; -#endif session2.stop(); // QNetworkSession::stop() must result either closed() signal @@ -1162,10 +907,8 @@ void tst_QNetworkSession::sessionOpenCloseStop() session.stop(); QTRY_VERIFY(session.state() == QNetworkSession::Disconnected); } -#ifndef Q_CC_NOKIAX86 if (!roamedSuccessfully) QVERIFY(!errorSpy.isEmpty()); -#endif } else { QTest::qWait(2000); // Wait awhile to get all signals from platform @@ -1187,7 +930,6 @@ void tst_QNetworkSession::sessionOpenCloseStop() QNetworkSession::State state = qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(stateChangedSpy2.count() - 1).at(0)); - // Symbian version dependant. QVERIFY(state == QNetworkSession::Disconnected); } } @@ -1203,14 +945,10 @@ void tst_QNetworkSession::sessionOpenCloseStop() QFAIL("Timeout waiting for session to stop."); } -#ifndef Q_CC_NOKIAX86 QVERIFY(!sessionClosedSpy.isEmpty()); -#endif QVERIFY(!sessionClosedSpy2.isEmpty()); -#ifndef Q_CC_NOKIAX86 QVERIFY(!session.isOpen()); -#endif QVERIFY(!session2.isOpen()); } else if (session2.isOpen()) { // Test closing the second session. @@ -1219,9 +957,7 @@ void tst_QNetworkSession::sessionOpenCloseStop() session2.close(); QTRY_VERIFY(!sessionClosedSpy2.isEmpty()); -#ifndef Q_CC_NOKIAX86 QVERIFY(stateChangedSpy2.count() == stateChangedCountBeforeClose); -#endif QVERIFY(sessionClosedSpy.isEmpty()); @@ -1230,10 +966,7 @@ void tst_QNetworkSession::sessionOpenCloseStop() QVERIFY(session.state() == QNetworkSession::Connected); QVERIFY(session2.state() == QNetworkSession::Connected); #ifndef QT_NO_NETWORKINTERFACE -#if !(defined(Q_OS_SYMBIAN) && defined(__WINS__)) - // On Symbian emulator, the support for data bearers is limited QVERIFY(session.interface().isValid()); -#endif QCOMPARE(session.interface().hardwareAddress(), session2.interface().hardwareAddress()); QCOMPARE(session.interface().index(), session2.interface().index()); #endif @@ -1243,14 +976,8 @@ void tst_QNetworkSession::sessionOpenCloseStop() // Test closing the first session. { -#ifdef Q_CC_NOKIAX86 - // For S60 emulator builds: RConnection::Close does not actually - // close network connection on all Emulators - bool expectStateChange = false; -#else bool expectStateChange = session.state() != QNetworkSession::Disconnected && manager.capabilities() & QNetworkConfigurationManager::SystemSessionSupport; -#endif session.close(); @@ -1314,12 +1041,9 @@ void tst_QNetworkSession::outOfProcessSession() if (!testsToRun["outOfProcessSession"]) { QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll); } -#if defined(Q_OS_SYMBIAN) && defined(__WINS__) - QSKIP("Symbian emulator does not support two [QR]PRocesses linking a dll (QtBearer.dll) with global writeable static data.", SkipAll); -#endif - updateConfigurations(); - QTest::qWait(2000); - + updateConfigurations(); + QTest::qWait(2000); + QNetworkConfigurationManager manager; // Create a QNetworkConfigurationManager to detect configuration changes made in Lackey. This // is actually the essence of this testcase - to check that platform mediates/reflects changes @@ -1328,7 +1052,7 @@ void tst_QNetworkSession::outOfProcessSession() QList<QNetworkConfiguration> before = manager.allConfigurations(QNetworkConfiguration::Active); QSignalSpy spy(&manager, SIGNAL(configurationChanged(QNetworkConfiguration))); - // Cannot read/write to processes on WinCE or Symbian. + // Cannot read/write to processes on WinCE. // Easiest alternative is to use sockets for IPC. QLocalServer oopServer; // First remove possible earlier listening address which would cause listen to fail diff --git a/tests/auto/network/kernel/qhostaddress/qhostaddress.pro b/tests/auto/network/kernel/qhostaddress/qhostaddress.pro index 7bcbfb0165..4972b2e0f7 100644 --- a/tests/auto/network/kernel/qhostaddress/qhostaddress.pro +++ b/tests/auto/network/kernel/qhostaddress/qhostaddress.pro @@ -11,5 +11,3 @@ wince*: { LIBS += -lws2_32 } } - -symbian: TARGET.CAPABILITY = NetworkServices diff --git a/tests/auto/network/kernel/qhostinfo/qhostinfo.pro b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro index 77ce1867d1..8e79ec618d 100644 --- a/tests/auto/network/kernel/qhostinfo/qhostinfo.pro +++ b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro @@ -9,8 +9,3 @@ wince*: { } else { win32:LIBS += -lws2_32 } - -symbian: TARGET.CAPABILITY = NetworkServices -symbian: { - INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE -} diff --git a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp index 58b51bcb69..49de1716cd 100644 --- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp @@ -187,7 +187,6 @@ void tst_QHostInfo::staticInformation() tst_QHostInfo::tst_QHostInfo() { - Q_SET_DEFAULT_IAP } tst_QHostInfo::~tst_QHostInfo() @@ -207,10 +206,6 @@ void tst_QHostInfo::initTestCase() } #endif -#ifdef Q_OS_SYMBIAN - ipv6Available = true; - ipv6LookupsAvailable = true; -#else ipv6Available = false; ipv6LookupsAvailable = false; @@ -240,7 +235,6 @@ void tst_QHostInfo::initTestCase() } } #endif -#endif // run each testcase with and without test enabled QTest::addColumn<bool>("cache"); @@ -450,7 +444,7 @@ protected: void tst_QHostInfo::threadSafety() { const int nattempts = 5; -#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WINCE) const int runs = 10; #else const int runs = 100; diff --git a/tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro b/tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro index 885dbf796c..8feb95fbab 100644 --- a/tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro +++ b/tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro @@ -2,5 +2,3 @@ load(qttest_p4) SOURCES += tst_qnetworkaddressentry.cpp QT = core network - -symbian: TARGET.CAPABILITY = NetworkServices diff --git a/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro b/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro index 1c5feee3f2..aad1a10025 100644 --- a/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro +++ b/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro @@ -2,6 +2,3 @@ load(qttest_p4) SOURCES += tst_qnetworkinterface.cpp QT = core network - -symbian: TARGET.CAPABILITY = NetworkServices - diff --git a/tests/auto/network/kernel/qnetworkproxy/qnetworkproxy.pro b/tests/auto/network/kernel/qnetworkproxy/qnetworkproxy.pro index fc0a216a15..c8f379bb6d 100644 --- a/tests/auto/network/kernel/qnetworkproxy/qnetworkproxy.pro +++ b/tests/auto/network/kernel/qnetworkproxy/qnetworkproxy.pro @@ -6,6 +6,3 @@ load(qttest_p4) QT = core network SOURCES += tst_qnetworkproxy.cpp - -symbian: TARGET.CAPABILITY = NetworkServices - diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/.gitignore b/tests/auto/network/kernel/qnetworkproxyfactory/.gitignore deleted file mode 100644 index 9be26bbda1..0000000000 --- a/tests/auto/network/kernel/qnetworkproxyfactory/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tst_qnetworkproxyfactory_symbian diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro b/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro index 17ad403ba7..3307ee38ef 100644 --- a/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro +++ b/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro @@ -6,6 +6,3 @@ load(qttest_p4) QT = core network SOURCES += tst_qnetworkproxyfactory.cpp - -symbian: TARGET.CAPABILITY = NetworkServices ReadUserData - diff --git a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro index 99ae358a93..bcec77fed2 100644 --- a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro +++ b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro @@ -8,9 +8,3 @@ requires(contains(QT_CONFIG,private_tests)) MOC_DIR=tmp QT = core-private network-private - -symbian { - TARGET.CAPABILITY = NetworkServices - INCLUDEPATH += $$OS_LAYER_SYSTEMINCLUDE - LIBS += -lesock -} diff --git a/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp index 9e93108fc7..b362e6b08c 100644 --- a/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp +++ b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #include <QtTest/QTest> #ifdef Q_OS_WIN @@ -47,10 +46,7 @@ #endif #include <qcoreapplication.h> - - #include <qdatastream.h> - #include <qhostaddress.h> #include <qdatetime.h> @@ -62,20 +58,9 @@ #include <stddef.h> -#ifdef Q_OS_SYMBIAN -#include <QNetworkConfigurationManager> -#include <QNetworkConfiguration> -#include <QNetworkSession> -#include <QScopedPointer> -#define PLATFORMSOCKETENGINE QSymbianSocketEngine -#define PLATFORMSOCKETENGINESTRING "QSymbianSocketEngine" -#include <private/qsymbiansocketengine_p.h> -#include <private/qcore_symbian_p.h> -#else #define PLATFORMSOCKETENGINE QNativeSocketEngine #define PLATFORMSOCKETENGINESTRING "QNativeSocketEngine" #include <private/qnativesocketengine_p.h> -#endif #include <qstringlist.h> @@ -115,7 +100,6 @@ private slots: tst_PlatformSocketEngine::tst_PlatformSocketEngine() { - Q_SET_DEFAULT_IAP } tst_PlatformSocketEngine::~tst_PlatformSocketEngine() @@ -314,20 +298,6 @@ void tst_PlatformSocketEngine::udpIPv6LoopbackTest() //--------------------------------------------------------------------------- void tst_PlatformSocketEngine::broadcastTest() { -#ifdef Q_OS_SYMBIAN - //broadcast isn't supported on loopback connections, but is on WLAN -#ifndef QT_NO_BEARERMANAGEMENT - QScopedPointer<QNetworkConfigurationManager> netConfMan(new QNetworkConfigurationManager()); - QNetworkConfiguration networkConfiguration(netConfMan->defaultConfiguration()); - QScopedPointer<QNetworkSession> networkSession(new QNetworkSession(networkConfiguration)); - if (!networkSession->isOpen()) { - networkSession->open(); - bool ok = networkSession->waitForOpened(30000); - qDebug() << networkSession->isOpen() << networkSession->error() << networkSession->errorString(); - QVERIFY(ok); - } -#endif -#endif #ifdef Q_OS_AIX QSKIP("Broadcast does not work on darko", SkipAll); #endif @@ -350,12 +320,6 @@ void tst_PlatformSocketEngine::broadcastTest() QHostAddress::Broadcast, port); -#ifdef Q_OS_SYMBIAN - //On symbian, broadcasts return 0 bytes written if none of the interfaces support it. - //Notably the loopback interfaces do not. (though they do support multicast!?) - if (written == 0) - QEXPECT_FAIL("", "No active interface supports broadcast", Abort); -#endif QCOMPARE((int)written, trollMessage.size()); // Wait until we receive it ourselves @@ -431,9 +395,6 @@ void tst_PlatformSocketEngine::serverTest() //--------------------------------------------------------------------------- void tst_PlatformSocketEngine::udpLoopbackPerformance() { -#ifdef SYMBIAN_WINSOCK_CONNECTIVITY - QSKIP("Not working on Emulator without WinPCAP", SkipAll); -#endif PLATFORMSOCKETENGINE udpSocket; // Initialize device #1 @@ -520,11 +481,7 @@ void tst_PlatformSocketEngine::tcpLoopbackPerformance() QVERIFY(serverSocket.initialize(socketDescriptor)); QVERIFY(serverSocket.state() == QAbstractSocket::ConnectedState); -#if defined (Q_OS_SYMBIAN) && defined (__WINS__) - const int messageSize = 1024 * 16; -#else const int messageSize = 1024 * 256; -#endif QByteArray message1(messageSize, '@'); QByteArray answer(messageSize, '@'); @@ -595,7 +552,7 @@ void tst_PlatformSocketEngine::tooManySockets() //--------------------------------------------------------------------------- void tst_PlatformSocketEngine::bind() { -#if !defined Q_OS_WIN && !defined Q_OS_SYMBIAN +#if !defined Q_OS_WIN PLATFORMSOCKETENGINE binder; QVERIFY(binder.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol)); QVERIFY(!binder.bind(QHostAddress::Any, 82)); @@ -609,13 +566,7 @@ void tst_PlatformSocketEngine::bind() PLATFORMSOCKETENGINE binder3; QVERIFY(binder3.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol)); QVERIFY(!binder3.bind(QHostAddress::Any, 31180)); - -#ifdef SYMBIAN_WINSOCK_CONNECTIVITY - qDebug("On Symbian Emulator (WinSock) we get EADDRNOTAVAIL instead of EADDRINUSE"); - QVERIFY(binder3.error() == QAbstractSocket::SocketAddressNotAvailableError); -#else QVERIFY(binder3.error() == QAbstractSocket::AddressInUseError); -#endif } //--------------------------------------------------------------------------- @@ -637,12 +588,6 @@ void tst_PlatformSocketEngine::networkError() #ifdef Q_OS_WIN // could use shutdown to produce different errors ::closesocket(client.socketDescriptor()); -#elif defined(Q_OS_SYMBIAN) - RSocket sock; - QVERIFY(QSymbianSocketManager::instance().lookupSocket(client.socketDescriptor(), sock)); - TRequestStatus stat; - sock.Shutdown(RSocket::EImmediate, stat); - User::WaitForRequest(stat); #else ::close(client.socketDescriptor()); #endif @@ -715,18 +660,7 @@ void tst_PlatformSocketEngine::receiveUrgentData() // The server sends an urgent message msg = 'Q'; -#if defined(Q_OS_SYMBIAN) - RSocket sock; - QVERIFY(QSymbianSocketManager::instance().lookupSocket(socketDescriptor, sock)); - TRequestStatus stat; - TSockXfrLength len; - sock.Send(TPtrC8((TUint8*)&msg,1), KSockWriteUrgent, stat, len); - User::WaitForRequest(stat); - QVERIFY(stat == KErrNone); - QCOMPARE(len(), 1); -#else QCOMPARE(int(::send(socketDescriptor, &msg, sizeof(msg), MSG_OOB)), 1); -#endif // The client receives the urgent message QVERIFY(client.waitForRead()); @@ -739,15 +673,7 @@ void tst_PlatformSocketEngine::receiveUrgentData() // The client sends an urgent message msg = 'T'; int clientDescriptor = client.socketDescriptor(); -#if defined(Q_OS_SYMBIAN) - QVERIFY(QSymbianSocketManager::instance().lookupSocket(clientDescriptor, sock)); - sock.Send(TPtrC8((TUint8*)&msg,1), KSockWriteUrgent, stat, len); - User::WaitForRequest(stat); - QVERIFY(stat == KErrNone); - QCOMPARE(len(), 1); -#else QCOMPARE(int(::send(clientDescriptor, &msg, sizeof(msg), MSG_OOB)), 1); -#endif // The server receives the urgent message QVERIFY(serverSocket.waitForRead()); @@ -756,7 +682,6 @@ void tst_PlatformSocketEngine::receiveUrgentData() response.resize(available); QCOMPARE(serverSocket.read(response.data(), response.size()), qint64(1)); QCOMPARE(response.at(0), msg); - } QTEST_MAIN(tst_PlatformSocketEngine) diff --git a/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro b/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro index 814a7d2600..2066d69238 100644 --- a/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro +++ b/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro @@ -7,5 +7,3 @@ QT = core network SOURCES += tst_qabstractsocket.cpp -symbian: TARGET.CAPABILITY = NetworkServices - diff --git a/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro b/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro index f26abbe8d9..cc0afb441d 100644 --- a/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro +++ b/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro @@ -8,6 +8,3 @@ MOC_DIR=tmp QT = core-private network-private -symbian: TARGET.CAPABILITY = NetworkServices - - diff --git a/tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp b/tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp index 5a90abea0e..92da0e865b 100644 --- a/tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp +++ b/tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp @@ -141,7 +141,6 @@ public slots: tst_QHttpSocketEngine::tst_QHttpSocketEngine() { - Q_SET_DEFAULT_IAP } tst_QHttpSocketEngine::~tst_QHttpSocketEngine() @@ -654,7 +653,7 @@ void tst_QHttpSocketEngine::downloadBigFile() QTime stopWatch; stopWatch.start(); -#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WINCE) QTestEventLoop::instance().enterLoop(240); #else QTestEventLoop::instance().enterLoop(60); diff --git a/tests/auto/network/socket/qlocalsocket/lackey/lackey.pro b/tests/auto/network/socket/qlocalsocket/lackey/lackey.pro index 2573222c8b..858f22b199 100644 --- a/tests/auto/network/socket/qlocalsocket/lackey/lackey.pro +++ b/tests/auto/network/socket/qlocalsocket/lackey/lackey.pro @@ -12,5 +12,3 @@ DEFINES += QLOCALSOCKET_DEBUG SOURCES += main.cpp TARGET = lackey - -symbian:TARGET.CAPABILITY = ALL -TCB diff --git a/tests/auto/network/socket/qlocalsocket/qlocalsocket.pro b/tests/auto/network/socket/qlocalsocket/qlocalsocket.pro index 931c1e0602..5b86ec9463 100644 --- a/tests/auto/network/socket/qlocalsocket/qlocalsocket.pro +++ b/tests/auto/network/socket/qlocalsocket/qlocalsocket.pro @@ -1,4 +1,3 @@ TEMPLATE = subdirs SUBDIRS = test # lackey should be moved to the QtScript module -!wince*:!symbian: SUBDIRS += example -symbian: TARGET.CAPABILITY = NetworkServices +!wince*: SUBDIRS += example diff --git a/tests/auto/network/socket/qlocalsocket/test/test.pro b/tests/auto/network/socket/qlocalsocket/test/test.pro index b2755b5411..f8d993bf91 100644 --- a/tests/auto/network/socket/qlocalsocket/test/test.pro +++ b/tests/auto/network/socket/qlocalsocket/test/test.pro @@ -3,9 +3,7 @@ load(qttest_p4) DEFINES += QLOCALSERVER_DEBUG DEFINES += QLOCALSOCKET_DEBUG -symbian { - # nothing -} else:wince* { +wince* { DEFINES += QT_LOCALSOCKET_TCP DEFINES += SRCDIR=\\\"../\\\" } else { @@ -32,14 +30,7 @@ wince* { additionalFiles.path = lackey } -symbian { - additionalFiles.files = lackey.exe - additionalFiles.path = \\sys\\bin - TARGET.UID3 = 0xE0340005 - DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x","")) -} - -wince*|symbian { +wince* { scriptFiles.files = ../lackey/scripts/*.js scriptFiles.path = lackey/scripts DEPLOYMENT += additionalFiles scriptFiles diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp index 57daa92f82..fca2127fec 100644 --- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp @@ -47,16 +47,9 @@ #include <QtNetwork/qlocalserver.h> #include "../../../../shared/util.h" -#ifdef Q_OS_SYMBIAN - #include <unistd.h> -#endif //TESTED_CLASS=QLocalServer, QLocalSocket //TESTED_FILES=network/socket/qlocalserver.cpp network/socket/qlocalsocket.cpp -#ifdef Q_OS_SYMBIAN - #define STRINGIFY(x) #x - #define TOSTRING(x) STRINGIFY(x) - #define SRCDIR "C:/Private/" TOSTRING(SYMBIAN_SRCDIR_UID) "/" -#endif + Q_DECLARE_METATYPE(QLocalSocket::LocalSocketError) Q_DECLARE_METATYPE(QLocalSocket::LocalSocketState) @@ -117,11 +110,6 @@ private slots: void bytesWrittenSignal(); void syncDisconnectNotify(); void asyncDisconnectNotify(); - -#ifdef Q_OS_SYMBIAN -private: - void unlink(QString serverName); -#endif }; tst_QLocalSocket::tst_QLocalSocket() @@ -308,9 +296,6 @@ void tst_QLocalSocket::listen() QSignalSpy spyNewConnection(&server, SIGNAL(newConnection())); QFETCH(QString, name); -#ifdef Q_OS_SYMBIAN - unlink(name); -#endif QFETCH(bool, canListen); QFETCH(bool, close); QVERIFY2((server.listen(name) == canListen), server.errorString().toLatin1().constData()); @@ -361,9 +346,6 @@ void tst_QLocalSocket::listenAndConnect() QFETCH(QString, name); QFETCH(bool, canListen); -#ifdef Q_OS_SYMBIAN - unlink(name); -#endif QCOMPARE(server.listen(name), canListen); QTest::qWait(1000); //QVERIFY(!server.errorString().isEmpty()); @@ -488,9 +470,6 @@ void tst_QLocalSocket::sendData_data() void tst_QLocalSocket::sendData() { QFETCH(QString, name); -#ifdef Q_OS_SYMBIAN - unlink(name); -#endif QFETCH(bool, canListen); LocalServer server; @@ -521,11 +500,7 @@ void tst_QLocalSocket::sendData() // test sending/receiving data if (server.hasPendingConnections()) { QString testLine = "test"; -#ifdef Q_OS_SYMBIAN - for (int i = 0; i < 25 * 1024; ++i) -#else for (int i = 0; i < 50000; ++i) -#endif testLine += "a"; QLocalSocket *serverSocket = server.nextPendingConnection(); QVERIFY(serverSocket); @@ -607,9 +582,7 @@ void tst_QLocalSocket::fullPath() { QLocalServer server; QString name = "qlocalsocket_pathtest"; -#if defined(Q_OS_SYMBIAN) - QString path = ""; -#elif defined(QT_LOCALSOCKET_TCP) +#if defined(QT_LOCALSOCKET_TCP) QString path = "QLocalServer"; #elif defined(Q_OS_WIN) QString path = "\\\\.\\pipe\\"; @@ -647,9 +620,6 @@ void tst_QLocalSocket::hitMaximumConnections() QFETCH(int, max); LocalServer server; QString name = "tst_localsocket"; -#ifdef Q_OS_SYMBIAN - unlink(name); -#endif server.setMaxPendingConnections(max); QVERIFY2(server.listen(name), server.errorString().toLatin1().constData()); int connections = server.maxPendingConnections() + 1; @@ -749,15 +719,8 @@ void tst_QLocalSocket::threadedConnection_data() void tst_QLocalSocket::threadedConnection() { -#ifdef Q_OS_SYMBIAN - unlink("qlocalsocket_threadtest"); -#endif - QFETCH(int, threads); Server server; -#if defined(Q_OS_SYMBIAN) - server.setStackSize(0x14000); -#endif server.clients = threads; server.mutex.lock(); server.start(); @@ -766,9 +729,6 @@ void tst_QLocalSocket::threadedConnection() QList<Client*> clients; for (int i = 0; i < threads; ++i) { clients.append(new Client()); -#if defined(Q_OS_SYMBIAN) - clients.last()->setStackSize(0x14000); -#endif clients.last()->start(); } @@ -795,7 +755,7 @@ void tst_QLocalSocket::processConnection_data() */ void tst_QLocalSocket::processConnection() { -#if defined(QT_NO_PROCESS) || defined(Q_CC_NOKIAX86) +#if defined(QT_NO_PROCESS) QSKIP("Qt was compiled with QT_NO_PROCESS", SkipAll); #else QFETCH(int, processes); @@ -850,9 +810,6 @@ void tst_QLocalSocket::longPath() void tst_QLocalSocket::waitForDisconnect() { QString name = "tst_localsocket"; -#ifdef Q_OS_SYMBIAN - unlink(name); -#endif LocalServer server; QVERIFY(server.listen(name)); LocalSocket socket; @@ -904,10 +861,6 @@ void tst_QLocalSocket::removeServer() void tst_QLocalSocket::recycleServer() { -#ifdef Q_OS_SYMBIAN - unlink("recycletest1"); -#endif - QLocalServer server; QLocalSocket client; @@ -956,17 +909,11 @@ void tst_QLocalSocket::multiConnect() void tst_QLocalSocket::writeOnlySocket() { QLocalServer server; -#ifdef Q_OS_SYMBIAN - unlink("writeOnlySocket"); -#endif QVERIFY(server.listen("writeOnlySocket")); QLocalSocket client; client.connectToServer("writeOnlySocket", QIODevice::WriteOnly); QVERIFY(client.waitForConnected()); -#if defined(Q_OS_SYMBIAN) - QTest::qWait(250); -#endif QVERIFY(server.waitForNewConnection(200)); QLocalSocket* serverSocket = server.nextPendingConnection(); QVERIFY(serverSocket); @@ -977,10 +924,6 @@ void tst_QLocalSocket::writeOnlySocket() void tst_QLocalSocket::writeToClientAndDisconnect() { -#ifdef Q_OS_SYMBIAN - unlink("writeAndDisconnectServer"); -#endif - QLocalServer server; QLocalSocket client; QSignalSpy readChannelFinishedSpy(&client, SIGNAL(readChannelFinished())); @@ -1059,10 +1002,6 @@ void tst_QLocalSocket::bytesWrittenSignal() void tst_QLocalSocket::syncDisconnectNotify() { -#ifdef Q_OS_SYMBIAN - unlink("syncDisconnectNotify"); -#endif - QLocalServer server; QVERIFY(server.listen("syncDisconnectNotify")); QLocalSocket client; @@ -1076,10 +1015,6 @@ void tst_QLocalSocket::syncDisconnectNotify() void tst_QLocalSocket::asyncDisconnectNotify() { -#ifdef Q_OS_SYMBIAN - unlink("asyncDisconnectNotify"); -#endif - QLocalServer server; QVERIFY(server.listen("asyncDisconnectNotify")); QLocalSocket client; @@ -1092,29 +1027,6 @@ void tst_QLocalSocket::asyncDisconnectNotify() QTRY_VERIFY(!disconnectedSpy.isEmpty()); } -#ifdef Q_OS_SYMBIAN -void tst_QLocalSocket::unlink(QString name) -{ - if(name.length() == 0) - return; - - QString fullName; - // determine the full server path - if (name.startsWith(QLatin1Char('/'))) { - fullName = name; - } else { - fullName = QDir::cleanPath(QDir::tempPath()); - fullName += QLatin1Char('/') + name; - fullName = QDir::toNativeSeparators(fullName); - } - - int result = ::unlink(fullName.toUtf8().data()); - - if(result != 0) { - qWarning() << "Unlinking " << fullName << " failed with " << strerror(errno); - } -} -#endif QTEST_MAIN(tst_QLocalSocket) #include "tst_qlocalsocket.moc" diff --git a/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro index 3a144aeacf..bec8eb8795 100644 --- a/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro +++ b/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro @@ -9,9 +9,4 @@ MOC_DIR=tmp QT = core-private network-private -# Symbian toolchain does not support correct include semantics -symbian:INCLUDEPATH+=..\\..\\..\\include\\QtNetwork\\private -symbian: TARGET.CAPABILITY = NetworkServices - - requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp index 2678816482..d738926ca8 100644 --- a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp +++ b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp @@ -151,7 +151,6 @@ private slots: tst_QSocks5SocketEngine::tst_QSocks5SocketEngine() { - Q_SET_DEFAULT_IAP } tst_QSocks5SocketEngine::~tst_QSocks5SocketEngine() @@ -532,10 +531,6 @@ void tst_QSocks5SocketEngine::serverTest() //--------------------------------------------------------------------------- void tst_QSocks5SocketEngine::udpTest() { -#ifdef SYMBIAN_WINSOCK_CONNECTIVITY - QSKIP("UDP works bads on non WinPCAP emulator setting", SkipAll); -#endif - QSocks5SocketEngine udpSocket; // Initialize device #1 @@ -795,7 +790,7 @@ void tst_QSocks5SocketEngine::downloadBigFile() QTime stopWatch; stopWatch.start(); -#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) +#if !defined(Q_OS_WINCE) QTestEventLoop::instance().enterLoop(60); #else QTestEventLoop::instance().enterLoop(180); diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro b/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro index 700e9520ec..0bea655187 100644 --- a/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro +++ b/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro @@ -6,4 +6,3 @@ DESTDIR = ./ # This means the auto test works on some machines for MinGW. No dialog stalls # the application. win32-g++*:CONFIG += console -symbian: TARGET.CAPABILITY += NetworkServices ReadUserData diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp b/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp index 35da65f671..e223bff8c5 100644 --- a/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp +++ b/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) return 1; } -#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WINCE) QFile file(QLatin1String("/test_signal.txt")); file.open(QIODevice::WriteOnly); file.write("Listening\n"); diff --git a/tests/auto/network/socket/qtcpserver/test/test.pro b/tests/auto/network/socket/qtcpserver/test/test.pro index 63e2d0a981..7cac14e645 100644 --- a/tests/auto/network/socket/qtcpserver/test/test.pro +++ b/tests/auto/network/socket/qtcpserver/test/test.pro @@ -12,13 +12,6 @@ wince*: { } } -symbian { - crashApp.files = $$QT_BUILD_TREE/examples/widgets/wiggly/$${BUILD_DIR}/crashingServer.exe - crashApp.path = . - DEPLOYMENT += crashApp - TARGET.CAPABILITY += NetworkServices ReadUserData -} - TARGET = ../tst_qtcpserver win32 { diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp index ca28a9c7c8..c070be9e64 100644 --- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp +++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp @@ -39,9 +39,8 @@ ** ****************************************************************************/ -// Just to get Q_OS_SYMBIAN #include <qglobal.h> -#if defined(_WIN32) && !defined(Q_OS_SYMBIAN) +#if defined(_WIN32) #include <winsock2.h> #else #include <sys/types.h> @@ -137,7 +136,6 @@ void tst_QTcpServer::getSetCheck() tst_QTcpServer::tst_QTcpServer() { - Q_SET_DEFAULT_IAP } tst_QTcpServer::~tst_QTcpServer() @@ -454,7 +452,7 @@ void tst_QTcpServer::waitForConnectionTest() ThreadConnector connector(findLocalIpSocket.localAddress(), server.serverPort()); connector.start(); -#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WINCE) QVERIFY(server.waitForNewConnection(9000, &timeout)); #else QVERIFY(server.waitForNewConnection(3000, &timeout)); @@ -466,12 +464,8 @@ void tst_QTcpServer::waitForConnectionTest() void tst_QTcpServer::setSocketDescriptor() { QTcpServer server; -#ifdef Q_OS_SYMBIAN - QTest::ignoreMessage(QtWarningMsg, "QSymbianSocketEngine::initialize - socket descriptor not found"); -#endif QVERIFY(!server.setSocketDescriptor(42)); QCOMPARE(server.serverError(), QAbstractSocket::UnsupportedSocketOperationError); -#ifndef Q_OS_SYMBIAN //adopting Open C sockets is not supported, neither is adopting externally created RSocket #ifdef Q_OS_WIN // ensure winsock is started @@ -495,7 +489,6 @@ void tst_QTcpServer::setSocketDescriptor() #ifdef Q_OS_WIN WSACleanup(); #endif -#endif } //---------------------------------------------------------------------------------- @@ -522,11 +515,7 @@ protected: { // how a user woulddo it (qabstractsocketengine is not public) unsigned long arg = 0; -#if defined(Q_OS_SYMBIAN) - arg = fcntl(socketDescriptor, F_GETFL, NULL); - arg &= (~O_NONBLOCK); - ok = ::fcntl(socketDescriptor, F_SETFL, arg) != -1; -#elif defined(Q_OS_WIN) +#if defined(Q_OS_WIN) ok = ::ioctlsocket(socketDescriptor, FIONBIO, &arg) == 0; ::closesocket(socketDescriptor); #else @@ -538,10 +527,6 @@ protected: void tst_QTcpServer::addressReusable() { -#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86) - QSKIP("Symbian: Emulator does not support process launching", SkipAll ); -#endif - #if defined(QT_NO_PROCESS) QSKIP("Qt was compiled with QT_NO_PROCESS", SkipAll); #else @@ -553,7 +538,7 @@ void tst_QTcpServer::addressReusable() QSKIP("With socks5 this test does not make senans at the momment", SkipAll); } } -#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WINCE) QString signalName = QString::fromLatin1("/test_signal.txt"); QFile::remove(signalName); // The crashingServer process will crash once it gets a connection. @@ -587,9 +572,6 @@ void tst_QTcpServer::addressReusable() void tst_QTcpServer::setNewSocketDescriptorBlocking() { -#ifdef Q_OS_SYMBIAN - QSKIP("open C ioctls on Qt sockets not supported", SkipAll); -#else QFETCH_GLOBAL(bool, setProxy); if (setProxy) { QFETCH_GLOBAL(int, proxyType); @@ -604,7 +586,6 @@ void tst_QTcpServer::setNewSocketDescriptorBlocking() socket.connectToHost(QHostAddress::LocalHost, server.serverPort()); QVERIFY(server.waitForNewConnection(5000)); QVERIFY(server.ok); -#endif } void tst_QTcpServer::invalidProxy_data() diff --git a/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro b/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro index 5dfff5bb88..aa7ac6bbb7 100644 --- a/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro +++ b/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs !wince*: SUBDIRS = test stressTest -wince*|symbian|vxworks* : SUBDIRS = test +wince*|vxworks* : SUBDIRS = test requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro b/tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro index f6215f80a0..c7a4308b17 100644 --- a/tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro +++ b/tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro @@ -7,6 +7,3 @@ CONFIG += console DESTDIR = ./ MOC_DIR = .moc/ TMP_DIR = .tmp/ - -symbian: TARGET.CAPABILITY = NetworkServices - diff --git a/tests/auto/network/socket/qtcpsocket/test/test.pro b/tests/auto/network/socket/qtcpsocket/test/test.pro index 61bfaad1a1..41ef18a4d8 100644 --- a/tests/auto/network/socket/qtcpsocket/test/test.pro +++ b/tests/auto/network/socket/qtcpsocket/test/test.pro @@ -13,11 +13,6 @@ wince*: { QT += network vxworks:QT -= gui -symbian: { - TARGET.EPOCHEAPSIZE="0x100 0x3000000" - TARGET.CAPABILITY = NetworkServices ReadUserData -} - TARGET = tst_qtcpsocket win32 { diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index bae3f7c2f5..fb22cb5940 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -39,11 +39,9 @@ ** ****************************************************************************/ - -// Just to get Q_OS_SYMBIAN #include <qglobal.h> -#if defined(_WIN32) && !defined(Q_OS_SYMBIAN) +#if defined(_WIN32) #include <winsock2.h> #else #include <sys/types.h> @@ -478,9 +476,6 @@ void tst_QTcpSocket::setInvalidSocketDescriptor() { QTcpSocket *socket = newSocket(); QCOMPARE(socket->socketDescriptor(), -1); -#ifdef Q_OS_SYMBIAN - QTest::ignoreMessage(QtWarningMsg, "QSymbianSocketEngine::initialize - socket descriptor not found"); -#endif QVERIFY(!socket->setSocketDescriptor(-5, QTcpSocket::UnconnectedState)); QCOMPARE(socket->socketDescriptor(), -1); @@ -493,9 +488,6 @@ void tst_QTcpSocket::setInvalidSocketDescriptor() void tst_QTcpSocket::setSocketDescriptor() { -#ifdef Q_OS_SYMBIAN - QSKIP("adopting open c socket handles is not supported", SkipAll); -#else QFETCH_GLOBAL(bool, setProxy); if (setProxy) return; // this test doesn't make sense with proxies @@ -536,7 +528,6 @@ void tst_QTcpSocket::setSocketDescriptor() #ifdef Q_OS_WIN delete dummy; #endif -#endif } //---------------------------------------------------------------------------------- @@ -1053,11 +1044,7 @@ void tst_QTcpSocket::disconnectWhileConnecting() } connect(socket, SIGNAL(disconnected()), SLOT(exitLoopSlot())); -#ifndef Q_OS_SYMBIAN enterLoop(10); -#else - enterLoop(30); -#endif QVERIFY2(!timeout(), "Network timeout"); QVERIFY(socket->state() == QAbstractSocket::UnconnectedState); if (!closeDirectly) { @@ -1117,11 +1104,7 @@ protected: { bool timedOut = false; while (!quit) { -#ifndef Q_OS_SYMBIAN if (server->waitForNewConnection(500, &timedOut)) -#else - if (server->waitForNewConnection(5000, &timedOut)) -#endif break; if (!timedOut) return; @@ -1129,11 +1112,7 @@ protected: QTcpSocket *socket = server->nextPendingConnection(); while (!quit) { -#ifndef Q_OS_SYMBIAN if (socket->waitForDisconnected(500)) -#else - if (socket->waitForDisconnected(5000)) -#endif break; if (socket->error() != QAbstractSocket::SocketTimeoutError) return; @@ -1182,11 +1161,7 @@ void tst_QTcpSocket::disconnectWhileConnectingNoEventLoop() socket->disconnectFromHost(); } -#ifndef Q_OS_SYMBIAN QVERIFY2(socket->waitForDisconnected(10000), "Network timeout"); -#else - QVERIFY2(socket->waitForDisconnected(30000), "Network timeout"); -#endif QVERIFY(socket->state() == QAbstractSocket::UnconnectedState); if (!closeDirectly) { QCOMPARE(int(socket->openMode()), int(QIODevice::ReadWrite)); @@ -1234,11 +1209,7 @@ void tst_QTcpSocket::disconnectWhileLookingUp() // let anything queued happen QEventLoop loop; -#ifndef Q_OS_SYMBIAN QTimer::singleShot(50, &loop, SLOT(quit())); -#else - QTimer::singleShot(5000, &loop, SLOT(quit())); -#endif loop.exec(); // recheck @@ -1511,19 +1482,11 @@ void tst_QTcpSocket::dontCloseOnTimeout() QTcpSocket *socket = newSocket(); socket->connectToHost(serverAddress, server.serverPort()); -#ifndef Q_OS_SYMBIAN QVERIFY(!socket->waitForReadyRead(100)); -#else - QVERIFY(!socket->waitForReadyRead(5000)); -#endif QCOMPARE(socket->error(), QTcpSocket::SocketTimeoutError); QVERIFY(socket->isOpen()); -#ifndef Q_OS_SYMBIAN QVERIFY(!socket->waitForDisconnected(100)); -#else - QVERIFY(!socket->waitForDisconnected(5000)); -#endif QCOMPARE(socket->error(), QTcpSocket::SocketTimeoutError); QVERIFY(socket->isOpen()); @@ -2200,9 +2163,6 @@ void tst_QTcpSocket::suddenRemoteDisconnect_data() void tst_QTcpSocket::suddenRemoteDisconnect() { -#if defined( Q_OS_SYMBIAN ) - QSKIP("Symbian: QProcess IO is not yet supported, fix when supported", SkipAll); -#else QFETCH(QString, client); QFETCH(QString, server); @@ -2249,7 +2209,6 @@ void tst_QTcpSocket::suddenRemoteDisconnect() // Check that both exited normally. QCOMPARE(clientProcess.readAll().constData(), "SUCCESS\n"); QCOMPARE(serverProcess.readAll().constData(), "SUCCESS\n"); -#endif } //---------------------------------------------------------------------------------- @@ -2485,12 +2444,10 @@ void tst_QTcpSocket::invalidProxy_data() QTest::newRow("no-such-host-http") << int(QNetworkProxy::HttpProxy) << "this-host-will-never-exist.troll.no" << 3128 << false << int(QAbstractSocket::ProxyNotFoundError); -#if !defined(Q_OS_SYMBIAN) QTest::newRow("http-on-socks5") << int(QNetworkProxy::HttpProxy) << fluke << 1080 << false << int(QAbstractSocket::ProxyConnectionClosedError); QTest::newRow("socks5-on-http") << int(QNetworkProxy::Socks5Proxy) << fluke << 3128 << false << int(QAbstractSocket::SocketTimeoutError); -#endif } void tst_QTcpSocket::invalidProxy() diff --git a/tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro b/tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro index 6da148659c..a1b0021232 100644 --- a/tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro +++ b/tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro @@ -4,5 +4,3 @@ CONFIG += console CONFIG -= app_bundle TARGET = clientserver DESTDIR = ./ - -symbian: TARGET.CAPABILITY += NetworkServices diff --git a/tests/auto/network/socket/qudpsocket/test/test.pro b/tests/auto/network/socket/qudpsocket/test/test.pro index 508dc97053..2bc074d9f6 100644 --- a/tests/auto/network/socket/qudpsocket/test/test.pro +++ b/tests/auto/network/socket/qudpsocket/test/test.pro @@ -14,7 +14,7 @@ win32 { DESTDIR = ../ } -wince*|symbian: { +wince* { addApp.files = ../clientserver/clientserver.exe addApp.path = clientserver DEPLOYMENT += addApp @@ -22,7 +22,4 @@ wince*|symbian: { TARGET = tst_qudpsocket -symbian: TARGET.CAPABILITY += NetworkServices - - CONFIG+=insignificant_test diff --git a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp index 83d30cc40a..47d1908d7d 100644 --- a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp +++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp @@ -132,7 +132,6 @@ private: tst_QUdpSocket::tst_QUdpSocket() { - Q_SET_DEFAULT_IAP } tst_QUdpSocket::~tst_QUdpSocket() @@ -609,13 +608,6 @@ void tst_QUdpSocket::writeDatagram() qint64(i * 1024)); QCOMPARE(errorspy.count(), 0); if (!server.waitForReadyRead(5000)) { -#ifdef Q_OS_SYMBIAN - //symbian receive buffer for datagrams is ~30k, but it can send datagrams up to the maximum 64k... - if (i > 28) { - i = 64; - continue; - } -#endif QSKIP(QString("UDP packet lost at size %1, unable to complete the test.").arg(i * 1024).toLatin1().data(), SkipSingle); } QCOMPARE(server.pendingDatagramSize(), qint64(i * 1024)); @@ -625,21 +617,7 @@ void tst_QUdpSocket::writeDatagram() void tst_QUdpSocket::performance() { -#if defined(Q_OS_SYMBIAN) - // Large packets seems not to go through on Symbian - // Reason might be also fragmentation due to VPN connection etc - - QFETCH_GLOBAL(bool, setProxy); - QFETCH_GLOBAL(int, proxyType); - - int arrSize = 8192; - if (setProxy && proxyType == QNetworkProxy::Socks5Proxy) - arrSize = 1024; - - QByteArray arr(arrSize, '@'); -#else QByteArray arr(8192, '@'); -#endif // Q_OS_SYMBIAN QUdpSocket server; #ifdef FORCE_SESSION @@ -675,14 +653,6 @@ void tst_QUdpSocket::performance() float secs = stopWatch.elapsed() / 1000.0; qDebug("\t%.2fMB/%.2fs: %.2fMB/s", float(nbytes / (1024.0*1024.0)), secs, float(nbytes / (1024.0*1024.0)) / secs); - -#if defined(Q_OS_SYMBIAN) - if(nbytes == 0) { - qDebug("No bytes passed through local UDP socket, since UDP socket write returns EWOULDBLOCK"); - qDebug("Should try with blocking sockets, but it is not currently possible due to Open C defect"); - } -#endif - } void tst_QUdpSocket::bindMode() @@ -705,47 +675,7 @@ void tst_QUdpSocket::bindMode() socket2.setProperty("_q_networksession", QVariant::fromValue(networkSession)); #endif QVERIFY(!socket2.bind(socket.localPort())); -#if defined(Q_OS_SYMBIAN) - if(RProcess().HasCapability(ECapabilityNetworkControl)) { - qDebug("Test executed *with* NetworkControl capability"); - // In Symbian OS ReuseAddressHint together with NetworkControl capability - // gives application *always* right to bind to port. I.e. it does not matter - // if first socket was bound with any bind flag. Since autotests in Symbian - // are currently executed with ALL -TCB rights, this path is the one executed. - QVERIFY(socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint)); - socket.close(); - socket2.close(); - - QVERIFY2(socket.bind(0, QUdpSocket::ShareAddress), socket.errorString().toLatin1().constData()); - QVERIFY(!socket2.bind(socket.localPort())); - QVERIFY2(socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint), socket2.errorString().toLatin1().constData()); - socket.close(); - socket2.close(); - - QVERIFY2(socket.bind(0, QUdpSocket::DontShareAddress), socket.errorString().toLatin1().constData()); - QVERIFY(!socket2.bind(socket.localPort())); - QVERIFY(socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint)); - socket.close(); - socket2.close(); - } else { - qDebug("Test executed *without* NetworkControl capability"); - // If we don't have NetworkControl capability, attempt to bind already bound - // address will *always* fail. I.e. it does not matter if first socket was - // bound with any bind flag. - QVERIFY(!socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint)); - socket.close(); - - QVERIFY2(socket.bind(0, QUdpSocket::ShareAddress), socket.errorString().toLatin1().constData()); - QVERIFY(!socket2.bind(socket.localPort())); - QVERIFY2(!socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint), socket2.errorString().toLatin1().constData()); - socket.close(); - - QVERIFY2(socket.bind(0, QUdpSocket::DontShareAddress), socket.errorString().toLatin1().constData()); - QVERIFY(!socket2.bind(socket.localPort())); - QVERIFY(!socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint)); - socket.close(); - } -#elif defined(Q_OS_UNIX) +#if defined(Q_OS_UNIX) QVERIFY(!socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint)); socket.close(); QVERIFY2(socket.bind(0, QUdpSocket::ShareAddress), socket.errorString().toLatin1().constData()); @@ -862,8 +792,8 @@ void tst_QUdpSocket::writeToNonExistingPeer() void tst_QUdpSocket::outOfProcessConnectedClientServerTest() { -#if defined(Q_OS_WINCE) || defined (Q_OS_SYMBIAN) - QSKIP("This test depends on reading data from QProcess (not supported on Qt/WinCE and Symbian).", SkipAll); +#if defined(Q_OS_WINCE) + QSKIP("This test depends on reading data from QProcess (not supported on Qt/WinCE).", SkipAll); #endif #if defined(QT_NO_PROCESS) QSKIP("Qt was compiled with QT_NO_PROCESS", SkipAll); @@ -927,8 +857,8 @@ void tst_QUdpSocket::outOfProcessConnectedClientServerTest() void tst_QUdpSocket::outOfProcessUnconnectedClientServerTest() { -#if defined(Q_OS_WINCE) || defined (Q_OS_SYMBIAN) - QSKIP("This test depends on reading data from QProcess (not supported on Qt/WinCE and Symbian).", SkipAll); +#if defined(Q_OS_WINCE) + QSKIP("This test depends on reading data from QProcess (not supported on Qt/WinCE).", SkipAll); #endif #if defined(QT_NO_PROCESS) QSKIP("Qt was compiled with QT_NO_PROCESS", SkipAll); @@ -1143,13 +1073,8 @@ void tst_QUdpSocket::multicastLeaveAfterClose() #ifdef FORCE_SESSION udpSocket.setProperty("_q_networksession", QVariant::fromValue(networkSession)); #endif -#ifdef Q_OS_SYMBIAN - QVERIFY2(udpSocket.bind(), - qPrintable(udpSocket.errorString())); -#else QVERIFY2(udpSocket.bind(groupAddress, 0), qPrintable(udpSocket.errorString())); -#endif QVERIFY2(udpSocket.joinMulticastGroup(groupAddress), qPrintable(udpSocket.errorString())); udpSocket.close(); @@ -1173,9 +1098,6 @@ void tst_QUdpSocket::setMulticastInterface_data() void tst_QUdpSocket::setMulticastInterface() { -#ifdef Q_OS_SYMBIAN - QSKIP("Symbian has no IPV6_MULTICAST_IF equivalent", SkipAll); -#else QFETCH_GLOBAL(bool, setProxy); QFETCH(QNetworkInterface, iface); QFETCH(QHostAddress, address); @@ -1198,7 +1120,6 @@ void tst_QUdpSocket::setMulticastInterface() } else { QVERIFY(!iface2.isValid()); } -#endif } void tst_QUdpSocket::multicast_data() @@ -1247,12 +1168,6 @@ void tst_QUdpSocket::multicast() #endif // bind first, then verify that we can join the multicast group -#ifdef Q_OS_SYMBIAN - if (!setProxy) { - QEXPECT_FAIL("same bind, group ipv4 address", "bind to group address not supported on symbian", Abort); - QEXPECT_FAIL("same bind, group ipv6 address", "bind to group address not supported on symbian", Abort); - } -#endif QVERIFY2(receiver.bind(bindAddress, 0) == bindResult, qPrintable(receiver.errorString())); if (!bindResult) @@ -1289,9 +1204,6 @@ void tst_QUdpSocket::multicast() receiver.readDatagram(datagram.data(), datagram.size(), 0, 0); receivedDatagrams << datagram; } -#ifdef Q_OS_SYMBIAN - QEXPECT_FAIL("valid bind, group ipv4 address", "IPv4 multicast not supported on symbian", Abort); -#endif QCOMPARE(receivedDatagrams, datagrams); QVERIFY2(receiver.leaveMulticastGroup(groupAddress), qPrintable(receiver.errorString())); diff --git a/tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro b/tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro index 7438d40fb0..cf707aa14a 100644 --- a/tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro +++ b/tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro @@ -3,5 +3,3 @@ QT = core network CONFIG -= app_bundle CONFIG += console -symbian:TARGET.CAPABILITY="ALL -TCB" - diff --git a/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro b/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro index 05cce8e509..36b7b7bc57 100644 --- a/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro +++ b/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro @@ -14,16 +14,11 @@ win32 { } } -wince*|symbian: { - certFiles.files = certificates more-certificates - certFiles.path = . - DEPLOYMENT += certFiles -} - -wince*: { - DEFINES += SRCDIR=\\\".\\\" -} else:!symbian { - DEFINES += SRCDIR=\\\"$$PWD/\\\" +wince* { + certFiles.files = certificates more-certificates + certFiles.path = . + DEPLOYMENT += certFiles + DEFINES += SRCDIR=\\\".\\\" +} else { + DEFINES += SRCDIR=\\\"$$PWD/\\\" } - -symbian:TARGET.CAPABILITY = NetworkServices ReadUserData diff --git a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp index bcd21eefe2..0f033fc726 100644 --- a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp +++ b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp @@ -45,12 +45,6 @@ #include <qsslkey.h> #include <qsslsocket.h> -#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 "./" -#endif - class tst_QSslCertificate : public QObject { Q_OBJECT diff --git a/tests/auto/network/ssl/qsslcipher/qsslcipher.pro b/tests/auto/network/ssl/qsslcipher/qsslcipher.pro index 78fd387069..77c3f10d3e 100644 --- a/tests/auto/network/ssl/qsslcipher/qsslcipher.pro +++ b/tests/auto/network/ssl/qsslcipher/qsslcipher.pro @@ -13,6 +13,3 @@ win32 { DESTDIR = release } } - -symbian: TARGET.CAPABILITY = NetworkServices - diff --git a/tests/auto/network/ssl/qsslerror/qsslerror.pro b/tests/auto/network/ssl/qsslerror/qsslerror.pro index 5b907fb600..d0abb966eb 100644 --- a/tests/auto/network/ssl/qsslerror/qsslerror.pro +++ b/tests/auto/network/ssl/qsslerror/qsslerror.pro @@ -13,6 +13,3 @@ win32 { DESTDIR = release } } - -symbian: TARGET.CAPABILITY = NetworkServices - diff --git a/tests/auto/network/ssl/qsslkey/qsslkey.pro b/tests/auto/network/ssl/qsslkey/qsslkey.pro index 5a90b76219..f21544ac51 100644 --- a/tests/auto/network/ssl/qsslkey/qsslkey.pro +++ b/tests/auto/network/ssl/qsslkey/qsslkey.pro @@ -14,19 +14,16 @@ win32 { } } -wince*|symbian: { - keyFiles.files = keys - keyFiles.path = . +wince* { + keyFiles.files = keys + keyFiles.path = . - passphraseFiles.files = rsa-without-passphrase.pem rsa-with-passphrase.pem - passphraseFiles.path = . + passphraseFiles.files = rsa-without-passphrase.pem rsa-with-passphrase.pem + passphraseFiles.path = . - DEPLOYMENT += keyFiles passphraseFiles -} - -wince*: { - DEFINES += SRCDIR=\\\".\\\" -} else:!symbian { - DEFINES+= SRCDIR=\\\"$$PWD\\\" - TARGET.CAPABILITY = NetworkServices + DEPLOYMENT += keyFiles passphraseFiles + DEFINES += SRCDIR=\\\".\\\" +} else { + DEFINES+= SRCDIR=\\\"$$PWD\\\" + TARGET.CAPABILITY = NetworkServices } diff --git a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp index ac966ce74a..69bd66ffbf 100644 --- a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp +++ b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp @@ -47,12 +47,6 @@ #include <QtNetwork/qhostaddress.h> #include <QtNetwork/qnetworkproxy.h> -#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 "." -#endif - class tst_QSslKey : public QObject { Q_OBJECT diff --git a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro index f19b724ef0..5c0a0b5c74 100644 --- a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro +++ b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro @@ -17,11 +17,7 @@ win32 { # OpenSSL support contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) { - symbian { - INCLUDEPATH *= $$OS_LAYER_SSL_SYSTEMINCLUDE - } else { - include($$QT_SOURCE_TREE/config.tests/unix/openssl/openssl.pri) - } + include($$QT_SOURCE_TREE/config.tests/unix/openssl/openssl.pri) # Add optional SSL libs LIBS += $$OPENSSL_LIBS } @@ -32,15 +28,6 @@ wince* { certFiles.files = certs ssl.tar.gz certFiles.path = . DEPLOYMENT += certFiles -} else:symbian { - DEFINES += QSSLSOCKET_CERTUNTRUSTED_WORKAROUND - TARGET.EPOCHEAPSIZE="0x100 0x3000000" - TARGET.CAPABILITY=NetworkServices ReadUserData - - certFiles.files = certs ssl.tar.gz - certFiles.path = . - DEPLOYMENT += certFiles - INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE # Needed for e32svr.h in S^3 envs } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index 6b7720308d..eaf9cb3347 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -79,10 +79,6 @@ Q_DECLARE_METATYPE(QSslConfiguration) #define QSSLSOCKET_CERTUNTRUSTED_WORKAROUND #endif -#ifdef Q_OS_SYMBIAN -#define SRCDIR "" -#endif - #ifndef QT_NO_OPENSSL class QSslSocketPtr: public QSharedPointer<QSslSocket> { @@ -240,7 +236,6 @@ tst_QSslSocket::tst_QSslSocket() qRegisterMetaType<QAbstractSocket::SocketError>("QAbstractSocket::SocketError"); qRegisterMetaType<QAbstractSocket::SocketState>("QSslSocket::SslMode"); #endif - Q_SET_DEFAULT_IAP } tst_QSslSocket::~tst_QSslSocket() @@ -446,10 +441,8 @@ void tst_QSslSocket::simpleConnect() enterLoop(10); // Entered connecting state -#ifndef Q_OS_SYMBIAN QCOMPARE(socket.state(), QAbstractSocket::ConnectingState); QCOMPARE(connectedSpy.count(), 0); -#endif QCOMPARE(hostFoundSpy.count(), 1); QCOMPARE(disconnectedSpy.count(), 0); enterLoop(10); @@ -1157,24 +1150,11 @@ void tst_QSslSocket::waitForConnectedEncryptedReadyRead() connect(socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(ignoreErrorSlot())); socket->connectToHostEncrypted(QtNetworkSettings::serverName(), 993); -#ifdef Q_OS_SYMBIAN - QVERIFY(socket->waitForConnected(10000)); - QVERIFY(socket->waitForEncrypted(10000)); - - // dont forget to login - QCOMPARE((int) socket->write("USER ftptest\r\n"), 14); - QCOMPARE((int) socket->write("PASS ftP2Ptf\r\n"), 14); - - QVERIFY(socket->waitForReadyRead(10000)); - QVERIFY(!socket->peerCertificate().isNull()); - QVERIFY(!socket->peerCertificateChain().isEmpty()); -#else QVERIFY(socket->waitForConnected(10000)); QVERIFY(socket->waitForEncrypted(10000)); QVERIFY(socket->waitForReadyRead(10000)); QVERIFY(!socket->peerCertificate().isNull()); QVERIFY(!socket->peerCertificateChain().isEmpty()); -#endif } void tst_QSslSocket::startClientEncryption() @@ -1604,11 +1584,7 @@ protected: // delayed acceptance: QTest::qSleep(100); -#ifndef Q_OS_SYMBIAN bool ret = server.waitForNewConnection(2000); -#else - bool ret = server.waitForNewConnection(20000); -#endif Q_UNUSED(ret); // delayed start of encryption @@ -1821,27 +1797,12 @@ void tst_QSslSocket::disconnectFromHostWhenConnected() QSslSocketPtr socket = newSocket(); socket->connectToHostEncrypted(QtNetworkSettings::serverName(), 993); socket->ignoreSslErrors(); -#ifndef Q_OS_SYMBIAN QVERIFY(socket->waitForEncrypted(5000)); -#else - QVERIFY(socket->waitForEncrypted(10000)); -#endif socket->write("XXXX LOGOUT\r\n"); QCOMPARE(socket->state(), QAbstractSocket::ConnectedState); socket->disconnectFromHost(); QCOMPARE(socket->state(), QAbstractSocket::ClosingState); -#ifdef Q_OS_SYMBIAN - // I don't understand how socket->waitForDisconnected can work on other platforms - // since socket->write will end to: - // QMetaObject::invokeMethod(this, "_q_flushWriteBuffer", Qt::QueuedConnection); - // In order that _q_flushWriteBuffer will be called the eventloop need to run - // If we just call waitForDisconnected, which blocks the whole thread how that can happen? - connect(socket, SIGNAL(disconnected()), this, SLOT(exitLoop())); - enterLoop(5); - QVERIFY(!timeout()); -#else QVERIFY(socket->waitForDisconnected(5000)); -#endif QCOMPARE(socket->bytesToWrite(), qint64(0)); } |