| Index: net/ftp/ftp_directory_listing_parsers_unittest.cc
|
| diff --git a/net/ftp/ftp_directory_listing_parsers_unittest.cc b/net/ftp/ftp_directory_listing_parsers_unittest.cc
|
| index b7d949959121749ed79f4ccf65e60a1adc2a3f99..cc05f36bb3747e83c8d30d3a464212f541165be8 100644
|
| --- a/net/ftp/ftp_directory_listing_parsers_unittest.cc
|
| +++ b/net/ftp/ftp_directory_listing_parsers_unittest.cc
|
| @@ -8,7 +8,7 @@
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace {
|
| -
|
| +
|
| struct SingleLineTestData {
|
| const char* input;
|
| net::FtpDirectoryListingEntry::Type type;
|
| @@ -25,7 +25,7 @@ class FtpDirectoryListingParsersTest : public testing::Test {
|
| protected:
|
| FtpDirectoryListingParsersTest() {
|
| }
|
| -
|
| +
|
| void RunSingleLineTestCase(net::FtpDirectoryListingParser* parser,
|
| const SingleLineTestData& test_case) {
|
| ASSERT_TRUE(parser->ConsumeLine(UTF8ToUTF16(test_case.input)));
|
| @@ -34,7 +34,7 @@ class FtpDirectoryListingParsersTest : public testing::Test {
|
| EXPECT_EQ(test_case.type, entry.type);
|
| EXPECT_EQ(UTF8ToUTF16(test_case.filename), entry.name);
|
| EXPECT_EQ(test_case.size, entry.size);
|
| -
|
| +
|
| base::Time::Exploded time_exploded;
|
| entry.last_modified.LocalExplode(&time_exploded);
|
| EXPECT_EQ(test_case.year, time_exploded.year);
|
| @@ -45,7 +45,7 @@ class FtpDirectoryListingParsersTest : public testing::Test {
|
| EXPECT_EQ(0, time_exploded.second);
|
| EXPECT_EQ(0, time_exploded.millisecond);
|
| }
|
| -
|
| +
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(FtpDirectoryListingParsersTest);
|
| };
|
| @@ -53,7 +53,7 @@ class FtpDirectoryListingParsersTest : public testing::Test {
|
| TEST_F(FtpDirectoryListingParsersTest, Ls) {
|
| base::Time::Exploded now_exploded;
|
| base::Time::Now().LocalExplode(&now_exploded);
|
| -
|
| +
|
| const struct SingleLineTestData good_cases[] = {
|
| { "-rw-r--r-- 1 ftp ftp 528 Nov 01 2007 README",
|
| net::FtpDirectoryListingEntry::FILE, "README", 528,
|
| @@ -70,11 +70,11 @@ TEST_F(FtpDirectoryListingParsersTest, Ls) {
|
| };
|
| for (size_t i = 0; i < arraysize(good_cases); i++) {
|
| SCOPED_TRACE(StringPrintf("Test[%d]: %s", i, good_cases[i].input));
|
| -
|
| +
|
| net::FtpLsDirectoryListingParser parser;
|
| RunSingleLineTestCase(&parser, good_cases[i]);
|
| }
|
| -
|
| +
|
| const char* bad_cases[] = {
|
| "",
|
| "garbage",
|
| @@ -92,4 +92,106 @@ TEST_F(FtpDirectoryListingParsersTest, Ls) {
|
| }
|
| }
|
|
|
| +TEST_F(FtpDirectoryListingParsersTest, Vms) {
|
| + const struct SingleLineTestData good_cases[] = {
|
| + { "README.TXT;4 2 18-APR-2000 10:40:39.90",
|
| + net::FtpDirectoryListingEntry::FILE, "readme.txt", 1024,
|
| + 2000, 4, 18, 10, 40 },
|
| + { ".WELCOME;1 2 13-FEB-2002 23:32:40.47",
|
| + net::FtpDirectoryListingEntry::FILE, ".welcome", 1024,
|
| + 2002, 2, 13, 23, 32 },
|
| + { "FILE.;1 2 13-FEB-2002 23:32:40.47",
|
| + net::FtpDirectoryListingEntry::FILE, "file.", 1024,
|
| + 2002, 2, 13, 23, 32 },
|
| + { "EXAMPLE.TXT;1 1 4-NOV-2009 06:02 [JOHNDOE] (RWED,RWED,,)",
|
| + net::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)",
|
| + net::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)",
|
| + net::FtpDirectoryListingEntry::DIRECTORY, "test", -1,
|
| + 1999, 3, 4, 22, 14 },
|
| + { "ANNOUNCE.TXT;2 1 12-MAR-2005 08:44:57 [X] (,,,)",
|
| + net::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)",
|
| + net::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)",
|
| + net::FtpDirectoryListingEntry::FILE, "announce.txt", 512,
|
| + 2005, 3, 12, 8, 44 },
|
| + };
|
| + for (size_t i = 0; i < arraysize(good_cases); i++) {
|
| + SCOPED_TRACE(StringPrintf("Test[%d]: %s", i, good_cases[i].input));
|
| +
|
| + net::FtpVmsDirectoryListingParser parser;
|
| + ASSERT_TRUE(
|
| + parser.ConsumeLine(ASCIIToUTF16("Directory ANONYMOUS_ROOT:[000000]")));
|
| + RunSingleLineTestCase(&parser, good_cases[i]);
|
| + }
|
| +
|
| + const char* bad_cases[] = {
|
| + "Directory ROOT|garbage",
|
| +
|
| + // Missing file version number.
|
| + "Directory ROOT|README.TXT 2 18-APR-2000 10:40:39",
|
| +
|
| + // Missing extension.
|
| + "Directory ROOT|README;1 2 18-APR-2000 10:40:39",
|
| +
|
| + // Malformed file size.
|
| + "Directory ROOT|README.TXT;1 garbage 18-APR-2000 10:40:39",
|
| + "Directory ROOT|README.TXT;1 -2 18-APR-2000 10:40:39",
|
| +
|
| + // Malformed date.
|
| + "Directory ROOT|README.TXT;1 2 APR-2000 10:40:39",
|
| + "Directory ROOT|README.TXT;1 2 -18-APR-2000 10:40:39",
|
| + "Directory ROOT|README.TXT;1 2 18-APR 10:40:39",
|
| + "Directory ROOT|README.TXT;1 2 18-APR-2000 10",
|
| + "Directory ROOT|README.TXT;1 2 18-APR-2000 10:40.25",
|
| + "Directory ROOT|README.TXT;1 2 18-APR-2000 10:40.25.25",
|
| +
|
| + // Empty line inside the listing.
|
| + "Directory ROOT|README.TXT;1 2 18-APR-2000 10:40:42"
|
| + "||README.TXT;1 2 18-APR-2000 10:40:42",
|
| +
|
| + // Data after footer.
|
| + "Directory ROOT|README.TXT;4 2 18-APR-2000 10:40:39"
|
| + "||Total of 1 file|",
|
| + "Directory ROOT|README.TXT;4 2 18-APR-2000 10:40:39"
|
| + "||Total of 1 file|garbage",
|
| + "Directory ROOT|README.TXT;4 2 18-APR-2000 10:40:39"
|
| + "||Total of 1 file|Total of 1 file",
|
| +
|
| + // Malformed security information.
|
| + "Directory ROOT|X.TXT;2 1 12-MAR-2005 08:44:57 (RWED,RWED,RE,RE)",
|
| + "Directory ROOT|X.TXT;2 1 12-MAR-2005 08:44:57 [SYSTEM]",
|
| + "Directory ROOT|X.TXT;2 1 12-MAR-2005 08:44:57 (SYSTEM) (RWED,RWED,RE,RE)",
|
| + "Directory ROOT|X.TXT;2 1 12-MAR-2005 08:44:57 [SYSTEM] [RWED,RWED,RE,RE]",
|
| + "Directory ROOT|X.TXT;2 1 12-MAR-2005 08:44:57 [X] (RWED)",
|
| + "Directory ROOT|X.TXT;2 1 12-MAR-2005 08:44:57 [X] (RWED,RWED,RE,RE,RE)",
|
| + "Directory ROOT|X.TXT;2 1 12-MAR-2005 08:44:57 [X] (RWED,RWEDRWED,RE,RE)",
|
| + "Directory ROOT|X.TXT;2 1 12-MAR-2005 08:44:57 [X] (RWED,DEWR,RE,RE)",
|
| + "Directory ROOT|X.TXT;2 1 12-MAR-2005 08:44:57 [X] (RWED,RWED,Q,RE)",
|
| + "Directory ROOT|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(StringPrintf("Test[%d]: %s", i, bad_cases[i]));
|
| +
|
| + std::vector<std::string> lines;
|
| + SplitString(bad_cases[i], '|', &lines);
|
| + net::FtpVmsDirectoryListingParser parser;
|
| + bool failed = false;
|
| + for (std::vector<std::string>::const_iterator i = lines.begin();
|
| + i != lines.end(); ++i) {
|
| + if (!parser.ConsumeLine(UTF8ToUTF16(*i))) {
|
| + failed = true;
|
| + break;
|
| + }
|
| + }
|
| + EXPECT_TRUE(failed);
|
| + }
|
| +}
|
| +
|
| } // namespace
|
|
|