Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1665)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/ftp/ftp_directory_listing_parser_ls_unittest.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
Download patch
« net/base/mime_util_unittest.cc ('K') | « net/ftp/ftp_directory_listing_parser_ls.cc ('k') | net/ftp/ftp_directory_listing_parser_netware.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/ftp/ftp_directory_listing_parser_ls_unittest.cc
diff --git a/net/ftp/ftp_directory_listing_parser_ls_unittest.cc b/net/ftp/ftp_directory_listing_parser_ls_unittest.cc
index 313ef664c739397dcdf903ae934cd6154672d4f8..8176794167e48766dee3a1fb1a938c3d2c8bdbe9 100644
--- a/net/ftp/ftp_directory_listing_parser_ls_unittest.cc
+++ b/net/ftp/ftp_directory_listing_parser_ls_unittest.cc
@@ -17,202 +17,171 @@ typedef FtpDirectoryListingParserTest FtpDirectoryListingParserLsTest;
TEST_F(FtpDirectoryListingParserLsTest, Good) {
const struct SingleLineTestData good_cases[] = {
- { "-rw-r--r-- 1 ftp ftp 528 Nov 01 2007 README",
- FtpDirectoryListingEntry::FILE, "README", 528,
- 2007, 11, 1, 0, 0 },
- { "drwxr-xr-x 3 ftp ftp 4096 May 15 18:11 directory",
- FtpDirectoryListingEntry::DIRECTORY, "directory", -1,
- 1994, 5, 15, 18, 11 },
- { "lrwxrwxrwx 1 0 0 26 Sep 18 2008 pub -> vol/1/.CLUSTER/var_ftp/pub",
- FtpDirectoryListingEntry::SYMLINK, "pub", -1,
- 2008, 9, 18, 0, 0 },
- { "lrwxrwxrwx 1 0 0 3 Oct 12 13:37 mirror -> pub",
- FtpDirectoryListingEntry::SYMLINK, "mirror", -1,
- 1994, 10, 12, 13, 37 },
- { "drwxrwsr-x 4 501 501 4096 Feb 20 2007 pub",
- FtpDirectoryListingEntry::DIRECTORY, "pub", -1,
- 2007, 2, 20, 0, 0 },
- { "drwxr-xr-x 4 (?) (?) 4096 Apr 8 2007 jigdo",
- FtpDirectoryListingEntry::DIRECTORY, "jigdo", -1,
- 2007, 4, 8, 0, 0 },
- { "drwx-wx-wt 2 root wheel 512 Jul 1 02:15 incoming",
- FtpDirectoryListingEntry::DIRECTORY, "incoming", -1,
- 1994, 7, 1, 2, 15 },
- { "-rw-r--r-- 1 2 3 3447432 May 18 2009 Foo - Manual.pdf",
- FtpDirectoryListingEntry::FILE, "Foo - Manual.pdf", 3447432,
- 2009, 5, 18, 0, 0 },
- { "d-wx-wx-wt+ 4 ftp 989 512 Dec 8 15:54 incoming",
- FtpDirectoryListingEntry::DIRECTORY, "incoming", -1,
- 1993, 12, 8, 15, 54 },
- { "drwxrwxrwx 1 owner group 1024 Sep 13 0:30 audio",
- FtpDirectoryListingEntry::DIRECTORY, "audio", -1,
- 1994, 9, 13, 0, 30 },
- { "lrwxrwxrwx 1 0 0 26 Sep 18 2008 pub",
- FtpDirectoryListingEntry::SYMLINK, "pub", -1,
- 2008, 9, 18, 0, 0 },
- { "-rw-r--r-- 1 ftp ftp -528 Nov 01 2007 README",
- FtpDirectoryListingEntry::FILE, "README", -1,
- 2007, 11, 1, 0, 0 },
-
- // Tests for the wu-ftpd variant:
- { "drwxr-xr-x 2 sys 512 Mar 27 2009 pub",
- FtpDirectoryListingEntry::DIRECTORY, "pub", -1,
- 2009, 3, 27, 0, 0 },
- { "lrwxrwxrwx 0 0 26 Sep 18 2008 pub -> vol/1/.CLUSTER/var_ftp/pub",
- FtpDirectoryListingEntry::SYMLINK, "pub", -1,
- 2008, 9, 18, 0, 0 },
- { "drwxr-xr-x (?) (?) 4096 Apr 8 2007 jigdo",
- FtpDirectoryListingEntry::DIRECTORY, "jigdo", -1,
- 2007, 4, 8, 0, 0 },
- { "-rw-r--r-- 2 3 3447432 May 18 2009 Foo - Manual.pdf",
- FtpDirectoryListingEntry::FILE, "Foo - Manual.pdf", 3447432,
- 2009, 5, 18, 0, 0 },
-
- // Tests for "ls -l" style listings sent by an OS/2 server (FtpServer):
- { "-r--r--r-- 1 ftp -A--- 13274 Mar 1 2006 UpTime.exe",
- FtpDirectoryListingEntry::FILE, "UpTime.exe", 13274,
- 2006, 3, 1, 0, 0 },
- { "dr--r--r-- 1 ftp ----- 0 Nov 17 17:08 kernels",
- FtpDirectoryListingEntry::DIRECTORY, "kernels", -1,
- 1993, 11, 17, 17, 8 },
-
- // Tests for "ls -l" style listing sent by Xplain FTP Server.
- { "drwxr-xr-x folder 0 Jul 17 2006 online",
- FtpDirectoryListingEntry::DIRECTORY, "online", -1,
- 2006, 7, 17, 0, 0 },
-
- // Tests for "ls -l" style listing with owning group name
- // not separated from file size (http://crbug.com/58963).
- { "-rw-r--r-- 1 ftpadmin ftpadmin125435904 Apr 9 2008 .pureftpd-upload",
- FtpDirectoryListingEntry::FILE, ".pureftpd-upload", 0,
- 2008, 4, 9, 0, 0 },
-
- // Tests for "ls -l" style listing with number of links
- // not separated from permission listing (http://crbug.com/70394).
- { "drwxr-xr-x1732 266 111 90112 Jun 21 2001 .rda_2",
- FtpDirectoryListingEntry::DIRECTORY, ".rda_2", -1,
- 2001, 6, 21, 0, 0 },
-
- // Tests for "ls -l" style listing with group name containing spaces.
- { "drwxrwxr-x 3 %%%% Domain Users 4096 Dec 9 2009 %%%%%",
- FtpDirectoryListingEntry::DIRECTORY, "%%%%%", -1,
- 2009, 12, 9, 0, 0 },
-
- // Tests for "ls -l" style listing in Russian locale (note the swapped
- // parts order: the day of month is the first, before month).
- { "-rwxrwxr-x 1 ftp ftp 123 23 \xd0\xbc\xd0\xb0\xd0\xb9 2011 test",
- FtpDirectoryListingEntry::FILE, "test", 123,
- 2011, 5, 23, 0, 0 },
- { "drwxrwxr-x 1 ftp ftp 4096 19 \xd0\xbe\xd0\xba\xd1\x82 2011 dir",
- FtpDirectoryListingEntry::DIRECTORY, "dir", -1,
- 2011, 10, 19, 0, 0 },
-
- // Plan9 sends entry type "a" for append-only files.
- { "ar-xr-xr-x 2 none none 512 Apr 26 17:52 plan9",
- FtpDirectoryListingEntry::FILE, "plan9", 512,
- 1994, 4, 26, 17, 52 },
-
- // Hylafax sends a shorter permission listing.
- { "drwxrwx 2 10 4096 Jul 28 02:41 tmp",
- FtpDirectoryListingEntry::DIRECTORY, "tmp", -1,
- 1994, 7, 28, 2, 41 },
-
- // Completely different date format (YYYY-MM-DD).
- { "drwxrwxrwx 2 root root 4096 2012-02-07 00:31 notas_servico",
- FtpDirectoryListingEntry::DIRECTORY, "notas_servico", -1,
- 2012, 2, 7, 0, 31 },
- { "-rwxrwxrwx 2 root root 4096 2012-02-07 00:31 notas_servico",
- FtpDirectoryListingEntry::FILE, "notas_servico", 4096,
- 2012, 2, 7, 0, 31 },
-
- // Weird permission bits.
- { "drwx--l--- 2 0 10 512 Dec 22 1994 swetzel",
- FtpDirectoryListingEntry::DIRECTORY, "swetzel", -1,
- 1994, 12, 22, 0, 0 },
-
- { "drwxrwxr-x 1 500 244 660 Jan 1 00:0 bin",
- FtpDirectoryListingEntry::DIRECTORY, "bin", -1,
- 1994, 1, 1, 0, 0 },
-
- // Garbage in date (but still parseable).
- { "lrw-rw-rw- 1 user group 542 "
- "/t11/member/incomingFeb 8 2007 "
- "Shortcut to incoming.lnk -> /t11/member/incoming",
- FtpDirectoryListingEntry::SYMLINK, "Shortcut to incoming.lnk", -1,
- 2007, 2, 8, 0, 0 },
-
- // Garbage in permissions (with no effect on other bits).
- // Also test multiple "columns" resulting from the garbage.
- { "garbage 1 ftp ftp 528 Nov 01 2007 README",
- FtpDirectoryListingEntry::FILE, "README", 528,
- 2007, 11, 1, 0, 0 },
- { "gar bage 1 ftp ftp 528 Nov 01 2007 README",
- FtpDirectoryListingEntry::FILE, "README", 528,
- 2007, 11, 1, 0, 0 },
- { "g a r b a g e 1 ftp ftp 528 Nov 01 2007 README",
- FtpDirectoryListingEntry::FILE, "README", 528,
- 2007, 11, 1, 0, 0 },
+ {"-rw-r--r-- 1 ftp ftp 528 Nov 01 2007 README",
+ FtpDirectoryListingEntry::FILE, "README", 528, 2007, 11, 1, 0, 0},
+ {"drwxr-xr-x 3 ftp ftp 4096 May 15 18:11 directory",
+ FtpDirectoryListingEntry::DIRECTORY, "directory", -1, 1994, 5, 15, 18,
+ 11},
+ {"lrwxrwxrwx 1 0 0 26 Sep 18 2008 pub -> vol/1/.CLUSTER/var_ftp/pub",
+ FtpDirectoryListingEntry::SYMLINK, "pub", -1, 2008, 9, 18, 0, 0},
+ {"lrwxrwxrwx 1 0 0 3 Oct 12 13:37 mirror -> pub",
+ FtpDirectoryListingEntry::SYMLINK, "mirror", -1, 1994, 10, 12, 13, 37},
+ {"drwxrwsr-x 4 501 501 4096 Feb 20 2007 pub",
+ FtpDirectoryListingEntry::DIRECTORY, "pub", -1, 2007, 2, 20, 0, 0},
+ {"drwxr-xr-x 4 (?) (?) 4096 Apr 8 2007 jigdo",
+ FtpDirectoryListingEntry::DIRECTORY, "jigdo", -1, 2007, 4, 8, 0, 0},
+ {"drwx-wx-wt 2 root wheel 512 Jul 1 02:15 incoming",
+ FtpDirectoryListingEntry::DIRECTORY, "incoming", -1, 1994, 7, 1, 2, 15},
+ {"-rw-r--r-- 1 2 3 3447432 May 18 2009 Foo - Manual.pdf",
+ FtpDirectoryListingEntry::FILE, "Foo - Manual.pdf", 3447432, 2009, 5, 18,
+ 0, 0},
+ {"d-wx-wx-wt+ 4 ftp 989 512 Dec 8 15:54 incoming",
+ FtpDirectoryListingEntry::DIRECTORY, "incoming", -1, 1993, 12, 8, 15,
+ 54},
+ {"drwxrwxrwx 1 owner group 1024 Sep 13 0:30 audio",
+ FtpDirectoryListingEntry::DIRECTORY, "audio", -1, 1994, 9, 13, 0, 30},
+ {"lrwxrwxrwx 1 0 0 26 Sep 18 2008 pub",
+ FtpDirectoryListingEntry::SYMLINK, "pub", -1, 2008, 9, 18, 0, 0},
+ {"-rw-r--r-- 1 ftp ftp -528 Nov 01 2007 README",
+ FtpDirectoryListingEntry::FILE, "README", -1, 2007, 11, 1, 0, 0},
+
+ // Tests for the wu-ftpd variant:
+ {"drwxr-xr-x 2 sys 512 Mar 27 2009 pub",
+ FtpDirectoryListingEntry::DIRECTORY, "pub", -1, 2009, 3, 27, 0, 0},
+ {"lrwxrwxrwx 0 0 26 Sep 18 2008 pub -> vol/1/.CLUSTER/var_ftp/pub",
+ FtpDirectoryListingEntry::SYMLINK, "pub", -1, 2008, 9, 18, 0, 0},
+ {"drwxr-xr-x (?) (?) 4096 Apr 8 2007 jigdo",
+ FtpDirectoryListingEntry::DIRECTORY, "jigdo", -1, 2007, 4, 8, 0, 0},
+ {"-rw-r--r-- 2 3 3447432 May 18 2009 Foo - Manual.pdf",
+ FtpDirectoryListingEntry::FILE, "Foo - Manual.pdf", 3447432, 2009, 5, 18,
+ 0, 0},
+
+ // Tests for "ls -l" style listings sent by an OS/2 server (FtpServer):
+ {"-r--r--r-- 1 ftp -A--- 13274 Mar 1 2006 UpTime.exe",
+ FtpDirectoryListingEntry::FILE, "UpTime.exe", 13274, 2006, 3, 1, 0, 0},
+ {"dr--r--r-- 1 ftp ----- 0 Nov 17 17:08 kernels",
+ FtpDirectoryListingEntry::DIRECTORY, "kernels", -1, 1993, 11, 17, 17, 8},
+
+ // Tests for "ls -l" style listing sent by Xplain FTP Server.
+ {"drwxr-xr-x folder 0 Jul 17 2006 online",
+ FtpDirectoryListingEntry::DIRECTORY, "online", -1, 2006, 7, 17, 0, 0},
+
+ // Tests for "ls -l" style listing with owning group name
+ // not separated from file size (http://crbug.com/58963).
+ {"-rw-r--r-- 1 ftpadmin ftpadmin125435904 Apr 9 2008 .pureftpd-upload",
+ FtpDirectoryListingEntry::FILE, ".pureftpd-upload", 0, 2008, 4, 9, 0, 0},
+
+ // Tests for "ls -l" style listing with number of links
+ // not separated from permission listing (http://crbug.com/70394).
+ {"drwxr-xr-x1732 266 111 90112 Jun 21 2001 .rda_2",
+ FtpDirectoryListingEntry::DIRECTORY, ".rda_2", -1, 2001, 6, 21, 0, 0},
+
+ // Tests for "ls -l" style listing with group name containing spaces.
+ {"drwxrwxr-x 3 %%%% Domain Users 4096 Dec 9 2009 %%%%%",
+ FtpDirectoryListingEntry::DIRECTORY, "%%%%%", -1, 2009, 12, 9, 0, 0},
+
+ // Tests for "ls -l" style listing in Russian locale (note the swapped
+ // parts order: the day of month is the first, before month).
+ {"-rwxrwxr-x 1 ftp ftp 123 23 \xd0\xbc\xd0\xb0\xd0\xb9 2011 test",
+ FtpDirectoryListingEntry::FILE, "test", 123, 2011, 5, 23, 0, 0},
+ {"drwxrwxr-x 1 ftp ftp 4096 19 \xd0\xbe\xd0\xba\xd1\x82 2011 dir",
+ FtpDirectoryListingEntry::DIRECTORY, "dir", -1, 2011, 10, 19, 0, 0},
+
+ // Plan9 sends entry type "a" for append-only files.
+ {"ar-xr-xr-x 2 none none 512 Apr 26 17:52 plan9",
+ FtpDirectoryListingEntry::FILE, "plan9", 512, 1994, 4, 26, 17, 52},
+
+ // Hylafax sends a shorter permission listing.
+ {"drwxrwx 2 10 4096 Jul 28 02:41 tmp",
+ FtpDirectoryListingEntry::DIRECTORY, "tmp", -1, 1994, 7, 28, 2, 41},
+
+ // Completely different date format (YYYY-MM-DD).
+ {"drwxrwxrwx 2 root root 4096 2012-02-07 00:31 notas_servico",
+ FtpDirectoryListingEntry::DIRECTORY, "notas_servico", -1, 2012, 2, 7, 0,
+ 31},
+ {"-rwxrwxrwx 2 root root 4096 2012-02-07 00:31 notas_servico",
+ FtpDirectoryListingEntry::FILE, "notas_servico", 4096, 2012, 2, 7, 0,
+ 31},
+
+ // Weird permission bits.
+ {"drwx--l--- 2 0 10 512 Dec 22 1994 swetzel",
+ FtpDirectoryListingEntry::DIRECTORY, "swetzel", -1, 1994, 12, 22, 0, 0},
+ {"drwxrwxr-x 1 500 244 660 Jan 1 00:0 bin",
+ FtpDirectoryListingEntry::DIRECTORY, "bin", -1, 1994, 1, 1, 0, 0},
+
+ // Garbage in date (but still parseable).
+ {"lrw-rw-rw- 1 user group 542 "
+ "/t11/member/incomingFeb 8 2007 "
+ "Shortcut to incoming.lnk -> /t11/member/incoming",
+ FtpDirectoryListingEntry::SYMLINK, "Shortcut to incoming.lnk", -1, 2007,
+ 2, 8, 0, 0},
+
+ // Garbage in permissions (with no effect on other bits).
+ // Also test multiple "columns" resulting from the garbage.
+ {"garbage 1 ftp ftp 528 Nov 01 2007 README",
+ FtpDirectoryListingEntry::FILE, "README", 528, 2007, 11, 1, 0, 0},
+ {"gar bage 1 ftp ftp 528 Nov 01 2007 README",
+ FtpDirectoryListingEntry::FILE, "README", 528, 2007, 11, 1, 0, 0},
+ {"g a r b a g e 1 ftp ftp 528 Nov 01 2007 README",
+ FtpDirectoryListingEntry::FILE, "README", 528, 2007, 11, 1, 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<FtpDirectoryListingEntry> entries;
- EXPECT_TRUE(ParseFtpDirectoryListingLs(
- GetSingleLineTestCase(good_cases[i].input),
- GetMockCurrentTime(),
- &entries));
+ EXPECT_TRUE(
+ ParseFtpDirectoryListingLs(GetSingleLineTestCase(good_cases[i].input),
+ GetMockCurrentTime(),
+ &entries));
VerifySingleLineTestCase(good_cases[i], entries);
}
}
TEST_F(FtpDirectoryListingParserLsTest, Ignored) {
const char* ignored_cases[] = {
- "drwxr-xr-x 2 0 0 4096 Mar 18 2007 ", // http://crbug.com/60065
-
- "ftpd: .: Permission denied",
- "ftpd-BSD: .: Permission denied",
- "ls: .: EDC5111I Permission denied.",
-
- // Tests important for security: verify that after we detect the column
- // offset we don't try to access invalid memory on malformed input.
- "drwxr-xr-x 3 ftp ftp 4096 May 15 18:11",
- "drwxr-xr-x 3 ftp 4096 May 15 18:11",
- "drwxr-xr-x folder 0 May 15 18:11",
+ "drwxr-xr-x 2 0 0 4096 Mar 18 2007 ", // http://crbug.com/60065
+ "ftpd: .: Permission denied",
+ "ftpd-BSD: .: Permission denied",
+ "ls: .: EDC5111I Permission denied.",
+
+ // Tests important for security: verify that after we detect the column
+ // offset we don't try to access invalid memory on malformed input.
+ "drwxr-xr-x 3 ftp ftp 4096 May 15 18:11",
+ "drwxr-xr-x 3 ftp 4096 May 15 18:11",
+ "drwxr-xr-x folder 0 May 15 18:11",
};
for (size_t i = 0; i < arraysize(ignored_cases); i++) {
- SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i,
- ignored_cases[i]));
+ SCOPED_TRACE(
+ base::StringPrintf("Test[%" PRIuS "]: %s", i, ignored_cases[i]));
std::vector<FtpDirectoryListingEntry> entries;
- EXPECT_TRUE(ParseFtpDirectoryListingLs(
- GetSingleLineTestCase(ignored_cases[i]),
- GetMockCurrentTime(),
- &entries));
+ EXPECT_TRUE(
+ ParseFtpDirectoryListingLs(GetSingleLineTestCase(ignored_cases[i]),
+ GetMockCurrentTime(),
+ &entries));
EXPECT_EQ(0U, entries.size());
}
}
TEST_F(FtpDirectoryListingParserLsTest, Bad) {
const char* bad_cases[] = {
- " foo",
- "garbage",
- "-rw-r--r-- ftp ftp",
- "-rw-r--r-- ftp ftp 528 Foo 01 2007 README",
- "-rw-r--r-- 1 ftp ftp",
- "-rw-r--r-- 1 ftp ftp 528 Foo 01 2007 README",
-
- // Invalid month value (30).
- "drwxrwxrwx 2 root root 4096 2012-30-07 00:31 notas_servico",
+ " foo",
+ "garbage",
+ "-rw-r--r-- ftp ftp",
+ "-rw-r--r-- ftp ftp 528 Foo 01 2007 README",
+ "-rw-r--r-- 1 ftp ftp",
+ "-rw-r--r-- 1 ftp ftp 528 Foo 01 2007 README",
+
+ // Invalid month value (30).
+ "drwxrwxrwx 2 root root 4096 2012-30-07 00:31 notas_servico",
};
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<FtpDirectoryListingEntry> entries;
- EXPECT_FALSE(ParseFtpDirectoryListingLs(GetSingleLineTestCase(bad_cases[i]),
- GetMockCurrentTime(),
- &entries));
+ EXPECT_FALSE(ParseFtpDirectoryListingLs(
+ GetSingleLineTestCase(bad_cases[i]), GetMockCurrentTime(), &entries));
}
}
« net/base/mime_util_unittest.cc ('K') | « net/ftp/ftp_directory_listing_parser_ls.cc ('k') | net/ftp/ftp_directory_listing_parser_netware.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698