net/ftp/ftp_network_transaction_unittest.cc - Issue 3057012: FTP: minor cleanups to the unit tests:

Unified Diff: net/ftp/ftp_network_transaction_unittest.cc

Issue 3057012: FTP: minor cleanups to the unit tests: (Closed)

Patch Set: Created 10 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: net/ftp/ftp_network_transaction_unittest.cc

diff --git a/net/ftp/ftp_network_transaction_unittest.cc b/net/ftp/ftp_network_transaction_unittest.cc

index b7cc29d425b7276d5642c3291c5a90eb63f8c58a..c5aed0d4970aefd6a78cf96d624f3ccf497f3223 100644

--- a/net/ftp/ftp_network_transaction_unittest.cc

+++ b/net/ftp/ftp_network_transaction_unittest.cc

@@ -81,6 +81,8 @@ class FtpSocketDataProvider : public DynamicSocketDataProvider {

return Verify("EPSV\r\n", data, PRE_SIZE,

"227 Entering Extended Passive Mode (|||31744|)\r\n");

case PRE_NOPASV:

+ // Use unallocated 599 FTP error code to make sure it falls into the generic

+ // ERR_FTP_FAILED bucket.

return Verify("PASV\r\n", data, PRE_QUIT,

"599 fail\r\n");

case PRE_QUIT:

@@ -473,6 +475,8 @@ class FtpSocketDataProviderFileDownloadInvalidResponse

return MockWriteResult(true, data.length());

switch (state()) {

case PRE_SIZE:

+ // Use unallocated 599 FTP error code to make sure it falls into the

+ // generic ERR_FTP_FAILED bucket.

return Verify("SIZE /file\r\n", data, PRE_QUIT,

"599 Evil Response\r\n"

"599 More Evil\r\n");

@@ -649,13 +653,10 @@ class FtpNetworkTransactionTest : public PlatformTest {

MockRead(false, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),

MockRead(mock_data.c_str()),

};

- // For compatibility with FileZilla, the transaction code will use two data

- // sockets for directory requests. For more info see http://crbug.com/25316.

- StaticSocketDataProvider data1(data_reads, arraysize(data_reads), NULL, 0);

- StaticSocketDataProvider data2(data_reads, arraysize(data_reads), NULL, 0);

+ StaticSocketDataProvider data_socket(data_reads, arraysize(data_reads),

+ NULL, 0);

mock_socket_factory_.AddSocketDataProvider(ctrl_socket);

- mock_socket_factory_.AddSocketDataProvider(&data1);

- mock_socket_factory_.AddSocketDataProvider(&data2);

+ mock_socket_factory_.AddSocketDataProvider(&data_socket);

FtpRequestInfo request_info = GetRequestInfo(request);

EXPECT_EQ(LOAD_STATE_IDLE, transaction_.GetLoadState());

ASSERT_EQ(ERR_IO_PENDING,

@@ -1116,6 +1117,8 @@ TEST_F(FtpNetworkTransactionTest, CloseConnection) {

TEST_F(FtpNetworkTransactionTest, DirectoryTransactionFailUser) {

FtpSocketDataProviderDirectoryListing ctrl_socket;

+ // Use unallocated 599 FTP error code to make sure it falls into the generic

+ // ERR_FTP_FAILED bucket.

TransactionFailHelper(&ctrl_socket,

"ftp://host",

FtpSocketDataProvider::PRE_USER,

@@ -1147,6 +1150,8 @@ TEST_F(FtpNetworkTransactionTest, DirectoryTransactionFailPass503) {

TEST_F(FtpNetworkTransactionTest, DirectoryTransactionFailSyst) {

FtpSocketDataProviderDirectoryListing ctrl_socket;

+ // Use unallocated 599 FTP error code to make sure it falls into the generic

+ // ERR_FTP_FAILED bucket.

TransactionFailHelper(&ctrl_socket,

"ftp://host",

FtpSocketDataProvider::PRE_SYST,

@@ -1157,6 +1162,8 @@ TEST_F(FtpNetworkTransactionTest, DirectoryTransactionFailSyst) {

TEST_F(FtpNetworkTransactionTest, DirectoryTransactionFailPwd) {

FtpSocketDataProviderDirectoryListing ctrl_socket;

+ // Use unallocated 599 FTP error code to make sure it falls into the generic

+ // ERR_FTP_FAILED bucket.

TransactionFailHelper(&ctrl_socket,

"ftp://host",

FtpSocketDataProvider::PRE_PWD,

@@ -1167,6 +1174,8 @@ TEST_F(FtpNetworkTransactionTest, DirectoryTransactionFailPwd) {

TEST_F(FtpNetworkTransactionTest, DirectoryTransactionFailType) {

FtpSocketDataProviderDirectoryListing ctrl_socket;

+ // Use unallocated 599 FTP error code to make sure it falls into the generic

+ // ERR_FTP_FAILED bucket.

TransactionFailHelper(&ctrl_socket,

"ftp://host",

FtpSocketDataProvider::PRE_TYPE,

@@ -1177,6 +1186,8 @@ TEST_F(FtpNetworkTransactionTest, DirectoryTransactionFailType) {

TEST_F(FtpNetworkTransactionTest, DirectoryTransactionFailEpsv) {

FtpSocketDataProviderDirectoryListing ctrl_socket;

+ // Use unallocated 599 FTP error code to make sure it falls into the generic

+ // ERR_FTP_FAILED bucket.

TransactionFailHelper(&ctrl_socket,

"ftp://host",

FtpSocketDataProvider::PRE_EPSV,

@@ -1187,6 +1198,8 @@ TEST_F(FtpNetworkTransactionTest, DirectoryTransactionFailEpsv) {

TEST_F(FtpNetworkTransactionTest, DirectoryTransactionFailCwd) {

FtpSocketDataProviderDirectoryListing ctrl_socket;

+ // Use unallocated 599 FTP error code to make sure it falls into the generic

+ // ERR_FTP_FAILED bucket.

TransactionFailHelper(&ctrl_socket,

"ftp://host",

FtpSocketDataProvider::PRE_CWD,

@@ -1217,6 +1230,8 @@ TEST_F(FtpNetworkTransactionTest, DirectoryTransactionFailMlsd) {

TEST_F(FtpNetworkTransactionTest, DirectoryTransactionFailList) {

FtpSocketDataProviderVMSDirectoryListing ctrl_socket;

+ // Use unallocated 599 FTP error code to make sure it falls into the generic

+ // ERR_FTP_FAILED bucket.

TransactionFailHelper(&ctrl_socket,

"ftp://host/dir",

FtpSocketDataProvider::PRE_LIST,

@@ -1227,6 +1242,8 @@ TEST_F(FtpNetworkTransactionTest, DirectoryTransactionFailList) {

TEST_F(FtpNetworkTransactionTest, DownloadTransactionFailUser) {

FtpSocketDataProviderFileDownload ctrl_socket;

+ // Use unallocated 599 FTP error code to make sure it falls into the generic

+ // ERR_FTP_FAILED bucket.

TransactionFailHelper(&ctrl_socket,

"ftp://host/file",

FtpSocketDataProvider::PRE_USER,

@@ -1247,6 +1264,8 @@ TEST_F(FtpNetworkTransactionTest, DownloadTransactionFailPass) {

TEST_F(FtpNetworkTransactionTest, DownloadTransactionFailSyst) {

FtpSocketDataProviderFileDownload ctrl_socket;

+ // Use unallocated 599 FTP error code to make sure it falls into the generic

+ // ERR_FTP_FAILED bucket.

TransactionFailHelper(&ctrl_socket,

"ftp://host/file",

FtpSocketDataProvider::PRE_SYST,

@@ -1257,6 +1276,8 @@ TEST_F(FtpNetworkTransactionTest, DownloadTransactionFailSyst) {

TEST_F(FtpNetworkTransactionTest, DownloadTransactionFailPwd) {

FtpSocketDataProviderFileDownload ctrl_socket;

+ // Use unallocated 599 FTP error code to make sure it falls into the generic

+ // ERR_FTP_FAILED bucket.

TransactionFailHelper(&ctrl_socket,

"ftp://host/file",

FtpSocketDataProvider::PRE_PWD,

@@ -1267,6 +1288,8 @@ TEST_F(FtpNetworkTransactionTest, DownloadTransactionFailPwd) {

TEST_F(FtpNetworkTransactionTest, DownloadTransactionFailType) {

FtpSocketDataProviderFileDownload ctrl_socket;

+ // Use unallocated 599 FTP error code to make sure it falls into the generic

+ // ERR_FTP_FAILED bucket.

TransactionFailHelper(&ctrl_socket,

"ftp://host/file",

FtpSocketDataProvider::PRE_TYPE,

@@ -1277,6 +1300,8 @@ TEST_F(FtpNetworkTransactionTest, DownloadTransactionFailType) {

TEST_F(FtpNetworkTransactionTest, DownloadTransactionFailEpsv) {

FtpSocketDataProviderFileDownload ctrl_socket;

+ // Use unallocated 599 FTP error code to make sure it falls into the generic

+ // ERR_FTP_FAILED bucket.

TransactionFailHelper(&ctrl_socket,

"ftp://host/file",

FtpSocketDataProvider::PRE_EPSV,

@@ -1287,6 +1312,8 @@ TEST_F(FtpNetworkTransactionTest, DownloadTransactionFailEpsv) {

TEST_F(FtpNetworkTransactionTest, DownloadTransactionFailRetr) {

FtpSocketDataProviderFileDownload ctrl_socket;

+ // Use unallocated 599 FTP error code to make sure it falls into the generic

+ // ERR_FTP_FAILED bucket.

TransactionFailHelper(&ctrl_socket,

"ftp://host/file",

FtpSocketDataProvider::PRE_RETR,

« no previous file with comments | « no previous file | no next file » | no next file with comments »