| Index: net/ftp/ftp_directory_listing_parser_netware_unittest.cc
|
| diff --git a/net/ftp/ftp_directory_listing_parser_netware_unittest.cc b/net/ftp/ftp_directory_listing_parser_netware_unittest.cc
|
| index 102552c43f6b5b2524a312abac515fc72fe4c92f..08b68017eaad939e48ecd42b5f2c55771717df63 100644
|
| --- a/net/ftp/ftp_directory_listing_parser_netware_unittest.cc
|
| +++ b/net/ftp/ftp_directory_listing_parser_netware_unittest.cc
|
| @@ -18,19 +18,17 @@ typedef FtpDirectoryListingParserTest FtpDirectoryListingParserNetwareTest;
|
|
|
| TEST_F(FtpDirectoryListingParserNetwareTest, Good) {
|
| const struct SingleLineTestData good_cases[] = {
|
| - { "d [RWCEAFMS] ftpadmin 512 Jan 29 2004 pub",
|
| - FtpDirectoryListingEntry::DIRECTORY, "pub", -1,
|
| - 2004, 1, 29, 0, 0 },
|
| - { "- [RW------] ftpadmin 123 Nov 11 18:25 afile",
|
| - FtpDirectoryListingEntry::FILE, "afile", 123,
|
| - 1994, 11, 11, 18, 25 },
|
| - { "d [RWCEAFMS] daniel 512 May 17 2010 NVP anyagok",
|
| - FtpDirectoryListingEntry::DIRECTORY, "NVP anyagok", -1,
|
| - 2010, 5, 17, 0, 0 },
|
| + {"d [RWCEAFMS] ftpadmin 512 Jan 29 2004 pub",
|
| + FtpDirectoryListingEntry::DIRECTORY, "pub", -1, 2004, 1, 29, 0, 0},
|
| + {"- [RW------] ftpadmin 123 Nov 11 18:25 afile",
|
| + FtpDirectoryListingEntry::FILE, "afile", 123, 1994, 11, 11, 18, 25},
|
| + {"d [RWCEAFMS] daniel 512 May 17 2010 NVP anyagok",
|
| + FtpDirectoryListingEntry::DIRECTORY, "NVP anyagok", -1, 2010, 5, 17, 0,
|
| + 0},
|
| };
|
| for (size_t i = 0; i < arraysize(good_cases); i++) {
|
| - SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i,
|
| - good_cases[i].input));
|
| + SCOPED_TRACE(
|
| + base::StringPrintf("Test[%" PRIuS "]: %s", i, good_cases[i].input));
|
|
|
| std::vector<base::string16> lines(
|
| GetSingleLineTestCase(good_cases[i].input));
|
| @@ -39,26 +37,24 @@ TEST_F(FtpDirectoryListingParserNetwareTest, Good) {
|
| lines.insert(lines.begin(), base::ASCIIToUTF16("total 1"));
|
|
|
| std::vector<FtpDirectoryListingEntry> entries;
|
| - EXPECT_TRUE(ParseFtpDirectoryListingNetware(lines,
|
| - GetMockCurrentTime(),
|
| - &entries));
|
| + EXPECT_TRUE(
|
| + ParseFtpDirectoryListingNetware(lines, GetMockCurrentTime(), &entries));
|
| VerifySingleLineTestCase(good_cases[i], entries);
|
| }
|
| }
|
|
|
| TEST_F(FtpDirectoryListingParserNetwareTest, Bad) {
|
| const char* bad_cases[] = {
|
| - " foo",
|
| - "garbage",
|
| - "d [] ftpadmin 512 Jan 29 2004 pub",
|
| - "d [XGARBAGE] ftpadmin 512 Jan 29 2004 pub",
|
| - "d [RWCEAFMS] 512 Jan 29 2004 pub",
|
| - "d [RWCEAFMS] ftpadmin -1 Jan 29 2004 pub",
|
| - "l [RW------] ftpadmin 512 Jan 29 2004 pub",
|
| + " foo",
|
| + "garbage",
|
| + "d [] ftpadmin 512 Jan 29 2004 pub",
|
| + "d [XGARBAGE] ftpadmin 512 Jan 29 2004 pub",
|
| + "d [RWCEAFMS] 512 Jan 29 2004 pub",
|
| + "d [RWCEAFMS] ftpadmin -1 Jan 29 2004 pub",
|
| + "l [RW------] ftpadmin 512 Jan 29 2004 pub",
|
| };
|
| for (size_t i = 0; i < arraysize(bad_cases); i++) {
|
| - SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i,
|
| - bad_cases[i]));
|
| + SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i, bad_cases[i]));
|
|
|
| std::vector<base::string16> lines(GetSingleLineTestCase(bad_cases[i]));
|
|
|
| @@ -66,9 +62,8 @@ TEST_F(FtpDirectoryListingParserNetwareTest, Bad) {
|
| lines.insert(lines.begin(), base::ASCIIToUTF16("total 1"));
|
|
|
| std::vector<FtpDirectoryListingEntry> entries;
|
| - EXPECT_FALSE(ParseFtpDirectoryListingNetware(lines,
|
| - GetMockCurrentTime(),
|
| - &entries));
|
| + EXPECT_FALSE(
|
| + ParseFtpDirectoryListingNetware(lines, GetMockCurrentTime(), &entries));
|
| }
|
| }
|
|
|
|
|