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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/ftp/ftp_directory_listing_parser_vms_unittest.cc

Issue 6670085: FTP: Detect the character encoding only after the entire listing is received. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: test coverage Created 9 years, 9 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
« no previous file with comments | « net/ftp/ftp_directory_listing_parser_vms.cc ('k') | net/ftp/ftp_directory_listing_parser_windows.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 eb1554d1734d982d5bef78de0347bec26b7d3a27..6643e16065a821197c60d3f32fd36f4137149fe2 100644
--- a/net/ftp/ftp_directory_listing_parser_vms_unittest.cc
+++ b/net/ftp/ftp_directory_listing_parser_vms_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -11,113 +11,154 @@
#include "base/utf_string_conversions.h"
#include "net/ftp/ftp_directory_listing_parser_vms.h"
+namespace net {
+
namespace {
-typedef net::FtpDirectoryListingParserTest FtpDirectoryListingParserVmsTest;
+typedef FtpDirectoryListingParserTest FtpDirectoryListingParserVmsTest;
TEST_F(FtpDirectoryListingParserVmsTest, Good) {
const struct SingleLineTestData good_cases[] = {
{ "README.TXT;4 2 18-APR-2000 10:40:39.90",
- net::FtpDirectoryListingEntry::FILE, "readme.txt", 1024,
+ 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,
+ FtpDirectoryListingEntry::FILE, ".welcome", 1024,
2002, 2, 13, 23, 32 },
{ "FILE.;1 2 13-FEB-2002 23:32:40.47",
- net::FtpDirectoryListingEntry::FILE, "file.", 1024,
+ 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,
+ 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,
+ 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,
+ 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,
+ 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,
+ 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,
+ FtpDirectoryListingEntry::FILE, "announce.txt", 512,
2005, 3, 12, 8, 44 },
};
for (size_t i = 0; i < arraysize(good_cases); i++) {
SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i,
good_cases[i].input));
- net::FtpDirectoryListingParserVms parser;
- ASSERT_TRUE(
- parser.ConsumeLine(ASCIIToUTF16("Directory ANONYMOUS_ROOT:[000000]")));
- RunSingleLineTestCase(&parser, good_cases[i]);
+ std::vector<string16> lines(GetSingleLineTestCase(good_cases[i].input));
+
+ // The parser requires a directory header before accepting regular input.
+ lines.insert(lines.begin(),
+ 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."));
+
+ std::vector<FtpDirectoryListingEntry> entries;
+ EXPECT_TRUE(ParseFtpDirectoryListingVms(lines,
+ &entries));
+ VerifySingleLineTestCase(good_cases[i], entries);
}
}
TEST_F(FtpDirectoryListingParserVmsTest, Bad) {
const char* bad_cases[] = {
- "Directory ROOT|garbage",
+ "garbage",
// Missing file version number.
- "Directory ROOT|README.TXT 2 18-APR-2000 10:40:39",
+ "README.TXT 2 18-APR-2000 10:40:39",
// Missing extension.
- "Directory ROOT|README;1 2 18-APR-2000 10:40:39",
+ "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",
+ "README.TXT;1 garbage 18-APR-2000 10:40:39",
+ "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",
+ "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.
- "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)",
+ "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]));
- std::vector<std::string> lines;
- base::SplitString(bad_cases[i], '|', &lines);
- net::FtpDirectoryListingParserVms 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;
- }
+ std::vector<string16> lines(GetSingleLineTestCase(bad_cases[i]));
+
+ // The parser requires a directory header before accepting regular input.
+ lines.insert(lines.begin(),
+ 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."));
+
+ std::vector<FtpDirectoryListingEntry> 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]",
+ };
+ for (size_t i = 0; i < arraysize(bad_cases); i++) {
+ SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i, bad_cases[i]));
+
+ std::vector<string16> lines(
+ GetSingleLineTestCase("README.TXT;4 2 18-APR-2000 10:40:39.90"));
+
+ // The parser requires a directory header before accepting regular input.
+ lines.insert(lines.begin(),
+ 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."));
+
+ {
+ // Make sure the listing is valid before we add data after footer.
+ std::vector<FtpDirectoryListingEntry> 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]));
+ std::vector<FtpDirectoryListingEntry> entries;
+ EXPECT_FALSE(ParseFtpDirectoryListingVms(lines,
+ &entries));
}
- EXPECT_TRUE(failed);
}
}
} // namespace
+
+} // namespace net
« no previous file with comments | « net/ftp/ftp_directory_listing_parser_vms.cc ('k') | net/ftp/ftp_directory_listing_parser_windows.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698