| Index: net/ftp/ftp_directory_listing_parser_vms_unittest.cc
|
| diff --git a/net/ftp/ftp_directory_listing_parser_vms_unittest.cc b/net/ftp/ftp_directory_listing_parser_vms_unittest.cc
|
| index cef86c092e396e19d1f4db1aa4865f457f1d4817..4e76b6f011a6929717ac7bebcfb58476affafeb5 100644
|
| --- a/net/ftp/ftp_directory_listing_parser_vms_unittest.cc
|
| +++ b/net/ftp/ftp_directory_listing_parser_vms_unittest.cc
|
| @@ -21,40 +21,32 @@ typedef FtpDirectoryListingParserTest FtpDirectoryListingParserVmsTest;
|
|
|
| TEST_F(FtpDirectoryListingParserVmsTest, Good) {
|
| const struct SingleLineTestData good_cases[] = {
|
| - { "README.TXT;4 2 18-APR-2000 10:40:39.90",
|
| - FtpDirectoryListingEntry::FILE, "readme.txt", 1024,
|
| - 2000, 4, 18, 10, 40 },
|
| - { ".WELCOME;1 2 13-FEB-2002 23:32:40.47",
|
| - FtpDirectoryListingEntry::FILE, ".welcome", 1024,
|
| - 2002, 2, 13, 23, 32 },
|
| - { "FILE.;1 2 13-FEB-2002 23:32:40.47",
|
| - FtpDirectoryListingEntry::FILE, "file.", 1024,
|
| - 2002, 2, 13, 23, 32 },
|
| - { "EXAMPLE.TXT;1 1 4-NOV-2009 06:02 [JOHNDOE] (RWED,RWED,,)",
|
| - FtpDirectoryListingEntry::FILE, "example.txt", 512,
|
| - 2009, 11, 4, 6, 2 },
|
| - { "ANNOUNCE.TXT;2 1/16 12-MAR-2005 08:44:57 [SYSTEM] (RWED,RWED,RE,RE)",
|
| - FtpDirectoryListingEntry::FILE, "announce.txt", 512,
|
| - 2005, 3, 12, 8, 44 },
|
| - { "TEST.DIR;1 1 4-MAR-1999 22:14:34 [UCX$NOBO,ANONYMOUS] (RWE,RWE,RWE,RWE)",
|
| - FtpDirectoryListingEntry::DIRECTORY, "test", -1,
|
| - 1999, 3, 4, 22, 14 },
|
| - { "ANNOUNCE.TXT;2 1 12-MAR-2005 08:44:57 [X] (,,,)",
|
| - FtpDirectoryListingEntry::FILE, "announce.txt", 512,
|
| - 2005, 3, 12, 8, 44 },
|
| - { "ANNOUNCE.TXT;2 1 12-MAR-2005 08:44:57 [X] (R,RW,RWD,RE)",
|
| - FtpDirectoryListingEntry::FILE, "announce.txt", 512,
|
| - 2005, 3, 12, 8, 44 },
|
| - { "ANNOUNCE.TXT;2 1 12-MAR-2005 08:44:57 [X] (ED,RED,WD,WED)",
|
| - FtpDirectoryListingEntry::FILE, "announce.txt", 512,
|
| - 2005, 3, 12, 8, 44 },
|
| - { "VMS721.ISO;2 ****** 6-MAY-2008 09:29 [ANONY,ANONYMOUS] (RE,RWED,RE,RE)",
|
| - FtpDirectoryListingEntry::FILE, "vms721.iso", -1,
|
| - 2008, 5, 6, 9, 29 },
|
| + {"README.TXT;4 2 18-APR-2000 10:40:39.90",
|
| + FtpDirectoryListingEntry::FILE, "readme.txt", 1024, 2000, 4, 18, 10, 40},
|
| + {".WELCOME;1 2 13-FEB-2002 23:32:40.47",
|
| + FtpDirectoryListingEntry::FILE, ".welcome", 1024, 2002, 2, 13, 23, 32},
|
| + {"FILE.;1 2 13-FEB-2002 23:32:40.47", FtpDirectoryListingEntry::FILE,
|
| + "file.", 1024, 2002, 2, 13, 23, 32},
|
| + {"EXAMPLE.TXT;1 1 4-NOV-2009 06:02 [JOHNDOE] (RWED,RWED,,)",
|
| + FtpDirectoryListingEntry::FILE, "example.txt", 512, 2009, 11, 4, 6, 2},
|
| + {"ANNOUNCE.TXT;2 1/16 12-MAR-2005 08:44:57 [SYSTEM] (RWED,RWED,RE,RE)",
|
| + FtpDirectoryListingEntry::FILE, "announce.txt", 512, 2005, 3, 12, 8, 44},
|
| + {"TEST.DIR;1 1 4-MAR-1999 22:14:34 [UCX$NOBO,ANONYMOUS] "
|
| + "(RWE,RWE,RWE,RWE)",
|
| + FtpDirectoryListingEntry::DIRECTORY, "test", -1, 1999, 3, 4, 22, 14},
|
| + {"ANNOUNCE.TXT;2 1 12-MAR-2005 08:44:57 [X] (,,,)",
|
| + FtpDirectoryListingEntry::FILE, "announce.txt", 512, 2005, 3, 12, 8, 44},
|
| + {"ANNOUNCE.TXT;2 1 12-MAR-2005 08:44:57 [X] (R,RW,RWD,RE)",
|
| + FtpDirectoryListingEntry::FILE, "announce.txt", 512, 2005, 3, 12, 8, 44},
|
| + {"ANNOUNCE.TXT;2 1 12-MAR-2005 08:44:57 [X] (ED,RED,WD,WED)",
|
| + FtpDirectoryListingEntry::FILE, "announce.txt", 512, 2005, 3, 12, 8, 44},
|
| + {"VMS721.ISO;2 ****** 6-MAY-2008 09:29 [ANONY,ANONYMOUS] "
|
| + "(RE,RWED,RE,RE)",
|
| + FtpDirectoryListingEntry::FILE, "vms721.iso", -1, 2008, 5, 6, 9, 29},
|
| };
|
| 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));
|
| @@ -64,49 +56,47 @@ TEST_F(FtpDirectoryListingParserVmsTest, Good) {
|
| ASCIIToUTF16("Directory ANONYMOUS_ROOT:[000000]"));
|
|
|
| // A valid listing must also have a "Total" line at the end.
|
| - lines.insert(lines.end(),
|
| - ASCIIToUTF16("Total of 1 file, 2 blocks."));
|
| + lines.insert(lines.end(), ASCIIToUTF16("Total of 1 file, 2 blocks."));
|
|
|
| std::vector<FtpDirectoryListingEntry> entries;
|
| - EXPECT_TRUE(ParseFtpDirectoryListingVms(lines,
|
| - &entries));
|
| + EXPECT_TRUE(ParseFtpDirectoryListingVms(lines, &entries));
|
| VerifySingleLineTestCase(good_cases[i], entries);
|
| }
|
| }
|
|
|
| TEST_F(FtpDirectoryListingParserVmsTest, Bad) {
|
| const char* bad_cases[] = {
|
| - "garbage",
|
| -
|
| - // Missing file version number.
|
| - "README.TXT 2 18-APR-2000 10:40:39",
|
| -
|
| - // Missing extension.
|
| - "README;1 2 18-APR-2000 10:40:39",
|
| -
|
| - // Malformed file size.
|
| - "README.TXT;1 garbage 18-APR-2000 10:40:39",
|
| - "README.TXT;1 -2 18-APR-2000 10:40:39",
|
| -
|
| - // Malformed date.
|
| - "README.TXT;1 2 APR-2000 10:40:39",
|
| - "README.TXT;1 2 -18-APR-2000 10:40:39",
|
| - "README.TXT;1 2 18-APR 10:40:39",
|
| - "README.TXT;1 2 18-APR-2000 10",
|
| - "README.TXT;1 2 18-APR-2000 10:40.25",
|
| - "README.TXT;1 2 18-APR-2000 10:40.25.25",
|
| -
|
| - // Malformed security information.
|
| - "X.TXT;2 1 12-MAR-2005 08:44:57 (RWED,RWED,RE,RE)",
|
| - "X.TXT;2 1 12-MAR-2005 08:44:57 [SYSTEM]",
|
| - "X.TXT;2 1 12-MAR-2005 08:44:57 (SYSTEM) (RWED,RWED,RE,RE)",
|
| - "X.TXT;2 1 12-MAR-2005 08:44:57 [SYSTEM] [RWED,RWED,RE,RE]",
|
| - "X.TXT;2 1 12-MAR-2005 08:44:57 [X] (RWED)",
|
| - "X.TXT;2 1 12-MAR-2005 08:44:57 [X] (RWED,RWED,RE,RE,RE)",
|
| - "X.TXT;2 1 12-MAR-2005 08:44:57 [X] (RWED,RWEDRWED,RE,RE)",
|
| - "X.TXT;2 1 12-MAR-2005 08:44:57 [X] (RWED,DEWR,RE,RE)",
|
| - "X.TXT;2 1 12-MAR-2005 08:44:57 [X] (RWED,RWED,Q,RE)",
|
| - "X.TXT;2 1 12-MAR-2005 08:44:57 [X] (RWED,RRWWEEDD,RE,RE)",
|
| + "garbage",
|
| +
|
| + // Missing file version number.
|
| + "README.TXT 2 18-APR-2000 10:40:39",
|
| +
|
| + // Missing extension.
|
| + "README;1 2 18-APR-2000 10:40:39",
|
| +
|
| + // Malformed file size.
|
| + "README.TXT;1 garbage 18-APR-2000 10:40:39",
|
| + "README.TXT;1 -2 18-APR-2000 10:40:39",
|
| +
|
| + // Malformed date.
|
| + "README.TXT;1 2 APR-2000 10:40:39",
|
| + "README.TXT;1 2 -18-APR-2000 10:40:39",
|
| + "README.TXT;1 2 18-APR 10:40:39",
|
| + "README.TXT;1 2 18-APR-2000 10",
|
| + "README.TXT;1 2 18-APR-2000 10:40.25",
|
| + "README.TXT;1 2 18-APR-2000 10:40.25.25",
|
| +
|
| + // Malformed security information.
|
| + "X.TXT;2 1 12-MAR-2005 08:44:57 (RWED,RWED,RE,RE)",
|
| + "X.TXT;2 1 12-MAR-2005 08:44:57 [SYSTEM]",
|
| + "X.TXT;2 1 12-MAR-2005 08:44:57 (SYSTEM) (RWED,RWED,RE,RE)",
|
| + "X.TXT;2 1 12-MAR-2005 08:44:57 [SYSTEM] [RWED,RWED,RE,RE]",
|
| + "X.TXT;2 1 12-MAR-2005 08:44:57 [X] (RWED)",
|
| + "X.TXT;2 1 12-MAR-2005 08:44:57 [X] (RWED,RWED,RE,RE,RE)",
|
| + "X.TXT;2 1 12-MAR-2005 08:44:57 [X] (RWED,RWEDRWED,RE,RE)",
|
| + "X.TXT;2 1 12-MAR-2005 08:44:57 [X] (RWED,DEWR,RE,RE)",
|
| + "X.TXT;2 1 12-MAR-2005 08:44:57 [X] (RWED,RWED,Q,RE)",
|
| + "X.TXT;2 1 12-MAR-2005 08:44:57 [X] (RWED,RRWWEEDD,RE,RE)",
|
| };
|
| for (size_t i = 0; i < arraysize(bad_cases); i++) {
|
| SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i, bad_cases[i]));
|
| @@ -118,20 +108,17 @@ TEST_F(FtpDirectoryListingParserVmsTest, Bad) {
|
| ASCIIToUTF16("Directory ANONYMOUS_ROOT:[000000]"));
|
|
|
| // A valid listing must also have a "Total" line at the end.
|
| - lines.insert(lines.end(),
|
| - ASCIIToUTF16("Total of 1 file, 2 blocks."));
|
| + lines.insert(lines.end(), ASCIIToUTF16("Total of 1 file, 2 blocks."));
|
|
|
| std::vector<FtpDirectoryListingEntry> entries;
|
| - EXPECT_FALSE(ParseFtpDirectoryListingVms(lines,
|
| - &entries));
|
| + EXPECT_FALSE(ParseFtpDirectoryListingVms(lines, &entries));
|
| }
|
| }
|
|
|
| TEST_F(FtpDirectoryListingParserVmsTest, BadDataAfterFooter) {
|
| const char* bad_cases[] = {
|
| - "garbage",
|
| - "Total of 1 file, 2 blocks.",
|
| - "Directory ANYNYMOUS_ROOT:[000000]",
|
| + "garbage", "Total of 1 file, 2 blocks.",
|
| + "Directory ANYNYMOUS_ROOT:[000000]",
|
| };
|
| for (size_t i = 0; i < arraysize(bad_cases); i++) {
|
| SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i, bad_cases[i]));
|
| @@ -144,23 +131,19 @@ TEST_F(FtpDirectoryListingParserVmsTest, BadDataAfterFooter) {
|
| ASCIIToUTF16("Directory ANONYMOUS_ROOT:[000000]"));
|
|
|
| // A valid listing must also have a "Total" line at the end.
|
| - lines.insert(lines.end(),
|
| - ASCIIToUTF16("Total of 1 file, 2 blocks."));
|
| + lines.insert(lines.end(), ASCIIToUTF16("Total of 1 file, 2 blocks."));
|
|
|
| {
|
| // Make sure the listing is valid before we add data after footer.
|
| std::vector<FtpDirectoryListingEntry> entries;
|
| - EXPECT_TRUE(ParseFtpDirectoryListingVms(lines,
|
| - &entries));
|
| + EXPECT_TRUE(ParseFtpDirectoryListingVms(lines, &entries));
|
| }
|
|
|
| {
|
| // Insert a line at the end of the listing that should make it invalid.
|
| - lines.insert(lines.end(),
|
| - ASCIIToUTF16(bad_cases[i]));
|
| + lines.insert(lines.end(), ASCIIToUTF16(bad_cases[i]));
|
| std::vector<FtpDirectoryListingEntry> entries;
|
| - EXPECT_FALSE(ParseFtpDirectoryListingVms(lines,
|
| - &entries));
|
| + EXPECT_FALSE(ParseFtpDirectoryListingVms(lines, &entries));
|
| }
|
| }
|
| }
|
|
|