Various cleanups FTP-related.

net/ftp/ftp_network_transaction_unittest.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/ftp/ftp_network_transaction.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <ws2tcpip.h>
@@ skipping 29 matching lines @@
     PRE_USER,
     PRE_PASSWD,
     PRE_SYST,
     PRE_PWD,
     PRE_TYPE,
     PRE_PASV,
     PRE_SIZE,
     PRE_MDTM,
     PRE_LIST,
     PRE_RETR,
-    PRE_PASV2,
     PRE_CWD,
     PRE_QUIT,
     QUIT
   };
 
   FtpMockControlSocket()
       : failure_injection_state_(NONE),
         multiline_welcome_(false) {
     Init();
   }
@@ skipping 15 matching lines @@
       case PRE_SYST:
         return Verify("SYST\r\n", data, PRE_PWD, "215 UNIX\r\n");
       case PRE_PWD:
         return Verify("PWD\r\n", data, PRE_TYPE,
                       "257 \"/\" is your current location\r\n");
       case PRE_TYPE:
         return Verify("TYPE I\r\n", data, PRE_PASV,
                       "200 TYPE is now 8-bit binary\r\n");
       case PRE_PASV:
         return Verify("PASV\r\n", data, PRE_SIZE,
-                      "227 Entering Passive Mode (127,0,0,1,123,456)\r\n");
+                      "227 Entering Passive Mode 127,0,0,1,123,456\r\n");
       case PRE_QUIT:
         return Verify("QUIT\r\n", data, QUIT, "221 Goodbye.\r\n");
       default:
         return MockWriteResult(true, ERR_UNEXPECTED);
     }
   }
 
   void InjectFailure(State state, State next_state, const char* response) {
     DCHECK_EQ(NONE, failure_injection_state_);
     DCHECK_NE(NONE, state);
@@ skipping 67 matching lines @@
     if (InjectFault())
       return MockWriteResult(true, data.length());
     switch (state()) {
       case PRE_SIZE:
         return Verify("SIZE /\r\n", data, PRE_MDTM,
                       "550 I can only retrieve regular files\r\n");
       case PRE_MDTM:
         return Verify("MDTM /\r\n", data, PRE_RETR,
                       "213 20070221112533\r\n");
       case PRE_RETR:
-        return Verify("RETR /\r\n", data, PRE_PASV2,
+        return Verify("RETR /\r\n", data, PRE_CWD,
                       "550 Can't download directory\r\n");
-      case PRE_PASV2:
-        // Parser should also accept format without parentheses.
-        return Verify("PASV\r\n", data, PRE_CWD,
-                      "227 Entering Passive Mode 127,0,0,1,123,456\r\n");
       case PRE_CWD:
         return Verify("CWD /\r\n", data, PRE_LIST, "200 OK\r\n");
       case PRE_LIST:
         // TODO(phajdan.jr): Also test with "150 Accepted Data Connection".
         return Verify("LIST\r\n", data, PRE_QUIT, "200 OK\r\n");
       default:
         return FtpMockControlSocket::OnWrite(data);
     }
   }
 
@@ skipping 101 matching lines @@
 class FtpMockControlSocketFileDownloadRetrFail
     : public FtpMockControlSocketFileDownload {
  public:
   FtpMockControlSocketFileDownloadRetrFail() {
   }
 
   virtual MockWriteResult OnWrite(const std::string& data) {
     if (InjectFault())
       return MockWriteResult(true, data.length());
     switch (state()) {
-      case PRE_PASV2:
-        return Verify("PASV\r\n", data, PRE_CWD,
-                      "227 Entering Passive Mode (127,0,0,1,123,456)\r\n");
       case PRE_CWD:
         return Verify("CWD /file\r\n", data, PRE_QUIT,
                       "550 file is a directory\r\n");
       default:
         return FtpMockControlSocketFileDownload::OnWrite(data);
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FtpMockControlSocketFileDownloadRetrFail);
@@ skipping 70 matching lines @@
     return info;
   }
 
   void ExecuteTransaction(FtpMockControlSocket* ctrl_socket,
                           const char* request,
                           int expected_result) {
     std::string mock_data("mock-data");
     MockRead data_reads[] = {
       MockRead(mock_data.c_str()),
     };
-    // TODO(phajdan.jr): FTP transaction should not open two data sockets.
-    StaticMockSocket data_socket1(data_reads, NULL);
-    StaticMockSocket data_socket2(data_reads, NULL);
+    StaticMockSocket data_socket(data_reads, NULL);
     mock_socket_factory_.AddMockSocket(ctrl_socket);
-    mock_socket_factory_.AddMockSocket(&data_socket1);
-    mock_socket_factory_.AddMockSocket(&data_socket2);
+    mock_socket_factory_.AddMockSocket(&data_socket);
     FtpRequestInfo request_info = GetRequestInfo(request);
     EXPECT_EQ(LOAD_STATE_IDLE, transaction_.GetLoadState());
     ASSERT_EQ(ERR_IO_PENDING,
               transaction_.Start(&request_info, &callback_, NULL));
     EXPECT_NE(LOAD_STATE_IDLE, transaction_.GetLoadState());
     EXPECT_EQ(expected_result, callback_.WaitForResult());
     EXPECT_EQ(FtpMockControlSocket::QUIT, ctrl_socket->state());
     if (expected_result == OK) {
       scoped_refptr<IOBuffer> io_buffer(new IOBuffer(kBufferSize));
       memset(io_buffer->data(), 0, kBufferSize);
@@ skipping 357 matching lines @@
 TEST_F(FtpNetworkTransactionTest, DirectoryTransactionFailMdtm) {
   FtpMockControlSocketDirectoryListing ctrl_socket;
   TransactionFailHelper(&ctrl_socket,
                         "ftp://host",
                         FtpMockControlSocket::PRE_MDTM,
                         FtpMockControlSocket::PRE_RETR,
                         "500 failed mdtm\r\n",
                         OK);
 }
 
-TEST_F(FtpNetworkTransactionTest, DirectoryTransactionFailPasv2) {
-  FtpMockControlSocketDirectoryListing ctrl_socket;
-  TransactionFailHelper(&ctrl_socket,
-                        "ftp://host",
-                        FtpMockControlSocket::PRE_PASV2,
-                        FtpMockControlSocket::PRE_QUIT,
-                        "500 failed pasv\r\n",
-                        ERR_FAILED);
-}
-
 TEST_F(FtpNetworkTransactionTest, DirectoryTransactionFailCwd) {
   FtpMockControlSocketDirectoryListing ctrl_socket;
   TransactionFailHelper(&ctrl_socket,
                         "ftp://host",
                         FtpMockControlSocket::PRE_CWD,
                         FtpMockControlSocket::PRE_QUIT,
                         "500 failed cwd\r\n",
                         ERR_FAILED);
 }
 
@@ skipping 95 matching lines @@
                         FtpMockControlSocket::PRE_QUIT,
                         "500 failed retr\r\n",
                         ERR_FAILED);
 }
 
 TEST_F(FtpNetworkTransactionTest, DownloadTransactionFileNotFound) {
   FtpMockControlSocketFileDownloadRetrFail ctrl_socket;
   TransactionFailHelper(&ctrl_socket,
                         "ftp://host/file",
                         FtpMockControlSocket::PRE_RETR,
-                        FtpMockControlSocket::PRE_PASV2,
+                        FtpMockControlSocket::PRE_CWD,
                         "550 cannot open file\r\n",
                         ERR_FILE_NOT_FOUND);
 }
 
 }  // namespace net