diff options
Diffstat (limited to 'tests/auto/network')
18 files changed, 14 insertions, 300 deletions
diff --git a/tests/auto/network/access/qftp/tst_qftp.cpp b/tests/auto/network/access/qftp/tst_qftp.cpp index 25e324c9f3..65c04cb5ac 100644 --- a/tests/auto/network/access/qftp/tst_qftp.cpp +++ b/tests/auto/network/access/qftp/tst_qftp.cpp @@ -63,16 +63,13 @@ class tst_QFtp : public QObject public: tst_QFtp(); - virtual ~tst_QFtp(); - -public slots: +private slots: void initTestCase_data(); void initTestCase(); void cleanupTestCase(); void init(); void cleanup(); -private slots: void connectToHost_data(); void connectToHost(); void connectToUnresponsiveHost(); @@ -187,10 +184,6 @@ tst_QFtp::tst_QFtp() : { } -tst_QFtp::~tst_QFtp() -{ -} - void tst_QFtp::initTestCase_data() { QTest::addColumn<bool>("setProxy"); diff --git a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp index 0d188a8fec..ffe6880a5f 100644 --- a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp +++ b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp @@ -44,9 +44,6 @@ class tst_QHttpNetworkConnection: public QObject { Q_OBJECT -public: - tst_QHttpNetworkConnection(); - public Q_SLOTS: void finishedReply(); void finishedWithError(QNetworkReply::NetworkError errorCode, const QString &detail); @@ -60,11 +57,7 @@ private: QNetworkReply::NetworkError netErrorCode; private Q_SLOTS: - void init(); - void cleanup(); void initTestCase(); - void cleanupTestCase(); - void options_data(); void options(); void get_data(); @@ -111,27 +104,11 @@ private Q_SLOTS: void overlappingCloseAndWrite(); }; -tst_QHttpNetworkConnection::tst_QHttpNetworkConnection() -{ -} - void tst_QHttpNetworkConnection::initTestCase() { QVERIFY(QtNetworkSettings::verifyTestNetworkSettings()); } -void tst_QHttpNetworkConnection::cleanupTestCase() -{ -} - -void tst_QHttpNetworkConnection::init() -{ -} - -void tst_QHttpNetworkConnection::cleanup() -{ -} - void tst_QHttpNetworkConnection::options_data() { // not tested yet diff --git a/tests/auto/network/access/qhttpnetworkreply/tst_qhttpnetworkreply.cpp b/tests/auto/network/access/qhttpnetworkreply/tst_qhttpnetworkreply.cpp index 16faee9705..2721e032d0 100644 --- a/tests/auto/network/access/qhttpnetworkreply/tst_qhttpnetworkreply.cpp +++ b/tests/auto/network/access/qhttpnetworkreply/tst_qhttpnetworkreply.cpp @@ -39,32 +39,10 @@ class tst_QHttpNetworkReply: public QObject { Q_OBJECT private Q_SLOTS: - void init(); - void cleanup(); - void initTestCase(); - void cleanupTestCase(); - void parseHeader_data(); void parseHeader(); }; - -void tst_QHttpNetworkReply::initTestCase() -{ -} - -void tst_QHttpNetworkReply::cleanupTestCase() -{ -} - -void tst_QHttpNetworkReply::init() -{ -} - -void tst_QHttpNetworkReply::cleanup() -{ -} - void tst_QHttpNetworkReply::parseHeader_data() { QTest::addColumn<QByteArray>("headers"); diff --git a/tests/auto/network/access/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp b/tests/auto/network/access/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp index c33644cfad..ff36958b39 100644 --- a/tests/auto/network/access/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp +++ b/tests/auto/network/access/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp @@ -41,12 +41,6 @@ class tst_QNetworkCacheMetaData : public QObject { Q_OBJECT -public slots: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); - private slots: void qnetworkcachemetadata_data(); void qnetworkcachemetadata(); @@ -76,28 +70,6 @@ class SubQNetworkCacheMetaData : public QNetworkCacheMetaData { public:}; -// This will be called before the first test function is executed. -// It is only called once. -void tst_QNetworkCacheMetaData::initTestCase() -{ -} - -// This will be called after the last test function is executed. -// It is only called once. -void tst_QNetworkCacheMetaData::cleanupTestCase() -{ -} - -// This will be called before each test function is executed. -void tst_QNetworkCacheMetaData::init() -{ -} - -// This will be called after every test function. -void tst_QNetworkCacheMetaData::cleanup() -{ -} - void tst_QNetworkCacheMetaData::qnetworkcachemetadata_data() { } diff --git a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp index 399c9a733a..76a44fc812 100644 --- a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp +++ b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp @@ -50,14 +50,12 @@ public: tst_QNetworkDiskCache(); public slots: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); void accessAfterRemoveReadyReadSlot(); void setCookieHeaderMetaDataChangedSlot(); private slots: + void initTestCase(); + void cleanupTestCase(); void qnetworkdiskcache_data(); void qnetworkdiskcache(); @@ -202,16 +200,6 @@ void tst_QNetworkDiskCache::cleanupTestCase() workingDir.removeRecursively(); } -// This will be called before each test function is executed. -void tst_QNetworkDiskCache::init() -{ -} - -// This will be called after every test function. -void tst_QNetworkDiskCache::cleanup() -{ -} - void tst_QNetworkDiskCache::qnetworkdiskcache_data() { } diff --git a/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp index 8069865d93..808cc3ef34 100644 --- a/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp +++ b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp @@ -57,12 +57,7 @@ class tst_QHostAddress : public QObject public: tst_QHostAddress(); - virtual ~tst_QHostAddress(); - -public slots: - void init(); - void cleanup(); private slots: void constructor_QString_data(); void constructor_QString(); @@ -89,26 +84,13 @@ private slots: void convertv4v6(); }; -tst_QHostAddress::tst_QHostAddress() -{ -} - -tst_QHostAddress::~tst_QHostAddress() -{ -} - Q_DECLARE_METATYPE(QHostAddress) -void tst_QHostAddress::init() +tst_QHostAddress::tst_QHostAddress() { qRegisterMetaType<QHostAddress>("QHostAddress"); } -void tst_QHostAddress::cleanup() -{ - // No cleanup is required. -} - void tst_QHostAddress::constructor_QString_data() { setAddress_QString_data(); diff --git a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp index 5f0addba98..a38b8d0873 100644 --- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp @@ -92,17 +92,9 @@ class tst_QHostInfo : public QObject { Q_OBJECT -public: - tst_QHostInfo(); - virtual ~tst_QHostInfo(); - - -public slots: +private slots: void init(); - void cleanup(); void initTestCase(); - -private slots: void getSetCheck(); void staticInformation(); void lookupIPv4_data(); @@ -169,14 +161,6 @@ void tst_QHostInfo::staticInformation() qDebug() << "Domain name:" << QHostInfo::localDomainName(); } -tst_QHostInfo::tst_QHostInfo() -{ -} - -tst_QHostInfo::~tst_QHostInfo() -{ -} - void tst_QHostInfo::initTestCase() { QVERIFY(QtNetworkSettings::verifyTestNetworkSettings()); @@ -237,10 +221,6 @@ void tst_QHostInfo::init() qt_qhostinfo_enable_cache(cache); } -void tst_QHostInfo::cleanup() -{ -} - void tst_QHostInfo::lookupIPv4_data() { QTest::addColumn<QString>("hostname"); diff --git a/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp index 71125f463a..dd5f912f3a 100644 --- a/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp +++ b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp @@ -70,16 +70,8 @@ class tst_PlatformSocketEngine : public QObject { Q_OBJECT -public: - tst_PlatformSocketEngine(); - virtual ~tst_PlatformSocketEngine(); - - -public slots: - void initTestCase(); - void init(); - void cleanup(); private slots: + void initTestCase(); void construction(); void simpleConnectToIMAP(); void udpLoopbackTest(); @@ -99,27 +91,11 @@ private slots: void tooManySockets(); }; -tst_PlatformSocketEngine::tst_PlatformSocketEngine() -{ -} - -tst_PlatformSocketEngine::~tst_PlatformSocketEngine() -{ -} - void tst_PlatformSocketEngine::initTestCase() { QVERIFY(QtNetworkSettings::verifyTestNetworkSettings()); } -void tst_PlatformSocketEngine::init() -{ -} - -void tst_PlatformSocketEngine::cleanup() -{ -} - //--------------------------------------------------------------------------- void tst_PlatformSocketEngine::construction() { diff --git a/tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp b/tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp index 179cdb76bc..be0fcb6a08 100644 --- a/tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp +++ b/tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp @@ -51,16 +51,9 @@ class tst_QHttpSocketEngine : public QObject { Q_OBJECT -public: - tst_QHttpSocketEngine(); - virtual ~tst_QHttpSocketEngine(); - - -public slots: +private slots: void initTestCase(); void init(); - void cleanup(); -private slots: void construction(); void errorTest_data(); void errorTest(); @@ -131,14 +124,6 @@ public slots: } }; -tst_QHttpSocketEngine::tst_QHttpSocketEngine() -{ -} - -tst_QHttpSocketEngine::~tst_QHttpSocketEngine() -{ -} - void tst_QHttpSocketEngine::initTestCase() { QVERIFY(QtNetworkSettings::verifyTestNetworkSettings()); @@ -150,10 +135,6 @@ void tst_QHttpSocketEngine::init() bytesAvailable = 0; } -void tst_QHttpSocketEngine::cleanup() -{ -} - //--------------------------------------------------------------------------- void tst_QHttpSocketEngine::construction() { diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp index 0a112e3e07..9362195839 100644 --- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp @@ -54,9 +54,8 @@ class tst_QLocalSocket : public QObject { Q_OBJECT -public Q_SLOTS: - void init(); - void cleanup(); +public: + tst_QLocalSocket(); private slots: // basics @@ -116,7 +115,7 @@ private slots: }; -void tst_QLocalSocket::init() +tst_QLocalSocket::tst_QLocalSocket() { qRegisterMetaType<QLocalSocket::LocalSocketState>("QLocalSocket::LocalSocketState"); qRegisterMetaType<QLocalSocket::LocalSocketError>("QLocalSocket::LocalSocketError"); @@ -124,10 +123,6 @@ void tst_QLocalSocket::init() qRegisterMetaType<QFile::Permissions>("QFile::Permissions"); } -void tst_QLocalSocket::cleanup() -{ -} - class LocalServer : public QLocalServer { Q_OBJECT diff --git a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp index bd43961ea2..dfe882bdae 100644 --- a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp +++ b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp @@ -57,16 +57,9 @@ class tst_QSocks5SocketEngine : public QObject, public QAbstractSocketEngineRece { Q_OBJECT -public: - tst_QSocks5SocketEngine(); - virtual ~tst_QSocks5SocketEngine(); - - -public slots: +private slots: void initTestCase(); void init(); - void cleanup(); -private slots: void construction(); void errorTest_data(); void errorTest(); @@ -160,14 +153,6 @@ private slots: } }; -tst_QSocks5SocketEngine::tst_QSocks5SocketEngine() -{ -} - -tst_QSocks5SocketEngine::~tst_QSocks5SocketEngine() -{ -} - void tst_QSocks5SocketEngine::initTestCase() { QVERIFY(QtNetworkSettings::verifyTestNetworkSettings()); @@ -179,10 +164,6 @@ void tst_QSocks5SocketEngine::init() bytesAvailable = 0; } -void tst_QSocks5SocketEngine::cleanup() -{ -} - //--------------------------------------------------------------------------- void tst_QSocks5SocketEngine::construction() { diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp index 5df5432cdd..5f5528c405 100644 --- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp +++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp @@ -70,17 +70,11 @@ class tst_QTcpServer : public QObject { Q_OBJECT -public: - tst_QTcpServer(); - virtual ~tst_QTcpServer(); - - -public slots: +private slots: void initTestCase_data(); void initTestCase(); void init(); void cleanup(); -private slots: void getSetCheck(); void constructing(); void clientServerLoop(); @@ -138,14 +132,6 @@ void tst_QTcpServer::getSetCheck() QCOMPARE(INT_MAX, obj1.maxPendingConnections()); } -tst_QTcpServer::tst_QTcpServer() -{ -} - -tst_QTcpServer::~tst_QTcpServer() -{ -} - void tst_QTcpServer::initTestCase_data() { QTest::addColumn<bool>("setProxy"); diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index a5ba405dd4..c7494e6f35 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -94,7 +94,6 @@ class tst_QTcpSocket : public QObject public: tst_QTcpSocket(); - virtual ~tst_QTcpSocket(); static void enterLoop(int secs) { @@ -322,11 +321,6 @@ tst_QTcpSocket::tst_QTcpSocket() firstFailInfo.setAddresses(QList<QHostAddress>() << QHostAddress("224.0.0.0") << QtNetworkSettings::serverIP()); } -tst_QTcpSocket::~tst_QTcpSocket() -{ - -} - void tst_QTcpSocket::initTestCase_data() { QTest::addColumn<bool>("setProxy"); diff --git a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp index cad81d870c..62286bedb6 100644 --- a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp +++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp @@ -63,17 +63,11 @@ class tst_QUdpSocket : public QObject { Q_OBJECT -public: - tst_QUdpSocket(); - virtual ~tst_QUdpSocket(); - - -public slots: +private slots: void initTestCase_data(); void initTestCase(); void init(); void cleanup(); -private slots: void constructing(); void unconnectedServerAndClientTest(); void broadcasting(); @@ -144,14 +138,6 @@ static QHostAddress makeNonAny(const QHostAddress &address, QHostAddress::Specia return address; } -tst_QUdpSocket::tst_QUdpSocket() -{ -} - -tst_QUdpSocket::~tst_QUdpSocket() -{ -} - void tst_QUdpSocket::initTestCase_data() { // hack: we only enable the Socks5 over UDP tests on the old diff --git a/tests/auto/network/ssl/qsslcipher/tst_qsslcipher.cpp b/tests/auto/network/ssl/qsslcipher/tst_qsslcipher.cpp index 37c3762eec..f5e58e03ca 100644 --- a/tests/auto/network/ssl/qsslcipher/tst_qsslcipher.cpp +++ b/tests/auto/network/ssl/qsslcipher/tst_qsslcipher.cpp @@ -42,44 +42,14 @@ class tst_QSslCipher : public QObject { Q_OBJECT -public: - tst_QSslCipher(); - virtual ~tst_QSslCipher(); - -public slots: - void initTestCase_data(); - void init(); - void cleanup(); - #ifndef QT_NO_SSL private slots: void constructing(); -#endif +#endif // QT_NO_SSL }; -tst_QSslCipher::tst_QSslCipher() -{ -} - -tst_QSslCipher::~tst_QSslCipher() -{ - -} - -void tst_QSslCipher::initTestCase_data() -{ -} - -void tst_QSslCipher::init() -{ -} - -void tst_QSslCipher::cleanup() -{ -} - #ifndef QT_NO_SSL void tst_QSslCipher::constructing() diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index c7d655af3d..fc2848e488 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -102,7 +102,6 @@ class tst_QSslSocket : public QObject public: tst_QSslSocket(); - virtual ~tst_QSslSocket(); static void enterLoop(int secs) { @@ -290,10 +289,6 @@ tst_QSslSocket::tst_QSslSocket() #endif } -tst_QSslSocket::~tst_QSslSocket() -{ -} - enum ProxyTests { NoProxy = 0x00, Socks5Proxy = 0x01, diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp index 0608461e74..a2b2af008c 100644 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp @@ -57,8 +57,6 @@ class tst_QSslSocket_onDemandCertificates_member : public QObject int proxyAuthCalled; public: - tst_QSslSocket_onDemandCertificates_member(); - virtual ~tst_QSslSocket_onDemandCertificates_member(); #ifndef QT_NO_OPENSSL QSslSocketPtr newSocket(); @@ -80,14 +78,6 @@ private: #endif // QT_NO_OPENSSL }; -tst_QSslSocket_onDemandCertificates_member::tst_QSslSocket_onDemandCertificates_member() -{ -} - -tst_QSslSocket_onDemandCertificates_member::~tst_QSslSocket_onDemandCertificates_member() -{ -} - enum ProxyTests { NoProxy = 0x00, Socks5Proxy = 0x01, diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp index 877cc5c12b..ed6a0bd52f 100644 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp @@ -53,8 +53,6 @@ class tst_QSslSocket_onDemandCertificates_static : public QObject int proxyAuthCalled; public: - tst_QSslSocket_onDemandCertificates_static(); - virtual ~tst_QSslSocket_onDemandCertificates_static(); #ifndef QT_NO_OPENSSL QSslSocketPtr newSocket(); @@ -76,14 +74,6 @@ private: #endif // QT_NO_OPENSSL }; -tst_QSslSocket_onDemandCertificates_static::tst_QSslSocket_onDemandCertificates_static() -{ -} - -tst_QSslSocket_onDemandCertificates_static::~tst_QSslSocket_onDemandCertificates_static() -{ -} - enum ProxyTests { NoProxy = 0x00, Socks5Proxy = 0x01, |