diff options
Diffstat (limited to 'tests/auto/network/ssl')
8 files changed, 18 insertions, 96 deletions
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)); } |