From f7f79483e73fed5664763a125b3d27861586b7d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Thu, 20 Aug 2020 12:03:54 +0200 Subject: Remove QFtp sources etc. in favor of alternate distribution While we initially wanted to just disable the functionality the way it is currently built forces people to do a full build of Qt just to enable it. Instead of doing this half-measure let's just remove the code completely from QtBase and rather prepare QtNetwork to handle being a plugin that can be compiled at any time. Task-number: QTBUG-80340 Change-Id: I19155c8c167cf932088f01b2a9706d0e7ab792d1 Reviewed-by: Alex Blasche --- tests/auto/network/access/CMakeLists.txt | 3 - tests/auto/network/access/access.pro | 2 - tests/auto/network/access/qftp/.gitattributes | 1 - tests/auto/network/access/qftp/.gitignore | 2 - tests/auto/network/access/qftp/BLACKLIST | 16 - tests/auto/network/access/qftp/CMakeLists.txt | 25 - tests/auto/network/access/qftp/qftp.pro | 11 - tests/auto/network/access/qftp/rfc3252.txt | 899 -------- tests/auto/network/access/qftp/tst_qftp.cpp | 2317 -------------------- .../access/qnetworkreply/tst_qnetworkreply.cpp | 197 +- 10 files changed, 102 insertions(+), 3371 deletions(-) delete mode 100644 tests/auto/network/access/qftp/.gitattributes delete mode 100644 tests/auto/network/access/qftp/.gitignore delete mode 100644 tests/auto/network/access/qftp/BLACKLIST delete mode 100644 tests/auto/network/access/qftp/CMakeLists.txt delete mode 100644 tests/auto/network/access/qftp/qftp.pro delete mode 100644 tests/auto/network/access/qftp/rfc3252.txt delete mode 100644 tests/auto/network/access/qftp/tst_qftp.cpp (limited to 'tests') diff --git a/tests/auto/network/access/CMakeLists.txt b/tests/auto/network/access/CMakeLists.txt index 1fa4ab6c6e..d225eb1299 100644 --- a/tests/auto/network/access/CMakeLists.txt +++ b/tests/auto/network/access/CMakeLists.txt @@ -16,6 +16,3 @@ if(QT_FEATURE_private_tests) add_subdirectory(hsts) add_subdirectory(qdecompresshelper) endif() -if(QT_FEATURE_ftp AND QT_FEATURE_private_tests) - add_subdirectory(qftp) -endif() diff --git a/tests/auto/network/access/access.pro b/tests/auto/network/access/access.pro index 1cd488baf9..45d7b0cda5 100644 --- a/tests/auto/network/access/access.pro +++ b/tests/auto/network/access/access.pro @@ -24,5 +24,3 @@ SUBDIRS=\ http2 \ hsts \ qdecompresshelper - -qtConfig(ftp): qtConfig(private_tests): SUBDIRS += qftp diff --git a/tests/auto/network/access/qftp/.gitattributes b/tests/auto/network/access/qftp/.gitattributes deleted file mode 100644 index e04709aa2e..0000000000 --- a/tests/auto/network/access/qftp/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -rfc3252.txt -crlf diff --git a/tests/auto/network/access/qftp/.gitignore b/tests/auto/network/access/qftp/.gitignore deleted file mode 100644 index 7a4845df05..0000000000 --- a/tests/auto/network/access/qftp/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -tst_qftp -tst_QFtp_activeMode_inittab diff --git a/tests/auto/network/access/qftp/BLACKLIST b/tests/auto/network/access/qftp/BLACKLIST deleted file mode 100644 index 0a99f3eb00..0000000000 --- a/tests/auto/network/access/qftp/BLACKLIST +++ /dev/null @@ -1,16 +0,0 @@ -# QTBUG-15111 - -[activeMode:WithoutProxy] -redhatenterpriselinuxworkstation-6.6 - -[activeMode:WithoutProxyWithSession] -redhatenterpriselinuxworkstation-6.6 - -[list] -opensuse-leap -windows-7sp1 -windows-10 msvc-2015 -ubuntu -osx -[list:epsvNotSupported] -* diff --git a/tests/auto/network/access/qftp/CMakeLists.txt b/tests/auto/network/access/qftp/CMakeLists.txt deleted file mode 100644 index f67ddd3326..0000000000 --- a/tests/auto/network/access/qftp/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -# Generated from qftp.pro. - -if(NOT QT_FEATURE_ftp) - return() -endif() -if(NOT QT_FEATURE_private_tests) - return() -endif() - -##################################################################### -## tst_qftp Test: -##################################################################### - -qt_add_test(tst_qftp - SOURCES - tst_qftp.cpp - PUBLIC_LIBRARIES - Qt::Network - Qt::NetworkPrivate -) - -#### Keys ignored in scope 1:.:.:qftp.pro:: -# QT_FOR_CONFIG = "network" -# QT_TEST_SERVER_LIST = "vsftpd" "ftp-proxy" "squid" "danted" -# _REQUIREMENTS = "qtConfig(ftp)" "qtConfig(private_tests)" diff --git a/tests/auto/network/access/qftp/qftp.pro b/tests/auto/network/access/qftp/qftp.pro deleted file mode 100644 index ad610316df..0000000000 --- a/tests/auto/network/access/qftp/qftp.pro +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG += testcase -TARGET = tst_qftp -SOURCES += tst_qftp.cpp -QT_FOR_CONFIG += network - -requires(qtConfig(ftp)) -requires(qtConfig(private_tests)) -QT = core network network-private testlib - -CONFIG += unsupported/testserver -QT_TEST_SERVER_LIST = vsftpd ftp-proxy squid danted diff --git a/tests/auto/network/access/qftp/rfc3252.txt b/tests/auto/network/access/qftp/rfc3252.txt deleted file mode 100644 index b80c61bf0a..0000000000 --- a/tests/auto/network/access/qftp/rfc3252.txt +++ /dev/null @@ -1,899 +0,0 @@ - - - - - - -Network Working Group H. Kennedy -Request for Comments: 3252 Mimezine -Category: Informational 1 April 2002 - - - Binary Lexical Octet Ad-hoc Transport - -Status of this Memo - - This memo provides information for the Internet community. It does - not specify an Internet standard of any kind. Distribution of this - memo is unlimited. - -Copyright Notice - - Copyright (C) The Internet Society (2002). All Rights Reserved. - -Abstract - - This document defines a reformulation of IP and two transport layer - protocols (TCP and UDP) as XML applications. - -1. Introduction - -1.1. Overview - - This document describes the Binary Lexical Octet Ad-hoc Transport - (BLOAT): a reformulation of a widely-deployed network-layer protocol - (IP [RFC791]), and two associated transport layer protocols (TCP - [RFC793] and UDP [RFC768]) as XML [XML] applications. It also - describes methods for transporting BLOAT over Ethernet and IEEE 802 - networks as well as encapsulating BLOAT in IP for gatewaying BLOAT - across the public Internet. - -1.2. Motivation - - The wild popularity of XML as a basis for application-level protocols - such as the Blocks Extensible Exchange Protocol [RFC3080], the Simple - Object Access Protocol [SOAP], and Jabber [JABBER] prompted - investigation into the possibility of extending the use of XML in the - protocol stack. Using XML at both the transport and network layer in - addition to the application layer would provide for an amazing amount - of power and flexibility while removing dependencies on proprietary - and hard-to-understand binary protocols. This protocol unification - would also allow applications to use a single XML parser for all - aspects of their operation, eliminating developer time spent figuring - out the intricacies of each new protocol, and moving the hard work of - - - - -Kennedy Informational [Page 1] - -RFC 3252 Binary Lexical Octet Ad-hoc Transport 1 April 2002 - - - parsing to the XML toolset. The use of XML also mitigates concerns - over "network vs. host" byte ordering which is at the root of many - network application bugs. - -1.3. Relation to Existing Protocols - - The reformulations specified in this RFC follow as closely as - possible the spirit of the RFCs on which they are based, and so MAY - contain elements or attributes that would not be needed in a pure - reworking (e.g. length attributes, which are implicit in XML.) - - The layering of network and transport protocols are maintained in - this RFC despite the optimizations that could be made if the line - were somewhat blurred (i.e. merging TCP and IP into a single, larger - element in the DTD) in order to foster future use of this protocol as - a basis for reformulating other protocols (such as ICMP.) - - Other than the encoding, the behavioral aspects of each of the - existing protocols remain unchanged. Routing, address spaces, TCP - congestion control, etc. behave as specified in the extant standards. - Adapting to new standards and experimental algorithm heuristics for - improving performance will become much easier once the move to BLOAT - has been completed. - -1.4. Requirement Levels - - The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", - "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this - document are to be interpreted as described in BCP 14, RFC 2119 - [RFC2119]. - -2. IPoXML - - This protocol MUST be implemented to be compliant with this RFC. - IPoXML is the root protocol REQUIRED for effective use of TCPoXML - (section 3.) and higher-level application protocols. - - The DTD for this document type can be found in section 7.1. - - The routing of IPoXML can be easily implemented on hosts with an XML - parser, as the regular structure lends itself handily to parsing and - validation of the document/datagram and then processing the - destination address, TTL, and checksum before sending it on to its - next-hop. - - The reformulation of IPv4 was chosen over IPv6 [RFC2460] due to the - wider deployment of IPv4 and the fact that implementing IPv6 as XML - would have exceeded the 1500 byte Ethernet MTU. - - - -Kennedy Informational [Page 2] - -RFC 3252 Binary Lexical Octet Ad-hoc Transport 1 April 2002 - - - All BLOAT implementations MUST use - and specify - the UTF-8 encoding - of RFC 2279 [RFC2279]. All BLOAT document/datagrams MUST be well- - formed and include the XMLDecl. - -2.1. IP Description - - A number of items have changed (for the better) from the original IP - specification. Bit-masks, where present have been converted into - human-readable values. IP addresses are listed in their dotted- - decimal notation [RFC1123]. Length and checksum values are present - as decimal integers. - - To calculate the length and checksum fields of the IP element, a - canonicalized form of the element MUST be used. The canonical form - SHALL have no whitespace (including newline characters) between - elements and only one space character between attributes. There - SHALL NOT be a space following the last attribute in an element. - - An iterative method SHOULD be used to calculate checksums, as the - length field will vary based on the size of the checksum. - - The payload element bears special attention. Due to the character - set restrictions of XML, the payload of IP datagrams (which MAY - contain arbitrary data) MUST be encoded for transport. This RFC - REQUIRES the contents of the payload to be encoded in the base-64 - encoding of RFC 2045 [RFC2045], but removes the requirement that the - encoded output MUST be wrapped on 76-character lines. - - - - - - - - - - - - - - - - - - - - - - - - -Kennedy Informational [Page 3] - -RFC 3252 Binary Lexical Octet Ad-hoc Transport 1 April 2002 - - -2.2. Example Datagram - - The following is an example IPoXML datagram with an empty payload: - - - - -
- - - - - - - - - - - - - - - -
- - - - -3. TCPoXML - - This protocol MUST be implemented to be compliant with this RFC. The - DTD for this document type can be found in section 7.2. - -3.1. TCP Description - - A number of items have changed from the original TCP specification. - Bit-masks, where present have been converted into human-readable - values. Length and checksum and port values are present as decimal - integers. - - To calculate the length and checksum fields of the TCP element, a - canonicalized form of the element MUST be used as in section 2.1. - - An iterative method SHOULD be used to calculate checksums as in - section 2.1. - - The payload element MUST be encoded as in section 2.1. - - - -Kennedy Informational [Page 4] - -RFC 3252 Binary Lexical Octet Ad-hoc Transport 1 April 2002 - - - The TCP offset element was expanded to a maximum of 255 from 16 to - allow for the increased size of the header in XML. - - TCPoXML datagrams encapsulated by IPoXML MAY omit the header - as well as the declaration. - -3.2. Example Datagram - - The following is an example TCPoXML datagram with an empty payload: - - - - - - - - - - - - - - - - - - - - - - - - -4. UDPoXML - - This protocol MUST be implemented to be compliant with this RFC. The - DTD for this document type can be found in section 7.3. - -4.1. UDP Description - - A number of items have changed from the original UDP specification. - Bit-masks, where present have been converted into human-readable - values. Length and checksum and port values are present as decimal - integers. - - - - - - - -Kennedy Informational [Page 5] - -RFC 3252 Binary Lexical Octet Ad-hoc Transport 1 April 2002 - - - To calculate the length and checksum fields of the UDP element, a - canonicalized form of the element MUST be used as in section 2.1. An - iterative method SHOULD be used to calculate checksums as in section - 2.1. - - The payload element MUST be encoded as in section 2.1. - - UDPoXML datagrams encapsulated by IPoXML MAY omit the header - as well as the declaration. - -4.2. Example Datagram - - The following is an example UDPoXML datagram with an empty payload: - - - - - - - - - - - - - - -5. Network Transport - - This document provides for the transmission of BLOAT datagrams over - two common families of physical layer transport. Future RFCs will - address additional transports as routing vendors catch up to the - specification, and we begin to see BLOAT routed across the Internet - backbone. - -5.1. Ethernet - - BLOAT is encapsulated in Ethernet datagrams as in [RFC894] with the - exception that the type field of the Ethernet frame MUST contain the - value 0xBEEF. The first 5 octets of the Ethernet frame payload will - be 0x3c 3f 78 6d 6c (" - --> - - - - -Kennedy Informational [Page 7] - -RFC 3252 Binary Lexical Octet Ad-hoc Transport 1 April 2002 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Kennedy Informational [Page 9] - -RFC 3252 Binary Lexical Octet Ad-hoc Transport 1 April 2002 - - - - - - - - - - - - - - - - - - - - - - - - -Kennedy Informational [Page 10] - -RFC 3252 Binary Lexical Octet Ad-hoc Transport 1 April 2002 - - - - - - - - - - - - - -7.2. TCPoXML DTD - - - - - - - - - - - - - - - - - -Kennedy Informational [Page 11] - -RFC 3252 Binary Lexical Octet Ad-hoc Transport 1 April 2002 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Kennedy Informational [Page 12] - -RFC 3252 Binary Lexical Octet Ad-hoc Transport 1 April 2002 - - - - - - - - - - - - - - - - - - - - -7.3. UDPoXML DTD - - - - - - - - - - - - - - - -Kennedy Informational [Page 13] - -RFC 3252 Binary Lexical Octet Ad-hoc Transport 1 April 2002 - - -8. Security Considerations - - XML, as a subset of SGML, has the same security considerations as - specified in SGML Media Types [RFC1874]. Security considerations - that apply to IP, TCP and UDP also likely apply to BLOAT as it does - not attempt to correct for issues not related to message format. - -9. References - - [JABBER] Miller, J., "Jabber", draft-miller-jabber-00.txt, - February 2002. (Work in Progress) - - [RFC768] Postel, J., "User Datagram Protocol", STD 6, RFC 768, - August 1980. - - [RFC791] Postel, J., "Internet Protocol", STD 5, RFC 791, - September 1981. - - [RFC793] Postel, J., "Transmission Control Protocol", STD 7, RFC - 793, September 1981. - - [RFC894] Hornig, C., "Standard for the Transmission of IP - Datagrams over Ethernet Networks.", RFC 894, April 1984. - - [RFC1042] Postel, J. and J. Reynolds, "Standard for the - Transmission of IP Datagrams Over IEEE 802 Networks", STD - 43, RFC 1042, February 1988. - - [RFC1123] Braden, R., "Requirements for Internet Hosts - - Application and Support", RFC 1123, October 1989. - - [RFC1874] Levinson, E., "SGML Media Types", RFC 1874, December - 1995. - - [RFC2003] Perkins, C., "IP Encapsulation within IP", RFC 2003, - October 1996. - - [RFC2045] Freed, N. and N. Borenstein, "Multipurpose Internet Mail - Extensions (MIME) Part One: Format of Internet Message - Bodies", RFC 2045, November 1996. - - [RFC2119] Bradner, S., "Key words for use in RFCs to Indicate - Requirement Levels", BCP 14, RFC 2119, March 1997. - - [RFC2279] Yergeau, F., "UTF-8, a transformation format of ISO - 10646", RFC 2279, January 1998. - - - - - -Kennedy Informational [Page 14] - -RFC 3252 Binary Lexical Octet Ad-hoc Transport 1 April 2002 - - - [RFC2460] Deering, S. and R. Hinden, "Internet Protocol, Version 6 - (IPv6) Specification", RFC 2460, December 1998. - - [RFC3080] Rose, M., "The Blocks Extensible Exchange Protocol Core", - RFC 3080, March 2001. - - [SOAP] Box, D., Ehnebuske, D., Kakivaya, G., Layman, A., - Mendelsohn, N., Nielsen, H. F., Thatte, S. Winer, D., - "Simple Object Access Protocol (SOAP) 1.1" World Wide Web - Consortium Note, May 2000 http://www.w3.org/TR/SOAP/ - - [XML] Bray, T., Paoli, J., Sperberg-McQueen, C. M., "Extensible - Markup Language (XML)" World Wide Web Consortium - Recommendation REC- xml-19980210. - http://www.w3.org/TR/1998/REC-xml-19980210 - -10. Author's Address - - Hugh Kennedy - Mimezine - 1060 West Addison - Chicago, IL 60613 - USA - - EMail: kennedyh@engin.umich.edu - - - - - - - - - - - - - - - - - - - - - - - - - - -Kennedy Informational [Page 15] - -RFC 3252 Binary Lexical Octet Ad-hoc Transport 1 April 2002 - - -11. Full Copyright Statement - - Copyright (C) The Internet Society (2002). All Rights Reserved. - - This document and translations of it may be copied and furnished to - others, and derivative works that comment on or otherwise explain it - or assist in its implementation may be prepared, copied, published - and distributed, in whole or in part, without restriction of any - kind, provided that the above copyright notice and this paragraph are - included on all such copies and derivative works. However, this - document itself may not be modified in any way, such as by removing - the copyright notice or references to the Internet Society or other - Internet organizations, except as needed for the purpose of - developing Internet standards in which case the procedures for - copyrights defined in the Internet Standards process must be - followed, or as required to translate it into languages other than - English. - - The limited permissions granted above are perpetual and will not be - revoked by the Internet Society or its successors or assigns. - - This document and the information contained herein is provided on an - "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING - TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING - BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION - HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF - MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - -Acknowledgement - - Funding for the RFC Editor function is currently provided by the - Internet Society. - - - - - - - - - - - - - - - - - - - -Kennedy Informational [Page 16] - diff --git a/tests/auto/network/access/qftp/tst_qftp.cpp b/tests/auto/network/access/qftp/tst_qftp.cpp deleted file mode 100644 index 886a589324..0000000000 --- a/tests/auto/network/access/qftp/tst_qftp.cpp +++ /dev/null @@ -1,2317 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include - -#include -#include -#include -#include "private/qftp_p.h" -#include -#include -#include -#include -#include -#include -#include -#include - -#include "../../../network-settings.h" - -template -static QByteArray msgComparison(T1 lhs, const char *op, T2 rhs) -{ - QString result; - QTextStream(&result) << lhs << ' ' << op << ' ' << rhs; - return result.toLatin1(); -} - -class tst_QFtp : public QObject -{ - Q_OBJECT - -public: - tst_QFtp(); - -private slots: - void initTestCase_data(); - void initTestCase(); - void init(); - void cleanup(); - void connectToHost_data(); - void connectToHost(); - void connectToUnresponsiveHost(); - void login_data(); - void login(); - void close_data(); - void close(); - - void list_data(); - void list(); - void cd_data(); - void cd(); - void get_data(); - void get(); - void put_data(); - void put(); - void mkdir_data(); - void mkdir(); - void mkdir2(); - void rename_data(); - void rename(); - - void commandSequence_data(); - void commandSequence(); - - void abort_data(); - void abort(); - - void bytesAvailable_data(); - void bytesAvailable(); - - void activeMode(); - - void proxy_data(); - void proxy(); - - void binaryAscii(); - - void doneSignal(); - void queueMoreCommandsInDoneSlot(); - - void qtbug7359Crash(); - - void loginURL_data(); - void loginURL(); - -protected slots: - void stateChanged( int ); - void listInfo( const QUrlInfo & ); - void readyRead(); - void dataTransferProgress(qint64, qint64); - - void commandStarted( int ); - void commandFinished( int, bool ); - void done( bool ); - void activeModeDone( bool ); - void mkdir2Slot(int id, bool error); - void cdUpSlot(bool); - -private: - QFtp *newFtp(); - void addCommand( QFtp::Command, int ); - bool fileExists( const QString &host, quint16 port, const QString &user, const QString &password, const QString &file, const QString &cdDir = QString() ); - bool dirExists( const QString &host, quint16 port, const QString &user, const QString &password, const QString &cdDir, const QString &dirToCreate ); - - void renameInit( const QString &host, const QString &user, const QString &password, const QString &createFile ); - void renameCleanup( const QString &host, const QString &user, const QString &password, const QString &fileToDelete ); - - QFtp *ftp; - - QList ids; // helper to make sure that all expected signals are emitted - int current_id; - - int connectToHost_state; - int close_state; - int login_state; - int cur_state; - struct CommandResult - { - int id; - int success; - }; - QMap< QFtp::Command, CommandResult > resultMap; - typedef QMap::Iterator ResMapIt; - - int done_success; - int commandSequence_success; - - qlonglong bytesAvailable_finishedGet; - qlonglong bytesAvailable_finished; - qlonglong bytesAvailable_done; - - QList listInfo_i; - QByteArray newData_ba; - qlonglong bytesTotal; - qlonglong bytesDone; - - bool inFileDirExistsFunction; - - QString uniqueExtension; - QString rfc3252File; -}; - -//#define DUMP_SIGNALS - -const int bytesTotal_init = -10; -const int bytesDone_init = -10; - -tst_QFtp::tst_QFtp() : - ftp(0) -{ -} - -void tst_QFtp::initTestCase_data() -{ - QTest::addColumn("setProxy"); - QTest::addColumn("proxyType"); - - QTest::newRow("WithoutProxy") << false << 0; -#if QT_CONFIG(socks5) - QTest::newRow("WithSocks5Proxy") << true << int(QNetworkProxy::Socks5Proxy); -#endif - //### doesn't work well yet. - //QTest::newRow("WithHttpProxy") << true << int(QNetworkProxy::HttpProxy); -} - -void tst_QFtp::initTestCase() -{ -#if defined(QT_TEST_SERVER) - QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::ftpServerName(), 21)); - QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::ftpProxyServerName(), 2121)); - QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::socksProxyServerName(), 1080)); - QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::httpProxyServerName(), 3128)); -#else - if (!QtNetworkSettings::verifyTestNetworkSettings()) - QSKIP("No network test server available"); -#endif - rfc3252File = QFINDTESTDATA("rfc3252.txt"); - QVERIFY(!rfc3252File.isEmpty()); -} - -void tst_QFtp::init() -{ - QFETCH_GLOBAL(bool, setProxy); - QFETCH_GLOBAL(int, proxyType); - if (setProxy) { -#ifndef QT_NO_NETWORKPROXY - if (proxyType == QNetworkProxy::Socks5Proxy) { - QNetworkProxy::setApplicationProxy(QNetworkProxy(QNetworkProxy::Socks5Proxy, QtNetworkSettings::socksProxyServerName(), 1080)); - } else if (proxyType == QNetworkProxy::HttpProxy) { - QNetworkProxy::setApplicationProxy(QNetworkProxy(QNetworkProxy::HttpProxy, QtNetworkSettings::httpProxyServerName(), 3128)); - } -#else // !QT_NO_NETWORKPROXY - Q_UNUSED(proxyType); - QSKIP("No proxy support"); -#endif // QT_NO_NETWORKPROXY - } - - delete ftp; - ftp = 0; - - ids.clear(); - current_id = 0; - - resultMap.clear(); - connectToHost_state = -1; - close_state = -1; - login_state = -1; - cur_state = QFtp::Unconnected; - - listInfo_i.clear(); - newData_ba = QByteArray(); - bytesTotal = bytesTotal_init; - bytesDone = bytesDone_init; - - done_success = -1; - commandSequence_success = -1; - - bytesAvailable_finishedGet = 1234567890; - bytesAvailable_finished = 1234567890; - bytesAvailable_done = 1234567890; - - inFileDirExistsFunction = false; - - uniqueExtension = QString::number((quintptr)this) + QString::number(QRandomGenerator::global()->generate()) - + QString::number((qulonglong)time(0)); -} - -void tst_QFtp::cleanup() -{ - if (ftp) { - delete ftp; - ftp = 0; - } - QFETCH_GLOBAL(bool, setProxy); - if (setProxy) { -#ifndef QT_NO_NETWORKPROXY - QNetworkProxy::setApplicationProxy(QNetworkProxy::DefaultProxy); -#else - QSKIP("No proxy support"); -#endif - } - - delete ftp; - ftp = 0; -} - -void tst_QFtp::connectToHost_data() -{ - QTest::addColumn("host"); - QTest::addColumn("port"); - QTest::addColumn("state"); - - QTest::newRow( "ok01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << (int)QFtp::Connected; - QTest::newRow( "error01" ) << QtNetworkSettings::ftpServerName() << (uint)2222 << (int)QFtp::Unconnected; - QTest::newRow( "error02" ) << QString("foo.bar") << (uint)21 << (int)QFtp::Unconnected; -} - -static QByteArray msgTimedOut(const QString &host, quint16 port = 0) -{ - QByteArray result = "Network operation timed out on " + host.toLatin1(); - if (port) { - result += ':'; - result += QByteArray::number(port); - } - return result; -} - -void tst_QFtp::connectToHost() -{ - QFETCH( QString, host ); - QFETCH( uint, port ); - - ftp = newFtp(); - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host, port ) ); - - QTestEventLoop::instance().enterLoop( 61 ); - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(host, port) ); - - QTEST( connectToHost_state, "state" ); - - ResMapIt it = resultMap.find( QFtp::ConnectToHost ); - QVERIFY( it != resultMap.end() ); - QFETCH( int, state ); - if ( state == QFtp::Connected ) { - QCOMPARE( it.value().success, 1 ); - } else { - QCOMPARE( it.value().success , 0 ); - } -} - -void tst_QFtp::connectToUnresponsiveHost() -{ - QFETCH_GLOBAL(bool, setProxy); - if (setProxy) - QSKIP( "This test takes too long if we test with proxies too"); - - QString host = "192.0.2.42"; // IP out of TEST-NET, should be unreachable - uint port = 21; - - ftp = newFtp(); - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host, port ) ); - - qDebug( "About to connect to host that won't reply (this test takes 60 seconds)" ); - QTestEventLoop::instance().enterLoop( 61 ); -#ifdef Q_OS_WIN - /* On Windows, we do not get a timeout, because Winsock is behaving in a strange way: - We issue two "WSAConnect()" calls, after the first, as a result we get WSAEWOULDBLOCK, - after the second, we get WSAEISCONN, which means that the socket is connected, which cannot be. - However, after some seconds we get a socket error saying that the remote host closed the connection, - which can neither be. For this test, that would actually enable us to finish before timout, but handling that case - (in void QFtpPI::error(QAbstractSocket::SocketError e)) breaks - a lot of other stuff in QFtp, so we just expect this test to fail on Windows. - */ - QEXPECT_FAIL("", "timeout not working due to strange Windows socket behaviour (see source file of this test for explanation)", Abort); - -#endif - QVERIFY2(! QTestEventLoop::instance().timeout(), "Network timeout longer than expected (should have been 60 seconds)"); - - QCOMPARE( ftp->state(), QFtp::Unconnected); - ResMapIt it = resultMap.find( QFtp::ConnectToHost ); - QVERIFY( it != resultMap.end() ); - QCOMPARE( it.value().success, 0 ); - - delete ftp; - ftp = 0; -} - -void tst_QFtp::login_data() -{ - QTest::addColumn("host"); - QTest::addColumn("port"); - QTest::addColumn("user"); - QTest::addColumn("password"); - QTest::addColumn("success"); - - QTest::newRow( "ok01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << 1; - QTest::newRow( "ok02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftp") << QString("") << 1; - QTest::newRow( "ok03" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftp") << QString("foo") << 1; - QTest::newRow( "ok04" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest") << QString("password") << 1; - - QTest::newRow( "error01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("foo") << QString("") << 0; - QTest::newRow( "error02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("foo") << QString("bar") << 0; -} - -void tst_QFtp::login() -{ - QFETCH( QString, host ); - QFETCH( uint, port ); - QFETCH( QString, user ); - QFETCH( QString, password ); - - ftp = newFtp(); - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host, port ) ); - addCommand( QFtp::Login, ftp->login( user, password ) ); - - QTestEventLoop::instance().enterLoop( 30 ); - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(host, port) ); - - ResMapIt it = resultMap.find( QFtp::Login ); - QVERIFY( it != resultMap.end() ); - QTEST( it.value().success, "success" ); - - const QFtp::State loginState = static_cast(login_state); - if ( it.value().success ) { - QCOMPARE( loginState, QFtp::LoggedIn ); - } else { - QVERIFY2( loginState != QFtp::LoggedIn, msgComparison(loginState, "!=", QFtp::LoggedIn)); - } -} - -void tst_QFtp::close_data() -{ - QTest::addColumn("host"); - QTest::addColumn("port"); - QTest::addColumn("user"); - QTest::addColumn("password"); - QTest::addColumn("login"); - - QTest::newRow( "login01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << true; - QTest::newRow( "login02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftp") << QString() << true; - QTest::newRow( "login03" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftp") << QString("foo") << true; - QTest::newRow( "login04" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest") << QString("password") << true; - - QTest::newRow( "no-login01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("") << QString("") << false; -} - -void tst_QFtp::close() -{ - QFETCH( QString, host ); - QFETCH( uint, port ); - QFETCH( QString, user ); - QFETCH( QString, password ); - QFETCH( bool, login ); - - ftp = newFtp(); - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host, port ) ); - if ( login ) - addCommand( QFtp::Login, ftp->login( user, password ) ); - addCommand( QFtp::Close, ftp->close() ); - - QTestEventLoop::instance().enterLoop( 30 ); - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(host, port) ); - - QCOMPARE( close_state, (int)QFtp::Unconnected ); - - ResMapIt it = resultMap.find( QFtp::Close ); - QVERIFY( it != resultMap.end() ); - QCOMPARE( it.value().success, 1 ); -} - -void tst_QFtp::list_data() -{ - QTest::addColumn("host"); - QTest::addColumn("port"); - QTest::addColumn("user"); - QTest::addColumn("password"); - QTest::addColumn("dir"); - QTest::addColumn("success"); - QTest::addColumn("entryNames"); // ### we should rather use a QList here - - QStringList flukeRoot; - flukeRoot << "pub"; - flukeRoot << "qtest"; - QStringList flukeQtest; - flukeQtest << "bigfile"; - flukeQtest << "nonASCII"; - flukeQtest << "rfc3252"; - flukeQtest << "rfc3252.txt"; - flukeQtest << "upload"; - - QTest::newRow( "workDir01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString() << 1 << flukeRoot; - QTest::newRow( "workDir02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest") << QString("password") << QString() << 1 << flukeRoot; - - QTest::newRow( "relPath01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("qtest") << 1 << flukeQtest; - QTest::newRow( "relPath02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest") << QString("password") << QString("qtest") << 1 << flukeQtest; - - QTest::newRow( "absPath01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("/qtest") << 1 << flukeQtest; - QTest::newRow( "absPath02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest") << QString("password") << QString("/var/ftp/qtest") << 1 << flukeQtest; - - QTest::newRow( "nonExist01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("foo") << 1 << QStringList(); - QTest::newRow( "nonExist02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("/foo") << 1 << QStringList(); - // ### The microsoft server does not seem to work properly at the moment -- - // I am also not able to open a data connection with other, non-Qt FTP - // clients to it. - // QTest::newRow( "nonExist03" ) << "ftp.microsoft.com" << (uint)21 << QString() << QString() << QString("/foo") << 0 << QStringList(); - - QStringList susePub; - susePub << "README.mirror-policy" << "axp" << "i386" << "ia64" << "install" << "noarch" << "pubring.gpg-build.suse.de" << "update" << "x86_64"; - QTest::newRow( "epsvNotSupported" ) << QString("ftp.funet.fi") << (uint)21 << QString::fromLatin1("ftp") << QString::fromLatin1("root@") << QString("/pub/Linux/suse/suse") << 1 << susePub; -} - -void tst_QFtp::list() -{ - QFETCH( QString, host ); - QFETCH( uint, port ); - QFETCH( QString, user ); - QFETCH( QString, password ); - QFETCH( QString, dir ); - - ftp = newFtp(); - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host, port ) ); - addCommand( QFtp::Login, ftp->login( user, password ) ); - addCommand( QFtp::List, ftp->list( dir ) ); - addCommand( QFtp::Close, ftp->close() ); - - QTestEventLoop::instance().enterLoop( 30 ); - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(host, port) ); - - ResMapIt it = resultMap.find( QFtp::List ); - QVERIFY( it != resultMap.end() ); - QTEST( it.value().success, "success" ); - QFETCH( QStringList, entryNames ); - QCOMPARE( listInfo_i.count(), entryNames.count() ); - for ( uint i=0; i < (uint) entryNames.count(); i++ ) { - QCOMPARE( listInfo_i[i].name(), entryNames[i] ); - } -} - -void tst_QFtp::cd_data() -{ - QTest::addColumn("host"); - QTest::addColumn("port"); - QTest::addColumn("user"); - QTest::addColumn("password"); - QTest::addColumn("dir"); - QTest::addColumn("success"); - QTest::addColumn("entryNames"); // ### we should rather use a QList here - - QStringList flukeRoot; - flukeRoot << "qtest"; - QStringList flukeQtest; - flukeQtest << "bigfile"; - flukeQtest << "nonASCII"; - flukeQtest << "rfc3252"; - flukeQtest << "rfc3252.txt"; - flukeQtest << "upload"; - - QTest::newRow( "relPath01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("qtest") << 1 << flukeQtest; - QTest::newRow( "relPath02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest") << QString("password") << QString("qtest") << 1 << flukeQtest; - - QTest::newRow( "absPath01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("/qtest") << 1 << flukeQtest; - QTest::newRow( "absPath02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest") << QString("password") << QString("/var/ftp/qtest") << 1 << flukeQtest; - - QTest::newRow( "nonExist01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("foo") << 0 << QStringList(); - QTest::newRow( "nonExist03" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("/foo") << 0 << QStringList(); -} - -void tst_QFtp::cd() -{ - QFETCH( QString, host ); - QFETCH( uint, port ); - QFETCH( QString, user ); - QFETCH( QString, password ); - QFETCH( QString, dir ); - - ftp = newFtp(); - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host, port ) ); - addCommand( QFtp::Login, ftp->login( user, password ) ); - addCommand( QFtp::Cd, ftp->cd( dir ) ); - addCommand( QFtp::List, ftp->list() ); - addCommand( QFtp::Close, ftp->close() ); - - QTestEventLoop::instance().enterLoop( 30 ); - - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) { - QFAIL( msgTimedOut(host, port) ); - } - - ResMapIt it = resultMap.find( QFtp::Cd ); - QVERIFY( it != resultMap.end() ); - QTEST( it.value().success, "success" ); - QFETCH( QStringList, entryNames ); - QCOMPARE( listInfo_i.count(), entryNames.count() ); - for ( uint i=0; i < (uint) entryNames.count(); i++ ) { - QCOMPARE( listInfo_i[i].name(), entryNames[i] ); - } -} - -void tst_QFtp::get_data() -{ - QTest::addColumn("host"); - QTest::addColumn("port"); - QTest::addColumn("user"); - QTest::addColumn("password"); - QTest::addColumn("file"); - QTest::addColumn("success"); - QTest::addColumn("res"); - QTest::addColumn("useIODevice"); - - // ### move this into external testdata - QFile file(rfc3252File); - QVERIFY2( file.open( QIODevice::ReadOnly ), qPrintable(file.errorString()) ); - QByteArray rfc3252 = file.readAll(); - - // test the two get() overloads in one routine - for ( int i=0; i<2; i++ ) { - const QByteArray iB = QByteArray::number(i); - QTest::newRow(("relPath01_" + iB).constData()) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() - << "qtest/rfc3252" << 1 << rfc3252 << (bool)(i==1); - QTest::newRow(("relPath02_" + iB).constData()) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest") << QString("password") - << "qtest/rfc3252" << 1 << rfc3252 << (bool)(i==1); - - QTest::newRow(("absPath01_" + iB).constData()) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() - << "/qtest/rfc3252" << 1 << rfc3252 << (bool)(i==1); - QTest::newRow(("absPath02_" + iB).constData()) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest") << QString("password") - << "/var/ftp/qtest/rfc3252" << 1 << rfc3252 << (bool)(i==1); - - QTest::newRow(("nonExist01_" + iB).constData()) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() - << QString("foo") << 0 << QByteArray() << (bool)(i==1); - QTest::newRow(("nonExist02_" + iB).constData()) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() - << QString("/foo") << 0 << QByteArray() << (bool)(i==1); - } -} - -void tst_QFtp::get() -{ - // for the overload that takes a QIODevice - QByteArray buf_ba; - QBuffer buf( &buf_ba ); - - QFETCH( QString, host ); - QFETCH( uint, port ); - QFETCH( QString, user ); - QFETCH( QString, password ); - QFETCH( QString, file ); - QFETCH( bool, useIODevice ); - - ftp = newFtp(); - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host, port ) ); - addCommand( QFtp::Login, ftp->login( user, password ) ); - if ( useIODevice ) { - buf.open( QIODevice::WriteOnly ); - addCommand( QFtp::Get, ftp->get( file, &buf ) ); - } else { - addCommand( QFtp::Get, ftp->get( file ) ); - } - addCommand( QFtp::Close, ftp->close() ); - - QTestEventLoop::instance().enterLoop( 50 ); - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(host, port) ); - - ResMapIt it = resultMap.find( QFtp::Get ); - QVERIFY( it != resultMap.end() ); - QTEST( it.value().success, "success" ); - if ( useIODevice ) { - QTEST( buf_ba, "res" ); - } else { - QTEST( newData_ba, "res" ); - } - QVERIFY2( bytesTotal != bytesTotal_init, msgComparison(bytesTotal, "!=", bytesTotal_init) ); - if ( bytesTotal != -1 ) { - QCOMPARE( bytesDone, bytesTotal ); - } - if ( useIODevice ) { - if ( bytesDone != bytesDone_init ) { - QCOMPARE( qlonglong(buf_ba.size()), bytesDone ); - } - } else { - if ( bytesDone != bytesDone_init ) { - QCOMPARE( qlonglong(newData_ba.size()), bytesDone ); - } - } -} - -void tst_QFtp::put_data() -{ - QTest::addColumn("host"); - QTest::addColumn("port"); - QTest::addColumn("user"); - QTest::addColumn("password"); - QTest::addColumn("file"); - QTest::addColumn("fileData"); - QTest::addColumn("useIODevice"); - QTest::addColumn("success"); - - // ### move this into external testdata - QFile file(rfc3252File); - QVERIFY2( file.open( QIODevice::ReadOnly ), qPrintable(file.errorString()) ); - QByteArray rfc3252 = file.readAll(); - - QByteArray bigData( 10*1024*1024, 0 ); - bigData.fill( 'A' ); - - // test the two put() overloads in one routine with a file name containing - // U+0x00FC (latin small letter u with diaeresis) for QTBUG-52303, testing UTF-8 - for ( int i=0; i<2; i++ ) { - QTest::newRow(("relPath01_" + QByteArray::number(i)).constData()) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() - << (QLatin1String("qtest/upload/rel01_") + QChar(0xfc) + QLatin1String("%1")) << rfc3252 - << (bool)(i==1) << 1; - /* - QTest::newRow( QString("relPath02_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest") << QString("password") - << QString("qtest/upload/rel02_%1") << rfc3252 - << (bool)(i==1) << 1; - QTest::newRow( QString("relPath03_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest") << QString("password") - << QString("qtest/upload/rel03_%1") << QByteArray() - << (bool)(i==1) << 1; - QTest::newRow( QString("relPath04_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest") << QString("password") - << QString("qtest/upload/rel04_%1") << bigData - << (bool)(i==1) << 1; - - QTest::newRow( QString("absPath01_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() - << QString("/qtest/upload/abs01_%1") << rfc3252 - << (bool)(i==1) << 1; - QTest::newRow( QString("absPath02_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest") << QString("password") - << QString("/srv/ftp/qtest/upload/abs02_%1") << rfc3252 - << (bool)(i==1) << 1; - - QTest::newRow( QString("nonExist01_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() - << QString("foo") << QByteArray() - << (bool)(i==1) << 0; - QTest::newRow( QString("nonExist02_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() - << QString("/foo") << QByteArray() - << (bool)(i==1) << 0; -*/ - } -} - -void tst_QFtp::put() -{ - QFETCH( QString, host ); - QFETCH( uint, port ); - QFETCH( QString, user ); - QFETCH( QString, password ); - QFETCH( QString, file ); - QFETCH( QByteArray, fileData ); - QFETCH( bool, useIODevice ); - -#if defined(Q_OS_WIN) && !defined(QT_NO_NETWORKPROXY) - QFETCH_GLOBAL(bool, setProxy); - if (setProxy) { - QFETCH_GLOBAL(int, proxyType); - if (proxyType == QNetworkProxy::Socks5Proxy) - QSKIP("With socks5 the put() test takes too long time on Windows."); - } -#endif // OS_WIN && !QT_NO_NETWORKPROXY - - const int timestep = 50; - - if(file.contains('%')) - file = file.arg(uniqueExtension); - - // for the overload that takes a QIODevice - QBuffer buf_fileData( &fileData ); - buf_fileData.open( QIODevice::ReadOnly ); - - ResMapIt it; - ////////////////////////////////////////////////////////////////// - // upload the file - init(); - ftp = newFtp(); - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host, port ) ); - addCommand( QFtp::Login, ftp->login( user, password ) ); - if ( useIODevice ) - addCommand( QFtp::Put, ftp->put( &buf_fileData, file ) ); - else - addCommand( QFtp::Put, ftp->put( fileData, file ) ); - addCommand( QFtp::Close, ftp->close() ); - - for(int time = 0; time <= fileData.length() / 20000; time += timestep) { - QTestEventLoop::instance().enterLoop( timestep ); - if(ftp->currentCommand() == QFtp::None) - break; - } - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(host, port) ); - - it = resultMap.find( QFtp::Put ); - QVERIFY( it != resultMap.end() ); - QTEST( it.value().success, "success" ); - if ( !it.value().success ) { - QVERIFY( !fileExists( host, port, user, password, file ) ); - return; // the following tests are only meaningful if the file could be put - } - QCOMPARE( bytesTotal, qlonglong(fileData.size()) ); - QCOMPARE( bytesDone, bytesTotal ); - - QVERIFY( fileExists( host, port, user, password, file ) ); - - ////////////////////////////////////////////////////////////////// - // fetch file to make sure that it is equal to the uploaded file - init(); - ftp = newFtp(); - QBuffer buf; - buf.open( QIODevice::WriteOnly ); - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host, port ) ); - addCommand( QFtp::Login, ftp->login( user, password ) ); - addCommand( QFtp::Get, ftp->get( file, &buf ) ); - addCommand( QFtp::Close, ftp->close() ); - - for(int time = 0; time <= fileData.length() / 20000; time += timestep) { - QTestEventLoop::instance().enterLoop( timestep ); - if(ftp->currentCommand() == QFtp::None) - break; - } - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(host, port) ); - - QCOMPARE( done_success, 1 ); - QTEST( buf.buffer(), "fileData" ); - - ////////////////////////////////////////////////////////////////// - // cleanup (i.e. remove the file) -- this also tests the remove command - init(); - ftp = newFtp(); - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host, port ) ); - addCommand( QFtp::Login, ftp->login( user, password ) ); - addCommand( QFtp::Remove, ftp->remove( file ) ); - addCommand( QFtp::Close, ftp->close() ); - - QTestEventLoop::instance().enterLoop( timestep ); - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(host, port) ); - - it = resultMap.find( QFtp::Remove ); - QVERIFY( it != resultMap.end() ); - QCOMPARE( it.value().success, 1 ); - - QVERIFY( !fileExists( host, port, user, password, file ) ); -} - -void tst_QFtp::mkdir_data() -{ - QTest::addColumn("host"); - QTest::addColumn("port"); - QTest::addColumn("user"); - QTest::addColumn("password"); - QTest::addColumn("cdDir"); - QTest::addColumn("dirToCreate"); - QTest::addColumn("success"); - - QTest::newRow( "relPath01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() - << "qtest/upload" << QString("rel01_%1") << 1; - QTest::newRow( "relPath02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest") << QString("password") - << "qtest/upload" << QString("rel02_%1") << 1; - QTest::newRow( "relPath03" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest") << QString("password") - << "qtest/upload" << QString("rel03_%1") << 1; - - QTest::newRow( "absPath01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() - << "." << QString("/qtest/upload/abs01_%1") << 1; - QTest::newRow( "absPath02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest") << QString("password") - << "." << QString("/var/ftp/qtest/upload/abs02_%1") << 1; - - // QTest::newRow( "nonExist01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("foo") << 0; - QTest::newRow( "nonExist01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() - << "." << QString("foo") << 0; - QTest::newRow( "nonExist02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() - << "." << QString("/foo") << 0; -} - -void tst_QFtp::mkdir() -{ - QFETCH( QString, host ); - QFETCH( uint, port ); - QFETCH( QString, user ); - QFETCH( QString, password ); - QFETCH( QString, cdDir ); - QFETCH( QString, dirToCreate ); - - if(dirToCreate.contains('%')) - dirToCreate = dirToCreate.arg(uniqueExtension); - - ////////////////////////////////////////////////////////////////// - // create the directory - init(); - ftp = newFtp(); - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host, port ) ); - addCommand( QFtp::Login, ftp->login( user, password ) ); - addCommand( QFtp::Cd, ftp->cd( cdDir ) ); - addCommand( QFtp::Mkdir, ftp->mkdir( dirToCreate ) ); - addCommand( QFtp::Close, ftp->close() ); - - QTestEventLoop::instance().enterLoop( 30 ); - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(host, port) ); - - ResMapIt it = resultMap.find( QFtp::Mkdir ); - QVERIFY( it != resultMap.end() ); - QTEST( it.value().success, "success" ); - if ( !it.value().success ) { - QVERIFY( !dirExists( host, port, user, password, cdDir, dirToCreate ) ); - return; // the following tests are only meaningful if the dir could be created - } - QVERIFY( dirExists( host, port, user, password, cdDir, dirToCreate ) ); - - ////////////////////////////////////////////////////////////////// - // create the directory again (should always fail!) - init(); - ftp = newFtp(); - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host, port ) ); - addCommand( QFtp::Login, ftp->login( user, password ) ); - addCommand( QFtp::Cd, ftp->cd( cdDir ) ); - addCommand( QFtp::Mkdir, ftp->mkdir( dirToCreate ) ); - addCommand( QFtp::Close, ftp->close() ); - - QTestEventLoop::instance().enterLoop( 30 ); - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(host, port) ); - - it = resultMap.find( QFtp::Mkdir ); - QVERIFY( it != resultMap.end() ); - QCOMPARE( it.value().success, 0 ); - - ////////////////////////////////////////////////////////////////// - // remove the directory - init(); - ftp = newFtp(); - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host, port ) ); - addCommand( QFtp::Login, ftp->login( user, password ) ); - addCommand( QFtp::Cd, ftp->cd( cdDir ) ); - addCommand( QFtp::Rmdir, ftp->rmdir( dirToCreate ) ); - addCommand( QFtp::Close, ftp->close() ); - - QTestEventLoop::instance().enterLoop( 30 ); - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(host, port) ); - - it = resultMap.find( QFtp::Rmdir ); - QVERIFY( it != resultMap.end() ); - QCOMPARE( it.value().success, 1 ); - - QVERIFY( !dirExists( host, port, user, password, cdDir, dirToCreate ) ); -} - -void tst_QFtp::mkdir2() -{ - ftp = new QFtp; - ftp->connectToHost(QtNetworkSettings::ftpServerName()); - ftp->login(); - current_id = ftp->cd("kake/test"); - - QEventLoop loop; - connect(ftp, SIGNAL(done(bool)), &loop, SLOT(quit())); - connect(ftp, SIGNAL(commandFinished(int,bool)), this, SLOT(mkdir2Slot(int,bool))); - QTimer::singleShot(5000, &loop, SLOT(quit())); - - QSignalSpy commandStartedSpy(ftp, SIGNAL(commandStarted(int))); - QSignalSpy commandFinishedSpy(ftp, SIGNAL(commandFinished(int,bool))); - - loop.exec(); - - QCOMPARE(commandStartedSpy.count(), 4); // connect, login, cd, mkdir - QCOMPARE(commandFinishedSpy.count(), 4); - - for (int i = 0; i < 4; ++i) - QCOMPARE(commandFinishedSpy.at(i).at(0), commandStartedSpy.at(i).at(0)); - - QVERIFY(!commandFinishedSpy.at(0).at(1).toBool()); - QVERIFY(!commandFinishedSpy.at(1).at(1).toBool()); - QVERIFY(commandFinishedSpy.at(2).at(1).toBool()); - QVERIFY(commandFinishedSpy.at(3).at(1).toBool()); - - delete ftp; - ftp = 0; -} - -void tst_QFtp::mkdir2Slot(int id, bool) -{ - if (id == current_id) - ftp->mkdir("kake/test"); -} - -void tst_QFtp::rename_data() -{ - QTest::addColumn("host"); - QTest::addColumn("user"); - QTest::addColumn("password"); - QTest::addColumn("cdDir"); - QTest::addColumn("oldfile"); - QTest::addColumn("newfile"); - QTest::addColumn("createFile"); - QTest::addColumn("renamedFile"); - QTest::addColumn("success"); - - QTest::newRow("relPath01") << QtNetworkSettings::ftpServerName() << QString() << QString() - << "qtest/upload" - << QString("rel_old01_%1") << QString("rel_new01_%1") - << QString("qtest/upload/rel_old01_%1") << QString("qtest/upload/rel_new01_%1") - << 1; - QTest::newRow("relPath02") << QtNetworkSettings::ftpServerName() << QString("ftptest") << "password" - << "qtest/upload" - << QString("rel_old02_%1") << QString("rel_new02_%1") - << QString("qtest/upload/rel_old02_%1") << QString("qtest/upload/rel_new02_%1") - << 1; - QTest::newRow("relPath03") << QtNetworkSettings::ftpServerName() << QString("ftptest") << "password" - << "qtest/upload" - << QString("rel_old03_%1")<< QString("rel_new03_%1") - << QString("qtest/upload/rel_old03_%1") << QString("qtest/upload/rel_new03_%1") - << 1; - - QTest::newRow("absPath01") << QtNetworkSettings::ftpServerName() << QString() << QString() - << QString() - << QString("/qtest/upload/abs_old01_%1") << QString("/qtest/upload/abs_new01_%1") - << QString("/qtest/upload/abs_old01_%1") << QString("/qtest/upload/abs_new01_%1") - << 1; - QTest::newRow("absPath02") << QtNetworkSettings::ftpServerName() << QString("ftptest") << "password" - << QString() - << QString("/var/ftp/qtest/upload/abs_old02_%1") << QString("/var/ftp/qtest/upload/abs_new02_%1") - << QString("/var/ftp/qtest/upload/abs_old02_%1") << QString("/var/ftp/qtest/upload/abs_new02_%1") - << 1; - - QTest::newRow("nonExist01") << QtNetworkSettings::ftpServerName() << QString() << QString() - << QString() - << QString("foo") << "new_foo" - << QString() << QString() - << 0; - QTest::newRow("nonExist02") << QtNetworkSettings::ftpServerName() << QString() << QString() - << QString() - << QString("/foo") << QString("/new_foo") - << QString() << QString() - << 0; -} - -void tst_QFtp::renameInit( const QString &host, const QString &user, const QString &password, const QString &createFile ) -{ - if ( !createFile.isNull() ) { - // upload the file - init(); - ftp = newFtp(); - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host ) ); - addCommand( QFtp::Login, ftp->login( user, password ) ); - addCommand( QFtp::Put, ftp->put( QByteArray(), createFile ) ); - addCommand( QFtp::Close, ftp->close() ); - - QTestEventLoop::instance().enterLoop( 50 ); - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(host) ); - - ResMapIt it = resultMap.find( QFtp::Put ); - QVERIFY( it != resultMap.end() ); - QCOMPARE( it.value().success, 1 ); - - QVERIFY( fileExists( host, 21, user, password, createFile ) ); - } -} - -void tst_QFtp::renameCleanup( const QString &host, const QString &user, const QString &password, const QString &fileToDelete ) -{ - if ( !fileToDelete.isNull() ) { - // cleanup (i.e. remove the file) - init(); - ftp = newFtp(); - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host ) ); - addCommand( QFtp::Login, ftp->login( user, password ) ); - addCommand( QFtp::Remove, ftp->remove( fileToDelete ) ); - addCommand( QFtp::Close, ftp->close() ); - - QTestEventLoop::instance().enterLoop( 30 ); - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(host) ); - - ResMapIt it = resultMap.find( QFtp::Remove ); - QVERIFY( it != resultMap.end() ); - QCOMPARE( it.value().success, 1 ); - - QVERIFY( !fileExists( host, 21, user, password, fileToDelete ) ); - } -} - -void tst_QFtp::rename() -{ - QFETCH( QString, host ); - QFETCH( QString, user ); - QFETCH( QString, password ); - QFETCH( QString, cdDir ); - QFETCH( QString, oldfile ); - QFETCH( QString, newfile ); - QFETCH( QString, createFile ); - QFETCH( QString, renamedFile ); - - if(oldfile.contains('%')) - oldfile = oldfile.arg(uniqueExtension); - if(newfile.contains('%')) - newfile = newfile.arg(uniqueExtension); - if(createFile.contains('%')) - createFile = createFile.arg(uniqueExtension); - if(renamedFile.contains('%')) - renamedFile = renamedFile.arg(uniqueExtension); - - renameInit( host, user, password, createFile ); - - init(); - ftp = newFtp(); - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host ) ); - addCommand( QFtp::Login, ftp->login( user, password ) ); - if ( !cdDir.isNull() ) - addCommand( QFtp::Cd, ftp->cd( cdDir ) ); - addCommand( QFtp::Rename, ftp->rename( oldfile, newfile ) ); - addCommand( QFtp::Close, ftp->close() ); - - QTestEventLoop::instance().enterLoop( 30 ); - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(host) ); - - ResMapIt it = resultMap.find( QFtp::Rename ); - QVERIFY( it != resultMap.end() ); - QTEST( it.value().success, "success" ); - - if ( it.value().success ) { - QVERIFY( !fileExists( host, 21, user, password, oldfile, cdDir ) ); - QVERIFY( fileExists( host, 21, user, password, newfile, cdDir ) ); - QVERIFY( fileExists( host, 21, user, password, renamedFile ) ); - } else { - QVERIFY( !fileExists( host, 21, user, password, newfile, cdDir ) ); - QVERIFY( !fileExists( host, 21, user, password, renamedFile ) ); - } - - renameCleanup( host, user, password, renamedFile ); -} - -/* - The commandSequence() test does not test any particular function. It rather - tests a sequence of arbitrary commands specified in the test data. -*/ -class FtpCommand -{ -public: - FtpCommand() : - cmd(QFtp::None) - { } - - FtpCommand( QFtp::Command command ) : - cmd(command) - { } - - FtpCommand( QFtp::Command command, const QStringList &arguments ) : - cmd(command), args(arguments) - { } - - FtpCommand( const FtpCommand &c ) - { *this = c; } - - FtpCommand &operator=( const FtpCommand &c ) - { - this->cmd = c.cmd; - this->args = c.args; - return *this; - } - - QFtp::Command cmd; - QStringList args; -}; -QDataStream &operator<<( QDataStream &s, const FtpCommand &command ) -{ - s << (int)command.cmd; - s << command.args; - return s; -} -QDataStream &operator>>( QDataStream &s, FtpCommand &command ) -{ - int tmp; - s >> tmp; - command.cmd = (QFtp::Command)tmp; - s >> command.args; - return s; -} -Q_DECLARE_METATYPE(QList) - -void tst_QFtp::commandSequence_data() -{ - // some "constants" - QStringList argConnectToHost01; - argConnectToHost01 << QtNetworkSettings::ftpServerName() << "21"; - - QStringList argLogin01, argLogin02, argLogin03, argLogin04; - argLogin01 << QString() << QString(); - argLogin02 << "ftp" << QString(); - argLogin03 << "ftp" << "foo"; - argLogin04 << QString("ftptest") << "password"; - - FtpCommand connectToHost01( QFtp::ConnectToHost, argConnectToHost01 ); - FtpCommand login01( QFtp::Login, argLogin01 ); - FtpCommand login02( QFtp::Login, argLogin01 ); - FtpCommand login03( QFtp::Login, argLogin01 ); - FtpCommand login04( QFtp::Login, argLogin01 ); - FtpCommand close01( QFtp::Close ); - - QTest::addColumn >("cmds"); - QTest::addColumn("success"); - - // success data - { - QList cmds; - cmds << connectToHost01; - QTest::newRow( "simple_ok01" ) << cmds << 1; - } - { - QList cmds; - cmds << connectToHost01; - cmds << login01; - QTest::newRow( "simple_ok02" ) << cmds << 1; - } - { - QList cmds; - cmds << connectToHost01; - cmds << login01; - cmds << close01; - QTest::newRow( "simple_ok03" ) << cmds << 1; - } - { - QList cmds; - cmds << connectToHost01; - cmds << close01; - QTest::newRow( "simple_ok04" ) << cmds << 1; - } - { - QList cmds; - cmds << connectToHost01; - cmds << login01; - cmds << close01; - cmds << connectToHost01; - cmds << login02; - cmds << close01; - QTest::newRow( "connect_twice" ) << cmds << 1; - } - - // error data - { - QList cmds; - cmds << close01; - QTest::newRow( "error01" ) << cmds << 0; - } - { - QList cmds; - cmds << login01; - QTest::newRow( "error02" ) << cmds << 0; - } - { - QList cmds; - cmds << login01; - cmds << close01; - QTest::newRow( "error03" ) << cmds << 0; - } - { - QList cmds; - cmds << connectToHost01; - cmds << login01; - cmds << close01; - cmds << login01; - QTest::newRow( "error04" ) << cmds << 0; - } -} - -void tst_QFtp::commandSequence() -{ - QFETCH( QList, cmds ); - - ftp = newFtp(); - QString host; - quint16 port = 0; - QList::iterator it; - for ( it = cmds.begin(); it != cmds.end(); ++it ) { - switch ( (*it).cmd ) { - case QFtp::ConnectToHost: - { - QCOMPARE( (*it).args.count(), 2 ); - bool portOk; - port = (*it).args[1].toUShort( &portOk ); - QVERIFY( portOk ); - host = (*it).args[0]; - ids << ftp->connectToHost( host, port ); - } - break; - case QFtp::Login: - QCOMPARE( (*it).args.count(), 2 ); - ids << ftp->login( (*it).args[0], (*it).args[1] ); - break; - case QFtp::Close: - QCOMPARE( (*it).args.count(), 0 ); - ids << ftp->close(); - break; - default: - QFAIL( "Error in test: unexpected enum value" ); - break; - } - } - - QTestEventLoop::instance().enterLoop( 30 ); - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(host) ); - - QTEST( commandSequence_success, "success" ); -} - -void tst_QFtp::abort_data() -{ - QTest::addColumn("host"); - QTest::addColumn("port"); - QTest::addColumn("file"); - QTest::addColumn("uploadData"); - - QTest::newRow( "get_fluke01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("qtest/bigfile") << QByteArray(); - QTest::newRow( "get_fluke02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("qtest/rfc3252") << QByteArray(); - - // Qt/CE test environment has too little memory for this test - QByteArray bigData( 10*1024*1024, 0 ); - bigData.fill( 'B' ); - QTest::newRow( "put_fluke01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("qtest/upload/abort_put") << bigData; -} - -void tst_QFtp::abort() -{ - QSKIP("This test takes too long."); - // In case you wonder where the abort() actually happens, look into - // tst_QFtp::dataTransferProgress - // - QFETCH( QString, host ); - QFETCH( uint, port ); - QFETCH( QString, file ); - QFETCH( QByteArray, uploadData ); - - QFtp::Command cmd; - if ( uploadData.size() == 0 ) - cmd = QFtp::Get; - else - cmd = QFtp::Put; - - ftp = newFtp(); - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host, port ) ); - addCommand( QFtp::Login, ftp->login() ); - if ( cmd == QFtp::Get ) - addCommand( cmd, ftp->get( file ) ); - else - addCommand( cmd, ftp->put( uploadData, file ) ); - addCommand( QFtp::Close, ftp->close() ); - - for(int time = 0; time <= uploadData.length() / 30000; time += 30) { - QTestEventLoop::instance().enterLoop( 50 ); - if(ftp->currentCommand() == QFtp::None) - break; - } - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(host, port) ); - - ResMapIt it = resultMap.find( cmd ); - QVERIFY( it != resultMap.end() ); - // ### how to test the abort? - if ( it.value().success ) { - // The FTP server on fluke is sadly returning a success, even when - // the operation was aborted. So we have to use some heuristics. - if ( host == QtNetworkSettings::ftpServerName() ) { - if ( cmd == QFtp::Get ) { - QVERIFY2(bytesDone <= bytesTotal, msgComparison(bytesDone, "<=", bytesTotal)); - } else { - // put commands should always be aborted, since we use really - // big data - QVERIFY2( bytesDone != bytesTotal, msgComparison(bytesDone, "!=", bytesTotal) ); - } - } else { - // this could be tested by verifying that no more progress signals are emitted - QVERIFY2(bytesDone <= bytesTotal, msgComparison(bytesDone, "<=", bytesTotal)); - } - } else { - QVERIFY2( bytesDone != bytesTotal, msgComparison(bytesDone, "!=", bytesTotal) ); - } - - if ( cmd == QFtp::Put ) { - ////////////////////////////////////// - // cleanup (i.e. remove the file) - init(); - ftp = newFtp(); - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host, port ) ); - addCommand( QFtp::Login, ftp->login() ); - addCommand( QFtp::Remove, ftp->remove( file ) ); - addCommand( QFtp::Close, ftp->close() ); - - QTestEventLoop::instance().enterLoop( 30 ); - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(host, port) ); - - it = resultMap.find( QFtp::Remove ); - QVERIFY( it != resultMap.end() ); - QCOMPARE( it.value().success, 1 ); - } -} - -void tst_QFtp::bytesAvailable_data() -{ - QTest::addColumn("host"); - QTest::addColumn("file"); - QTest::addColumn("type"); - QTest::addColumn("bytesAvailFinishedGet"); - QTest::addColumn("bytesAvailFinished"); - QTest::addColumn("bytesAvailDone"); - - QTest::newRow( "fluke01" ) << QtNetworkSettings::ftpServerName() << QString("qtest/bigfile") << 0 << (qlonglong)519240 << (qlonglong)519240 << (qlonglong)519240; - QTest::newRow( "fluke02" ) << QtNetworkSettings::ftpServerName() << QString("qtest/rfc3252") << 0 << (qlonglong)25962 << (qlonglong)25962 << (qlonglong)25962; - - QTest::newRow( "fluke03" ) << QtNetworkSettings::ftpServerName() << QString("qtest/bigfile") << 1 << (qlonglong)519240 << (qlonglong)0 << (qlonglong)0; - QTest::newRow( "fluke04" ) << QtNetworkSettings::ftpServerName() << QString("qtest/rfc3252") << 1 << (qlonglong)25962 << (qlonglong)0 << (qlonglong)0; -} - -void tst_QFtp::bytesAvailable() -{ - QFETCH( QString, host ); - QFETCH( QString, file ); - QFETCH( int, type ); - - ftp = newFtp(); - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host ) ); - addCommand( QFtp::Login, ftp->login() ); - addCommand( QFtp::Get, ftp->get( file ) ); - if ( type != 0 ) - addCommand( QFtp::Close, ftp->close() ); - - QTestEventLoop::instance().enterLoop( 40 ); - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(host) ); - - ResMapIt it = resultMap.find( QFtp::Get ); - QVERIFY( it != resultMap.end() ); - QVERIFY( it.value().success ); - - QFETCH(qlonglong, bytesAvailFinishedGet); - QCOMPARE(bytesAvailable_finishedGet, bytesAvailFinishedGet); - - QFETCH(qlonglong, bytesAvailFinished); - QCOMPARE(bytesAvailable_finished, bytesAvailFinished); - - QFETCH(qlonglong, bytesAvailDone); - QCOMPARE(bytesAvailable_done, bytesAvailDone); - - ftp->readAll(); - QCOMPARE( ftp->bytesAvailable(), 0 ); - delete ftp; - ftp = 0; -} - -void tst_QFtp::activeMode() -{ - QFile file("tst_QFtp_activeMode_inittab"); - file.open(QIODevice::ReadWrite); - QFtp ftp; - ftp.setTransferMode(QFtp::Active); - ftp.connectToHost(QtNetworkSettings::ftpServerName(), 21); - ftp.login(); - ftp.list(); - ftp.get("/qtest/rfc3252.txt", &file); - connect(&ftp, SIGNAL(done(bool)), SLOT(activeModeDone(bool))); - QTestEventLoop::instance().enterLoop(900); - QFile::remove("tst_QFtp_activeMode_inittab"); - QCOMPARE(done_success, 1); - -} - -void tst_QFtp::activeModeDone(bool error) -{ - done_success = error ? -1 : 1; - QTestEventLoop::instance().exitLoop(); -} - -void tst_QFtp::proxy_data() -{ - QTest::addColumn("host"); - QTest::addColumn("port"); - QTest::addColumn("user"); - QTest::addColumn("password"); - QTest::addColumn("dir"); - QTest::addColumn("success"); - QTest::addColumn("entryNames"); // ### we should rather use a QList here - - QStringList flukeRoot; - flukeRoot << "qtest"; - QStringList flukeQtest; - flukeQtest << "bigfile"; - flukeQtest << "nonASCII"; - flukeQtest << "rfc3252"; - flukeQtest << "rfc3252.txt"; - flukeQtest << "upload"; - - QTest::newRow( "proxy_relPath01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("qtest") << 1 << flukeQtest; - QTest::newRow( "proxy_relPath02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest") << QString("password") << QString("qtest") << 1 << flukeQtest; - - QTest::newRow( "proxy_absPath01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("/qtest") << 1 << flukeQtest; - QTest::newRow( "proxy_absPath02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest") << QString("password") << QString("/var/ftp/qtest") << 1 << flukeQtest; - - QTest::newRow( "proxy_nonExist01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("foo") << 0 << QStringList(); - QTest::newRow( "proxy_nonExist03" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("/foo") << 0 << QStringList(); -} - -void tst_QFtp::proxy() -{ - QFETCH( QString, host ); - QFETCH( uint, port ); - QFETCH( QString, user ); - QFETCH( QString, password ); - QFETCH( QString, dir ); - - ftp = newFtp(); - addCommand( QFtp::SetProxy, ftp->setProxy( QtNetworkSettings::ftpProxyServerName(), 2121 ) ); - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host, port ) ); - addCommand( QFtp::Login, ftp->login( user, password ) ); - addCommand( QFtp::Cd, ftp->cd( dir ) ); - addCommand( QFtp::List, ftp->list() ); - - QTestEventLoop::instance().enterLoop( 50 ); - - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) { - QFAIL( msgTimedOut(host, port) ); - } - - ResMapIt it = resultMap.find( QFtp::Cd ); - QVERIFY( it != resultMap.end() ); - QFETCH( int, success ); - QCOMPARE( it.value().success, success ); - QFETCH( QStringList, entryNames ); - QCOMPARE( listInfo_i.count(), entryNames.count() ); - for ( uint i=0; i < (uint) entryNames.count(); i++ ) { - QCOMPARE( listInfo_i[i].name(), entryNames[i] ); - } -} - -void tst_QFtp::binaryAscii() -{ - QString file = "asciifile%1.txt"; - - if(file.contains('%')) - file = file.arg(uniqueExtension); - - QByteArray putData = "a line of text\r\n"; - - init(); - ftp = newFtp(); - addCommand(QFtp::ConnectToHost, ftp->connectToHost(QtNetworkSettings::ftpServerName(), 21)); - addCommand(QFtp::Login, ftp->login("ftptest", "password")); - addCommand(QFtp::Cd, ftp->cd("qtest/upload")); - addCommand(QFtp::Put, ftp->put(putData, file, QFtp::Ascii)); - addCommand(QFtp::Close, ftp->close()); - - QTestEventLoop::instance().enterLoop( 30 ); - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(QtNetworkSettings::ftpServerName()) ); - - ResMapIt it = resultMap.find(QFtp::Put); - QVERIFY(it != resultMap.end()); - QVERIFY(it.value().success); - - QByteArray getData; - QBuffer getBuf(&getData); - getBuf.open(QBuffer::WriteOnly); - - init(); - ftp = newFtp(); - addCommand(QFtp::ConnectToHost, ftp->connectToHost(QtNetworkSettings::ftpServerName(), 21)); - addCommand(QFtp::Login, ftp->login("ftptest", "password")); - addCommand(QFtp::Cd, ftp->cd("qtest/upload")); - addCommand(QFtp::Get, ftp->get(file, &getBuf, QFtp::Binary)); - addCommand(QFtp::Close, ftp->close()); - - QTestEventLoop::instance().enterLoop( 30 ); - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(QtNetworkSettings::ftpServerName()) ); - - ResMapIt it2 = resultMap.find(QFtp::Get); - QVERIFY(it2 != resultMap.end()); - QVERIFY(it2.value().success); - // most modern ftp servers leave the file as it is by default - // (and do not remove the windows line ending), the -1 below could be - // deleted in the future - QCOMPARE(getData.size(), putData.size() - 1); - ////////////////////////////////////////////////////////////////// - // cleanup (i.e. remove the file) -- this also tests the remove command - init(); - ftp = newFtp(); - addCommand(QFtp::ConnectToHost, ftp->connectToHost(QtNetworkSettings::ftpServerName(), 21)); - addCommand(QFtp::Login, ftp->login("ftptest", "password")); - addCommand(QFtp::Cd, ftp->cd("qtest/upload")); - addCommand(QFtp::Remove, ftp->remove(file)); - addCommand(QFtp::Close, ftp->close()); - - QTestEventLoop::instance().enterLoop( 30 ); - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) - QFAIL( msgTimedOut(QtNetworkSettings::ftpServerName()) ); - - it = resultMap.find( QFtp::Remove ); - QVERIFY( it != resultMap.end() ); - QCOMPARE( it.value().success, 1 ); - - QVERIFY(!fileExists(QtNetworkSettings::ftpServerName(), 21, "ftptest", "password", file)); -} - - -// test QFtp::currentId() and QFtp::currentCommand() -#define CURRENTCOMMAND_TEST \ -{ \ - ResMapIt it; \ - for ( it = resultMap.begin(); it != resultMap.end(); ++it ) { \ - if ( it.value().id == ftp->currentId() ) { \ - QVERIFY( it.key() == ftp->currentCommand() ); \ - } \ -} \ -} - -void tst_QFtp::commandStarted( int id ) -{ -#if defined( DUMP_SIGNALS ) - qDebug( "%d:commandStarted( %d )", ftp->currentId(), id ); -#endif - // make sure that the commandStarted and commandFinished are nested correctly - QCOMPARE( current_id, 0 ); - current_id = id; - - QVERIFY( !ids.isEmpty() ); - QCOMPARE( ids.first(), id ); - if ( ids.count() > 1 ) { - QVERIFY( ftp->hasPendingCommands() ); - } else { - QVERIFY( !ftp->hasPendingCommands() ); - } - - QVERIFY( ftp->currentId() == id ); - QCOMPARE( cur_state, int(ftp->state()) ); - CURRENTCOMMAND_TEST; - - QCOMPARE( ftp->error(), QFtp::NoError ); -} - -void tst_QFtp::commandFinished( int id, bool error ) -{ -#if defined( DUMP_SIGNALS ) - qDebug( "%d:commandFinished( %d, %d ) -- errorString: '%s'", - ftp->currentId(), id, (int)error, ftp->errorString().toLatin1().constData() ); -#endif - if ( ftp->currentCommand() == QFtp::Get ) { - bytesAvailable_finishedGet = ftp->bytesAvailable(); - } - bytesAvailable_finished = ftp->bytesAvailable(); - - // make sure that the commandStarted and commandFinished are nested correctly - QCOMPARE( current_id, id ); - current_id = 0; - - QVERIFY( !ids.isEmpty() ); - QCOMPARE( ids.first(), id ); - if ( !error && ids.count() > 1) { - QVERIFY( ftp->hasPendingCommands() ); - } else { - QVERIFY( !ftp->hasPendingCommands() ); - } - if ( error ) { - QVERIFY2( ftp->error() != QFtp::NoError, msgComparison(ftp->error(), "!=", QFtp::NoError) ); - ids.clear(); - } else { - QCOMPARE( ftp->error(), QFtp::NoError ); - ids.pop_front(); - } - - QCOMPARE( ftp->currentId(), id ); - QCOMPARE( cur_state, int(ftp->state()) ); - CURRENTCOMMAND_TEST; - - if ( QTest::currentTestFunction() != QLatin1String("commandSequence") ) { - ResMapIt it = resultMap.find( ftp->currentCommand() ); - QVERIFY( it != resultMap.end() ); - QCOMPARE( it.value().success, -1 ); - if ( error ) - it.value().success = 0; - else - it.value().success = 1; - } -} - -void tst_QFtp::done( bool error ) -{ -#if defined( DUMP_SIGNALS ) - qDebug( "%d:done( %d )", ftp->currentId(), (int)error ); -#endif - bytesAvailable_done = ftp->bytesAvailable(); - - QCOMPARE( ftp->currentId(), 0 ); - QVERIFY( current_id == 0 ); - QVERIFY( ids.isEmpty() ); - QVERIFY( cur_state == ftp->state() ); - QVERIFY( !ftp->hasPendingCommands() ); - - if ( QTest::currentTestFunction() == QLatin1String("commandSequence") ) { - QCOMPARE( commandSequence_success, -1 ); - if ( error ) - commandSequence_success = 0; - else - commandSequence_success = 1; - } - QCOMPARE( done_success, -1 ); - if ( error ) { - QVERIFY2( ftp->error() != QFtp::NoError, msgComparison(ftp->error(), "!=", QFtp::NoError) ); - done_success = 0; - } else { - QCOMPARE( ftp->error(), QFtp::NoError ); - done_success = 1; - } - QTestEventLoop::instance().exitLoop(); -} - -void tst_QFtp::stateChanged( int state ) -{ -#if defined( DUMP_SIGNALS ) - qDebug( "%d: stateChanged( %d )", ftp->currentId(), state ); -#endif - QCOMPARE( ftp->currentId(), current_id ); - CURRENTCOMMAND_TEST; - - QVERIFY2( state != cur_state, msgComparison(state, "!=", cur_state) ); - QCOMPARE( state, (int)ftp->state() ); - if ( state != QFtp::Unconnected ) { - // make sure that the states are always emitted in the right order (for - // this, we assume an ordering on the enum values, which they have at - // the moment) - QVERIFY2( cur_state < state, msgComparison(cur_state, "<", state) ); - - // make sure that state changes are only emitted in response to certain - // commands - switch ( state ) { - case QFtp::HostLookup: - case QFtp::Connecting: - case QFtp::Connected: - QCOMPARE( (int)ftp->currentCommand(), (int)QFtp::ConnectToHost ); - break; - case QFtp::LoggedIn: - QCOMPARE( (int)ftp->currentCommand(), (int)QFtp::Login ); - break; - case QFtp::Closing: - QCOMPARE( (int)ftp->currentCommand(), (int)QFtp::Close ); - break; - default: - QWARN( QString("Unexpected state '%1'").arg(state).toLatin1().constData() ); - break; - } - } - cur_state = state; - - if ( QTest::currentTestFunction() == QLatin1String("connectToHost") ) { - switch ( state ) { - case QFtp::HostLookup: - case QFtp::Connecting: - case QFtp::LoggedIn: - case QFtp::Closing: - // ignore - break; - case QFtp::Connected: - case QFtp::Unconnected: - QVERIFY( connectToHost_state == -1 ); - connectToHost_state = state; - break; - default: - QWARN( QString("Unknown state '%1'").arg(state).toLatin1().constData() ); - break; - } - } else if ( QTest::currentTestFunction() == QLatin1String("close") ) { - ResMapIt it = resultMap.find( QFtp::Close ); - if ( it!=resultMap.end() && ftp->currentId()==it.value().id ) { - if ( state == QFtp::Closing ) { - QCOMPARE( close_state, -1 ); - close_state = state; - } else if ( state == QFtp::Unconnected ) { - QCOMPARE(close_state, int(QFtp::Closing) ); - close_state = state; - } - } - } else if ( QTest::currentTestFunction() == QLatin1String("login") ) { - ResMapIt it = resultMap.find( QFtp::Login ); - if ( it!=resultMap.end() && ftp->currentId()==it.value().id ) { - if ( state == QFtp::LoggedIn ) { - QCOMPARE( login_state, -1 ); - login_state = state; - } - } - } -} - -void tst_QFtp::listInfo( const QUrlInfo &i ) -{ -#if defined( DUMP_SIGNALS ) - qDebug( "%d: listInfo( %s )", ftp->currentId(), i.name().toLatin1().constData() ); -#endif - QCOMPARE( ftp->currentId(), current_id ); - if ( ids.count() > 1 ) { - QVERIFY( ftp->hasPendingCommands() ); - } else { - QVERIFY( !ftp->hasPendingCommands() ); - } - QCOMPARE( cur_state, int(ftp->state()) ); - CURRENTCOMMAND_TEST; - - if ( QTest::currentTestFunction()==QLatin1String("list") || QTest::currentTestFunction()==QLatin1String("cd") || QTest::currentTestFunction()==QLatin1String("proxy") || inFileDirExistsFunction ) { - ResMapIt it = resultMap.find( QFtp::List ); - QVERIFY( it != resultMap.end() ); - QCOMPARE( ftp->currentId(), it.value().id ); - listInfo_i << i; - } -} - -void tst_QFtp::readyRead() -{ -#if defined( DUMP_SIGNALS ) - qDebug( "%d: readyRead(), bytesAvailable == %lu", ftp->currentId(), ftp->bytesAvailable() ); -#endif - QCOMPARE( ftp->currentId(), current_id ); - if ( ids.count() > 1 ) { - QVERIFY( ftp->hasPendingCommands() ); - } else { - QVERIFY( !ftp->hasPendingCommands() ); - } - QVERIFY( cur_state == ftp->state() ); - CURRENTCOMMAND_TEST; - - if ( QTest::currentTestFunction() != QLatin1String("bytesAvailable") ) { - int oldSize = newData_ba.size(); - qlonglong bytesAvail = ftp->bytesAvailable(); - QByteArray ba = ftp->readAll(); - QCOMPARE( ba.size(), (int) bytesAvail ); - newData_ba.resize( oldSize + ba.size() ); - memcpy( newData_ba.data()+oldSize, ba.data(), ba.size() ); - - if ( bytesTotal != -1 ) { - QVERIFY2( (int)newData_ba.size() <= bytesTotal, msgComparison(newData_ba.size(), "<=", bytesTotal) ); - } - QCOMPARE( qlonglong(newData_ba.size()), bytesDone ); - } -} - -void tst_QFtp::dataTransferProgress( qint64 done, qint64 total ) -{ -#if defined( DUMP_SIGNALS ) - qDebug( "%d: dataTransferProgress( %lli, %lli )", ftp->currentId(), done, total ); -#endif - QCOMPARE( ftp->currentId(), current_id ); - if ( ids.count() > 1 ) { - QVERIFY( ftp->hasPendingCommands() ); - } else { - QVERIFY( !ftp->hasPendingCommands() ); - } - QCOMPARE( cur_state, int(ftp->state()) ); - CURRENTCOMMAND_TEST; - - if ( bytesTotal == bytesTotal_init ) { - bytesTotal = total; - } else { - QCOMPARE( bytesTotal, total ); - } - - QVERIFY2( bytesTotal != bytesTotal_init, msgComparison(bytesTotal, "!=", bytesTotal_init) ); - QVERIFY2( bytesDone <= done, msgComparison(bytesDone, "<=", done) ); - bytesDone = done; - if ( bytesTotal != -1 ) { - QVERIFY2( bytesDone <= bytesTotal, msgComparison(bytesDone, "<=", bytesTotal) ); - } - - if ( QTest::currentTestFunction() == QLatin1String("abort") ) { - // ### it would be nice if we could specify in our testdata when to do - // the abort - if ( done >= total/100000 ) { - if ( ids.count() != 1 ) { - // do abort only once - int tmpId = ids.first(); - ids.clear(); - ids << tmpId; - ftp->abort(); - } - } - } -} - - -QFtp *tst_QFtp::newFtp() -{ - QFtp *nFtp = new QFtp( this ); - connect( nFtp, SIGNAL(commandStarted(int)), - SLOT(commandStarted(int)) ); - connect( nFtp, SIGNAL(commandFinished(int,bool)), - SLOT(commandFinished(int,bool)) ); - connect( nFtp, SIGNAL(done(bool)), - SLOT(done(bool)) ); - connect( nFtp, SIGNAL(stateChanged(int)), - SLOT(stateChanged(int)) ); - connect( nFtp, SIGNAL(listInfo(QUrlInfo)), - SLOT(listInfo(QUrlInfo)) ); - connect( nFtp, SIGNAL(readyRead()), - SLOT(readyRead()) ); - connect( nFtp, SIGNAL(dataTransferProgress(qint64,qint64)), - SLOT(dataTransferProgress(qint64,qint64)) ); - - return nFtp; -} - -void tst_QFtp::addCommand( QFtp::Command cmd, int id ) -{ - ids << id; - CommandResult res; - res.id = id; - res.success = -1; - resultMap[ cmd ] = res; -} - -bool tst_QFtp::fileExists( const QString &host, quint16 port, const QString &user, const QString &password, const QString &file, const QString &cdDir ) -{ - init(); - ftp = newFtp(); - // ### make these tests work - if (ftp->currentId() != 0) { - qWarning("ftp->currentId() != 0"); - return false; - } - - if (ftp->state() != QFtp::Unconnected) { - qWarning("ftp->state() != QFtp::Unconnected"); - return false; - } - - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host, port ) ); - addCommand( QFtp::Login, ftp->login( user, password ) ); - if ( !cdDir.isNull() ) - addCommand( QFtp::Cd, ftp->cd( cdDir ) ); - addCommand( QFtp::List, ftp->list( file ) ); - addCommand( QFtp::Close, ftp->close() ); - - inFileDirExistsFunction = true; - QTestEventLoop::instance().enterLoop( 30 ); - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) { - // ### make this test work - qWarning("tst_QFtp::fileExists: Network operation timed out"); - return false; - } - inFileDirExistsFunction = false; - - ResMapIt it = resultMap.find( QFtp::ConnectToHost ); - // ### make these tests work - if (it == resultMap.end()) { - qWarning("it != resultMap.end()"); - return false; - } - - if (it.value().success == -1) { - qWarning("it.value().success != -1"); - return false; - } - - if ( it.value().success == 1 ) { - for ( uint i=0; i < (uint) listInfo_i.count(); i++ ) { - if ( QFileInfo(listInfo_i[i].name()).fileName() == QFileInfo(file).fileName() ) - return true; - } - } - - //this is not a good warning considering sometime this function is used to test that a file does not exist - //qWarning("file doesn't exist"); - return false; -} - -bool tst_QFtp::dirExists( const QString &host, quint16 port, const QString &user, const QString &password, const QString &cdDir, const QString &dirToCreate ) -{ - init(); - ftp = newFtp(); - // ### make these tests work - // QCOMPARE( ftp->currentId(), 0 ); - // QCOMPARE( (int)ftp->state(), (int)QFtp::Unconnected ); - - addCommand( QFtp::ConnectToHost, ftp->connectToHost( host, port ) ); - addCommand( QFtp::Login, ftp->login( user, password ) ); - if ( dirToCreate.startsWith( QLatin1Char('/') ) ) - addCommand( QFtp::Cd, ftp->cd( dirToCreate ) ); - else - addCommand( QFtp::Cd, ftp->cd( cdDir + QLatin1Char('/') + dirToCreate ) ); - addCommand( QFtp::Close, ftp->close() ); - - inFileDirExistsFunction = true; - QTestEventLoop::instance().enterLoop( 30 ); - delete ftp; - ftp = 0; - if ( QTestEventLoop::instance().timeout() ) { - // ### make this test work - // QFAIL( msgTimedOut(host, port) ); - qWarning("tst_QFtp::dirExists: Network operation timed out"); - return false; - } - inFileDirExistsFunction = false; - - ResMapIt it = resultMap.find( QFtp::Cd ); - // ### make these tests work - // QVERIFY( it != resultMap.end() ); - // QVERIFY( it.value().success != -1 ); - return it.value().success == 1; -} - -void tst_QFtp::doneSignal() -{ - QFtp ftp; - QSignalSpy spy(&ftp, SIGNAL(done(bool))); - - ftp.connectToHost(QtNetworkSettings::ftpServerName()); - ftp.login("anonymous"); - ftp.list(); - ftp.close(); - - done_success = 0; - connect(&ftp, SIGNAL(done(bool)), &(QTestEventLoop::instance()), SLOT(exitLoop())); - QTestEventLoop::instance().enterLoop(61); - if (QTestEventLoop::instance().timeout()) - QFAIL("Network operation timed out"); - - QCOMPARE(spy.count(), 1); - QCOMPARE(spy.first().first().toBool(), false); -} - -void tst_QFtp::queueMoreCommandsInDoneSlot() -{ - QSKIP("Task 127050 && 113966"); - - QFtp ftp; - QSignalSpy doneSpy(&ftp, SIGNAL(done(bool))); - QSignalSpy commandFinishedSpy(&ftp, SIGNAL(commandFinished(int,bool))); - - this->ftp = &ftp; - connect(&ftp, SIGNAL(done(bool)), this, SLOT(cdUpSlot(bool))); - - ftp.connectToHost("ftp.qt-project.org"); - ftp.login(); - ftp.cd("qt"); - ftp.rmdir("qtest-removedir-noexist"); - - while ( ftp.hasPendingCommands() || ftp.currentCommand() != QFtp::None ) { - QCoreApplication::instance()->processEvents(QEventLoop::AllEvents - | QEventLoop::WaitForMoreEvents); - } - - QCOMPARE(doneSpy.count(), 2); - QCOMPARE(doneSpy.first().first().toBool(), true); - QCOMPARE(doneSpy.last().first().toBool(), false); - - QCOMPARE(commandFinishedSpy.count(), 6); - int firstId = commandFinishedSpy.at(0).at(0).toInt(); - QCOMPARE(commandFinishedSpy.at(0).at(1).toBool(), false); - QCOMPARE(commandFinishedSpy.at(1).at(0).toInt(), firstId + 1); - QCOMPARE(commandFinishedSpy.at(1).at(1).toBool(), false); - QCOMPARE(commandFinishedSpy.at(2).at(0).toInt(), firstId + 2); - QCOMPARE(commandFinishedSpy.at(2).at(1).toBool(), false); - QCOMPARE(commandFinishedSpy.at(3).at(0).toInt(), firstId + 3); - QCOMPARE(commandFinishedSpy.at(3).at(1).toBool(), true); - QCOMPARE(commandFinishedSpy.at(4).at(0).toInt(), firstId + 4); - QCOMPARE(commandFinishedSpy.at(4).at(1).toBool(), false); - QCOMPARE(commandFinishedSpy.at(5).at(0).toInt(), firstId + 5); - QCOMPARE(commandFinishedSpy.at(5).at(1).toBool(), false); - - this->ftp = 0; -} - -void tst_QFtp::cdUpSlot(bool error) -{ - if (error) { - ftp->cd(".."); - ftp->cd("qt"); - } -} - -void tst_QFtp::qtbug7359Crash() -{ - QFtp ftp; - ftp.connectToHost("127.0.0.1"); - - QElapsedTimer t; - int elapsed; - - t.start(); - while ((elapsed = t.elapsed()) < 200) - QCoreApplication::processEvents(QEventLoop::AllEvents, 200 - elapsed); - - ftp.close(); - t.restart(); - while ((elapsed = t.elapsed()) < 1000) - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000 - elapsed); - - ftp.connectToHost("127.0.0.1"); - - t.restart(); - while ((elapsed = t.elapsed()) < 2000) - QCoreApplication::processEvents(QEventLoop::AllEvents, 2000 - elapsed); -} - -class FtpLocalServer : public QTcpServer -{ - Q_OBJECT - -public: - explicit FtpLocalServer(QObject *parent = 0) : QTcpServer(parent) {} - virtual ~FtpLocalServer() { delete mSocket; } - void startServer(qint16 port = 0); - void stopServer(); - - enum class ReplyCodes { - ServiceReady = 220, - ServiceClose = 221, - NeedPassword = 331, - LoginFailed = 530, - RequestDeny = 550 - }; - - void sendResponse(ReplyCodes code); - - inline QString getRawUser() { return rawUser; } - inline QString getRawPassword() { return rawPass; } - -signals: - void onStarted(); - void onStopped(); - -public slots: - void socketReadyRead(); - void socketDisconnected(); - -protected: - virtual void incomingConnection(qintptr handle); - -private: - QTcpSocket *mSocket = nullptr; - QString rawUser; - QString rawPass; -}; - -void FtpLocalServer::startServer(qint16 port) -{ - if (listen(QHostAddress::Any, port)) - emit onStarted(); // Notify connected objects - else - qDebug("Could not start FTP server"); -} - -void FtpLocalServer::stopServer() -{ - close(); - emit onStopped(); // Notify connected objects -} - -void FtpLocalServer::sendResponse(ReplyCodes code) -{ - if (mSocket) - { - QString response; - switch (code) { - case ReplyCodes::ServiceReady: - response = QString("220 Service ready for new user.\r\n"); - break; - case ReplyCodes::ServiceClose: - response = QString("221 Service closing control connection.\r\n"); - break; - case ReplyCodes::NeedPassword: - response = QString("331 User name okay, need password.\r\n"); - break; - case ReplyCodes::LoginFailed: - response = QString("530 Not logged in.\r\n"); - break; - case ReplyCodes::RequestDeny: - response = QString("550 Requested action not taken.\r\n"); - break; - default: - qDebug("Unimplemented response code: %u", static_cast(code)); - break; - } - - if (!response.isEmpty()) - mSocket->write(response.toLatin1()); - } -} - -void FtpLocalServer::incomingConnection(qintptr handle) -{ - mSocket = new QTcpSocket(this); - if (mSocket == nullptr || !mSocket->setSocketDescriptor(handle)) - { - delete mSocket; - mSocket = nullptr; - qDebug() << handle << " Error binding socket"; - return; - } - - connect(mSocket, SIGNAL(readyRead()), this, SLOT(socketReadyRead())); - connect(mSocket, SIGNAL(disconnected()), this, SLOT(socketDisconnected())); - - // Accept client connection - sendResponse(ReplyCodes::ServiceReady); -} - -void FtpLocalServer::socketReadyRead() -{ - QString data; - if (mSocket) - data.append(mSocket->readAll()); - - // RFC959 Upper and lower case alphabetic characters are to be treated identically. - if (data.startsWith("USER", Qt::CaseInsensitive)) { - rawUser = data; - sendResponse(ReplyCodes::NeedPassword); - } else if (data.startsWith("PASS", Qt::CaseInsensitive)) { - rawPass = data; - sendResponse(ReplyCodes::LoginFailed); - } else { - sendResponse(ReplyCodes::RequestDeny); - } -} - -void FtpLocalServer::socketDisconnected() -{ - // Cleanup - if (mSocket) - mSocket->deleteLater(); - deleteLater(); -} - -void tst_QFtp::loginURL_data() -{ - QTest::addColumn("user"); - QTest::addColumn("password"); - QTest::addColumn("rawUser"); - QTest::addColumn("rawPass"); - - QTest::newRow("no username, no password") - << QString() << QString() - << QString("USER anonymous\r\n") << QString("PASS anonymous@\r\n"); - - QTest::newRow("username, no password") - << QString("someone") << QString() - << QString("USER someone\r\n") << QString(); - - QTest::newRow("username, empty password") - << QString("someone") << QString("") - << QString("USER someone\r\n") << QString("PASS \r\n"); - - QTest::newRow("username, password") - << QString("someone") << QString("nonsense") - << QString("USER someone\r\n") << QString("PASS nonsense\r\n"); - - QTest::newRow("anonymous, no password") - << QString("anonymous") << QString() - << QString("USER anonymous\r\n") << QString("PASS anonymous@\r\n"); - - QTest::newRow("Anonymous, no password") - << QString("Anonymous") << QString() - << QString("USER Anonymous\r\n") << QString("PASS anonymous@\r\n"); - - QTest::newRow("anonymous, empty password") - << QString("anonymous") << QString("") - << QString("USER anonymous\r\n") << QString("PASS \r\n"); - - QTest::newRow("ANONYMOUS, password") - << QString("ANONYMOUS") << QString("nonsense") - << QString("USER ANONYMOUS\r\n") << QString("PASS nonsense\r\n"); -} - -void tst_QFtp::loginURL() -{ - QFETCH_GLOBAL(bool, setProxy); - if (setProxy) - QSKIP("This test should be verified on the local machine without proxies"); - - QFETCH(QString, user); - QFETCH(QString, password); - QFETCH(QString, rawUser); - QFETCH(QString, rawPass); - - FtpLocalServer server; - server.startServer(); - uint port = server.serverPort(); - - ftp = newFtp(); - addCommand(QFtp::ConnectToHost, - ftp->connectToHost("127.0.0.1", port)); - addCommand(QFtp::Login, ftp->login(user, password)); - - QTestEventLoop::instance().enterLoop(5); - delete ftp; - ftp = nullptr; - server.stopServer(); - if (QTestEventLoop::instance().timeout()) - QFAIL(msgTimedOut("127.0.0.1", port)); - - QCOMPARE(server.getRawUser(), rawUser); - QCOMPARE(server.getRawPassword(), rawPass); -} - -QTEST_MAIN(tst_QFtp) - -#include "tst_qftp.moc" diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index c8be0902ba..e470dd02b4 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -208,11 +208,9 @@ private Q_SLOTS: void getFromFile(); void getFromFileSpecial_data(); void getFromFileSpecial(); -#if QT_CONFIG(ftp) void getFromFtp_data(); void getFromFtp(); void getFromFtpAfterError(); // QTBUG-40797 -#endif void getFromHttp_data(); void getFromHttp(); void getErrors_data(); @@ -223,11 +221,9 @@ private Q_SLOTS: #endif // !QT_NO_NETWORKPROXY void putToFile_data(); void putToFile(); -#if QT_CONFIG(ftp) void putToFtp_data(); void putToFtp(); void putToFtpWithInvalidCredentials(); // QTBUG-40622 -#endif void putToHttp_data(); void putToHttp(); void putToHttpSynchronous_data(); @@ -268,11 +264,9 @@ private Q_SLOTS: void ioGetFromFileSpecial(); void ioGetFromFile_data(); void ioGetFromFile(); -#if QT_CONFIG(ftp) void ioGetFromFtp_data(); void ioGetFromFtp(); void ioGetFromFtpWithReuse(); -#endif void ioGetFromHttp(); void ioGetFromBuiltinHttp_data(); @@ -314,10 +308,8 @@ private Q_SLOTS: void ioPutToFileFromLocalSocket(); void ioPutToFileFromProcess_data(); void ioPutToFileFromProcess(); -#if QT_CONFIG(ftp) void ioPutToFtpFromFile_data(); void ioPutToFtpFromFile(); -#endif void ioPutToHttpFromFile_data(); void ioPutToHttpFromFile(); void ioPostToHttpFromFile_data(); @@ -464,10 +456,8 @@ private Q_SLOTS: void closeDuringDownload_data(); void closeDuringDownload(); -#if QT_CONFIG(ftp) void ftpAuthentication_data(); void ftpAuthentication(); -#endif void emitErrorForAllReplies(); // QTBUG-36890 @@ -517,6 +507,8 @@ private: QString testDataDir; bool notEnoughDataForFastSender; + + bool ftpSupported = false; }; const QByteArray tst_QNetworkReply::httpEmpty200Response = @@ -1320,6 +1312,8 @@ tst_QNetworkReply::tst_QNetworkReply() #ifndef QT_NO_NETWORKPROXY } #endif // !QT_NO_NETWORKPROXY + + ftpSupported = manager.supportedSchemes().contains("ftp"); } tst_QNetworkReply::~tst_QNetworkReply() @@ -1836,9 +1830,10 @@ void tst_QNetworkReply::getFromFileSpecial() QCOMPARE(reply->readAll(), resource.readAll()); } -#if QT_CONFIG(ftp) void tst_QNetworkReply::getFromFtp_data() { + if (!ftpSupported) + QSKIP("FTP is not supported"); QTest::addColumn("referenceName"); QTest::addColumn("url"); @@ -1872,6 +1867,9 @@ void tst_QNetworkReply::getFromFtp() void tst_QNetworkReply::getFromFtpAfterError() { + if (!ftpSupported) + QSKIP("FTP is not supported"); + QNetworkRequest invalidRequest(QUrl("ftp://" + QtNetworkSettings::ftpServerName() + "/qtest/invalid.txt")); QNetworkReplyPtr invalidReply; invalidReply.reset(manager.get(invalidRequest)); @@ -1889,7 +1887,6 @@ void tst_QNetworkReply::getFromFtpAfterError() QCOMPARE(validReply->header(QNetworkRequest::ContentLengthHeader).toLongLong(), reference.size()); QCOMPARE(validReply->readAll(), reference.readAll()); } -#endif void tst_QNetworkReply::getFromHttp_data() { @@ -2059,21 +2056,26 @@ void tst_QNetworkReply::getErrors_data() QTest::newRow("file-permissions") << "file:" + filePermissionFileName << int(QNetworkReply::ContentAccessDenied) << 0 << true; -#if QT_CONFIG(ftp) - // ftp: errors - QTest::newRow("ftp-host") << "ftp://invalid.test.qt-project.org/foo.txt" - << int(QNetworkReply::HostNotFoundError) << 0 << true; - QTest::newRow("ftp-no-path") << "ftp://" + QtNetworkSettings::ftpServerName() - << int(QNetworkReply::ContentOperationNotPermittedError) << 0 << true; - QTest::newRow("ftp-is-dir") << "ftp://" + QtNetworkSettings::ftpServerName() + "/qtest" - << int(QNetworkReply::ContentOperationNotPermittedError) << 0 << true; - QTest::newRow("ftp-dir-not-readable") << "ftp://" + QtNetworkSettings::ftpServerName() + "/pub/dir-not-readable/foo.txt" - << int(QNetworkReply::ContentAccessDenied) << 0 << true; - QTest::newRow("ftp-file-not-readable") << "ftp://" + QtNetworkSettings::ftpServerName() + "/pub/file-not-readable.txt" - << int(QNetworkReply::ContentAccessDenied) << 0 << true; - QTest::newRow("ftp-exist") << "ftp://" + QtNetworkSettings::ftpServerName() + "/pub/this-file-doesnt-exist.txt" - << int(QNetworkReply::ContentNotFoundError) << 0 << true; -#endif + if (ftpSupported) { + // ftp: errors + QTest::newRow("ftp-host") << "ftp://invalid.test.qt-project.org/foo.txt" + << int(QNetworkReply::HostNotFoundError) << 0 << true; + QTest::newRow("ftp-no-path") + << "ftp://" + QtNetworkSettings::ftpServerName() + << int(QNetworkReply::ContentOperationNotPermittedError) << 0 << true; + QTest::newRow("ftp-is-dir") + << "ftp://" + QtNetworkSettings::ftpServerName() + "/qtest" + << int(QNetworkReply::ContentOperationNotPermittedError) << 0 << true; + QTest::newRow("ftp-dir-not-readable") + << "ftp://" + QtNetworkSettings::ftpServerName() + "/pub/dir-not-readable/foo.txt" + << int(QNetworkReply::ContentAccessDenied) << 0 << true; + QTest::newRow("ftp-file-not-readable") + << "ftp://" + QtNetworkSettings::ftpServerName() + "/pub/file-not-readable.txt" + << int(QNetworkReply::ContentAccessDenied) << 0 << true; + QTest::newRow("ftp-exist") + << "ftp://" + QtNetworkSettings::ftpServerName() + "/pub/this-file-doesnt-exist.txt" + << int(QNetworkReply::ContentNotFoundError) << 0 << true; + } // http: errors QTest::newRow("http-host") << "http://invalid.test.qt-project.org/" @@ -2127,11 +2129,9 @@ void tst_QNetworkReply::getErrors() QVERIFY2(waitResult != Timeout, msgGetErrors(waitResult, reply)); QFETCH(int, error); -#if QT_CONFIG(ftp) QEXPECT_FAIL("ftp-is-dir", "QFtp cannot provide enough detail", Abort); // the line below is not necessary QEXPECT_FAIL("ftp-dir-not-readable", "QFtp cannot provide enough detail", Abort); -#endif QCOMPARE(reply->error(), QNetworkReply::NetworkError(error)); QTEST(reply->readAll().isEmpty(), "dataIsEmpty"); @@ -2201,9 +2201,10 @@ void tst_QNetworkReply::putToFile() QCOMPARE(contents, data); } -#if QT_CONFIG(ftp) void tst_QNetworkReply::putToFtp_data() { + if (!ftpSupported) + QSKIP("FTP is not supported"); putToFile_data(); } @@ -2255,6 +2256,8 @@ void tst_QNetworkReply::putToFtp() void tst_QNetworkReply::putToFtpWithInvalidCredentials() { + if (!ftpSupported) + QSKIP("FTP is not supported"); QUrl url("ftp://" + QtNetworkSettings::ftpServerName()); url.setPath(QString("/qtest/upload/qnetworkaccess-putToFtp-%1-%2") .arg(QTest::currentDataTag()) @@ -2274,7 +2277,6 @@ void tst_QNetworkReply::putToFtpWithInvalidCredentials() r->close(); } } -#endif void tst_QNetworkReply::putToHttp_data() { @@ -3275,9 +3277,10 @@ void tst_QNetworkReply::ioGetFromFile() QCOMPARE(reader.data, data); } -#if QT_CONFIG(ftp) void tst_QNetworkReply::ioGetFromFtp_data() { + if (!ftpSupported) + QSKIP("FTP is not supported"); QTest::addColumn("fileName"); QTest::addColumn("expectedSize"); @@ -3312,6 +3315,8 @@ void tst_QNetworkReply::ioGetFromFtp() void tst_QNetworkReply::ioGetFromFtpWithReuse() { + if (!ftpSupported) + QSKIP("FTP is not supported"); QString fileName = testDataDir + "/rfc3252.txt"; QFile reference(fileName); reference.open(QIODevice::ReadOnly); @@ -3342,7 +3347,6 @@ void tst_QNetworkReply::ioGetFromFtpWithReuse() QCOMPARE(reader1.data, referenceData); QCOMPARE(reader2.data, referenceData); } -#endif void tst_QNetworkReply::ioGetFromHttp() { @@ -4199,26 +4203,28 @@ void tst_QNetworkReply::ioGetWithManyProxies_data() << "http://" + QtNetworkSettings::httpServerName() + "/qtest/rfc3252.txt" << QNetworkReply::NoError; -#if QT_CONFIG(ftp) - // FTP request with FTP caching proxy - proxyList.clear(); - proxyList << QNetworkProxy(QNetworkProxy::FtpCachingProxy, QtNetworkSettings::ftpProxyServerName(), 2121); - QTest::newRow("ftp-on-ftp") - << proxyList << proxyList.at(0) - << "ftp://" + QtNetworkSettings::ftpServerName() + "/qtest/rfc3252.txt" - << QNetworkReply::NoError; - - // The following test doesn't work because QFtp is too limited - // It can only talk to its own kind of proxies - - // FTP request with SOCKSv5 transparent proxy - proxyList.clear(); - proxyList << QNetworkProxy(QNetworkProxy::Socks5Proxy, QtNetworkSettings::socksProxyServerName(), 1081); - QTest::newRow("ftp-on-socks") - << proxyList << proxyList.at(0) - << "ftp://" + QtNetworkSettings::ftpServerName() + "/qtest/rfc3252.txt" - << QNetworkReply::NoError; -#endif + if (ftpSupported) { + // FTP request with FTP caching proxy + proxyList.clear(); + proxyList << QNetworkProxy(QNetworkProxy::FtpCachingProxy, + QtNetworkSettings::ftpProxyServerName(), 2121); + QTest::newRow("ftp-on-ftp") + << proxyList << proxyList.at(0) + << "ftp://" + QtNetworkSettings::ftpServerName() + "/qtest/rfc3252.txt" + << QNetworkReply::NoError; + + // The following test doesn't work because QFtp is too limited + // It can only talk to its own kind of proxies + + // FTP request with SOCKSv5 transparent proxy + proxyList.clear(); + proxyList << QNetworkProxy(QNetworkProxy::Socks5Proxy, + QtNetworkSettings::socksProxyServerName(), 1081); + QTest::newRow("ftp-on-socks") + << proxyList << proxyList.at(0) + << "ftp://" + QtNetworkSettings::ftpServerName() + "/qtest/rfc3252.txt" + << QNetworkReply::NoError; + } #ifndef QT_NO_SSL // HTTPS with HTTP transparent proxy @@ -4248,24 +4254,27 @@ void tst_QNetworkReply::ioGetWithManyProxies_data() << "http://" + QtNetworkSettings::httpServerName() + "/qtest/rfc3252.txt" << QNetworkReply::ProxyNotFoundError; -#if QT_CONFIG(ftp) - // FTP request with HTTP caching proxy - proxyList.clear(); - proxyList << QNetworkProxy(QNetworkProxy::HttpCachingProxy, QtNetworkSettings::httpProxyServerName(), 3129); - QTest::newRow("ftp-on-http") - << proxyList << QNetworkProxy() - << "ftp://" + QtNetworkSettings::ftpServerName() + "/qtest/rfc3252.txt" - << QNetworkReply::ProxyNotFoundError; - - // FTP request with HTTP caching proxies - proxyList.clear(); - proxyList << QNetworkProxy(QNetworkProxy::HttpCachingProxy, QtNetworkSettings::httpProxyServerName(), 3129) - << QNetworkProxy(QNetworkProxy::HttpCachingProxy, QtNetworkSettings::httpProxyServerName(), 3130); - QTest::newRow("ftp-on-multiple-http") - << proxyList << QNetworkProxy() - << "ftp://" + QtNetworkSettings::ftpServerName() + "/qtest/rfc3252.txt" - << QNetworkReply::ProxyNotFoundError; -#endif + if (ftpSupported) { + // FTP request with HTTP caching proxy + proxyList.clear(); + proxyList << QNetworkProxy(QNetworkProxy::HttpCachingProxy, + QtNetworkSettings::httpProxyServerName(), 3129); + QTest::newRow("ftp-on-http") + << proxyList << QNetworkProxy() + << "ftp://" + QtNetworkSettings::ftpServerName() + "/qtest/rfc3252.txt" + << QNetworkReply::ProxyNotFoundError; + + // FTP request with HTTP caching proxies + proxyList.clear(); + proxyList << QNetworkProxy(QNetworkProxy::HttpCachingProxy, + QtNetworkSettings::httpProxyServerName(), 3129) + << QNetworkProxy(QNetworkProxy::HttpCachingProxy, + QtNetworkSettings::httpProxyServerName(), 3130); + QTest::newRow("ftp-on-multiple-http") + << proxyList << QNetworkProxy() + << "ftp://" + QtNetworkSettings::ftpServerName() + "/qtest/rfc3252.txt" + << QNetworkReply::ProxyNotFoundError; + } #ifndef QT_NO_SSL // HTTPS with HTTP caching proxy @@ -4333,16 +4342,18 @@ void tst_QNetworkReply::ioGetWithManyProxies_data() << "http://" + QtNetworkSettings::httpServerName() + "/qtest/rfc3252.txt" << QNetworkReply::NoError; -#if QT_CONFIG(ftp) - // FTP request with HTTP Caching + FTP - proxyList.clear(); - proxyList << QNetworkProxy(QNetworkProxy::HttpCachingProxy, QtNetworkSettings::httpProxyServerName(), 3129) - << QNetworkProxy(QNetworkProxy::FtpCachingProxy, QtNetworkSettings::ftpProxyServerName(), 2121); - QTest::newRow("ftp-on-http+ftp") - << proxyList << proxyList.at(1) // second proxy should be used - << "ftp://" + QtNetworkSettings::ftpServerName() + "/qtest/rfc3252.txt" - << QNetworkReply::NoError; -#endif + if (ftpSupported) { + // FTP request with HTTP Caching + FTP + proxyList.clear(); + proxyList << QNetworkProxy(QNetworkProxy::HttpCachingProxy, + QtNetworkSettings::httpProxyServerName(), 3129) + << QNetworkProxy(QNetworkProxy::FtpCachingProxy, + QtNetworkSettings::ftpProxyServerName(), 2121); + QTest::newRow("ftp-on-http+ftp") + << proxyList << proxyList.at(1) // second proxy should be used + << "ftp://" + QtNetworkSettings::ftpServerName() + "/qtest/rfc3252.txt" + << QNetworkReply::NoError; + } #ifndef QT_NO_SSL // HTTPS request with HTTP Caching + HTTP transparent @@ -4403,9 +4414,7 @@ void tst_QNetworkReply::ioGetWithManyProxies() #endif QFETCH(QNetworkReply::NetworkError, expectedError); -#if QT_CONFIG(ftp) QEXPECT_FAIL("ftp-on-socks", "QFtp is too limited and won't accept non-FTP proxies", Abort); -#endif QCOMPARE(reply->error(), expectedError); // Verify that the factory was called properly @@ -4421,10 +4430,8 @@ void tst_QNetworkReply::ioGetWithManyProxies() if (proxyUsed.type() == QNetworkProxy::NoProxy) { QCOMPARE(authspy.count(), 0); } else { -#if QT_CONFIG(ftp) if (QByteArray(QTest::currentDataTag()).startsWith("ftp-")) return; // No authentication with current FTP or with FTP proxies -#endif QCOMPARE(authspy.count(), 1); QCOMPARE(qvariant_cast(authspy.at(0).at(0)), proxyUsed); } @@ -4605,9 +4612,10 @@ void tst_QNetworkReply::ioPutToFileFromProcess() #endif // QT_CONFIG(process) } -#if QT_CONFIG(ftp) void tst_QNetworkReply::ioPutToFtpFromFile_data() { + if (!ftpSupported) + QSKIP("FTP is not supported"); ioPutToFileFromFile_data(); } @@ -4654,7 +4662,6 @@ void tst_QNetworkReply::ioPutToFtpFromFile() QTestEventLoop::instance().enterLoop(10); QObject::disconnect(r, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); } -#endif void tst_QNetworkReply::ioPutToHttpFromFile_data() { @@ -8032,9 +8039,10 @@ void tst_QNetworkReply::closeDuringDownload_data() { QTest::addColumn("url"); QTest::newRow("http") << QUrl("http://" + QtNetworkSettings::httpServerName() + "/bigfile"); -#if QT_CONFIG(ftp) - QTest::newRow("ftp") << QUrl("ftp://" + QtNetworkSettings::ftpServerName() + "/qtest/bigfile"); -#endif + if (ftpSupported) { + QTest::newRow("ftp") << QUrl("ftp://" + QtNetworkSettings::ftpServerName() + + "/qtest/bigfile"); + } } void tst_QNetworkReply::closeDuringDownload() @@ -8052,9 +8060,10 @@ void tst_QNetworkReply::closeDuringDownload() QVERIFY(destroySpy.wait()); } -#if QT_CONFIG(ftp) void tst_QNetworkReply::ftpAuthentication_data() { + if (!ftpSupported) + QSKIP("FTP is not supported"); QTest::addColumn("referenceName"); QTest::addColumn("url"); QTest::addColumn("error"); @@ -8079,7 +8088,6 @@ void tst_QNetworkReply::ftpAuthentication() QCOMPARE(reply->url(), request.url()); QCOMPARE(reply->error(), QNetworkReply::NetworkError(error)); } -#endif void tst_QNetworkReply::emitErrorForAllReplies() // QTBUG-36890 { @@ -9056,9 +9064,8 @@ void tst_QNetworkReply::autoDeleteRepliesAttribute_data() QTest::newRow("http") << QUrl("http://QInvalidDomain.qt/test"); QTest::newRow("https") << QUrl("https://QInvalidDomain.qt/test"); -#if QT_CONFIG(ftp) - QTest::newRow("ftp") << QUrl("ftp://QInvalidDomain.qt/test"); -#endif + if (ftpSupported) + QTest::newRow("ftp") << QUrl("ftp://QInvalidDomain.qt/test"); QTest::newRow("file") << QUrl("file:///thisfolderdoesn'texist/probably.txt"); #ifdef Q_OS_WIN // Only supported on windows. -- cgit v1.2.3