diff options
Diffstat (limited to 'tests/auto/network/access')
19 files changed, 10 insertions, 97 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 |