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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/ftp/ftp_directory_listing_parser_os2_unittest.cc

Issue 7590011: FTP: add directory listing parser for OS/2 format. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 9 years, 4 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_os2.cc ('k') | net/ftp/ftp_directory_listing_parser_unittest.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_os2_unittest.cc
diff --git a/net/ftp/ftp_directory_listing_parser_windows_unittest.cc b/net/ftp/ftp_directory_listing_parser_os2_unittest.cc
similarity index 51%
copy from net/ftp/ftp_directory_listing_parser_windows_unittest.cc
copy to net/ftp/ftp_directory_listing_parser_os2_unittest.cc
index 7517baf55d1329e768bc45b0cfc4302315ed7ef9..096c5b9b9dd756eb544bc11dafe0a9d2b2cf3ed4 100644
--- a/net/ftp/ftp_directory_listing_parser_windows_unittest.cc
+++ b/net/ftp/ftp_directory_listing_parser_os2_unittest.cc
@@ -7,53 +7,47 @@
#include "base/format_macros.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
-#include "net/ftp/ftp_directory_listing_parser_windows.h"
+#include "net/ftp/ftp_directory_listing_parser_os2.h"
namespace net {
namespace {
-typedef FtpDirectoryListingParserTest FtpDirectoryListingParserWindowsTest;
+typedef FtpDirectoryListingParserTest FtpDirectoryListingParserOS2Test;
-TEST_F(FtpDirectoryListingParserWindowsTest, Good) {
+TEST_F(FtpDirectoryListingParserOS2Test, Good) {
const struct SingleLineTestData good_cases[] = {
- { "11-02-09 05:32PM <DIR> NT",
+ { "0 DIR 11-02-09 17:32 NT",
FtpDirectoryListingEntry::DIRECTORY, "NT", -1,
2009, 11, 2, 17, 32 },
- { "01-06-09 02:42PM 458 Readme.txt",
+ { "458 A 01-06-09 14:42 Readme.txt",
FtpDirectoryListingEntry::FILE, "Readme.txt", 458,
2009, 1, 6, 14, 42 },
- { "01-06-09 02:42AM 1 Readme.txt",
+ { "1 A 01-06-09 02:42 Readme.txt",
FtpDirectoryListingEntry::FILE, "Readme.txt", 1,
2009, 1, 6, 2, 42 },
- { "01-06-01 02:42AM 458 Readme.txt",
+ { "458 A 01-06-01 02:42 Readme.txt",
FtpDirectoryListingEntry::FILE, "Readme.txt", 458,
2001, 1, 6, 2, 42 },
- { "01-06-00 02:42AM 458 Corner1.txt",
+ { "458 A 01-06-00 02:42 Corner1.txt",
FtpDirectoryListingEntry::FILE, "Corner1.txt", 458,
2000, 1, 6, 2, 42 },
- { "01-06-99 02:42AM 458 Corner2.txt",
+ { "458 A 01-06-99 02:42 Corner2.txt",
FtpDirectoryListingEntry::FILE, "Corner2.txt", 458,
1999, 1, 6, 2, 42 },
- { "01-06-80 02:42AM 458 Corner3.txt",
+ { "458 A 01-06-80 02:42 Corner3.txt",
FtpDirectoryListingEntry::FILE, "Corner3.txt", 458,
1980, 1, 6, 2, 42 },
-#if !defined(OS_LINUX)
- // TODO(phajdan.jr): Re-enable when 2038-year problem is fixed on Linux.
- { "01-06-79 02:42AM 458 Corner4",
- FtpDirectoryListingEntry::FILE, "Corner4", 458,
- 2079, 1, 6, 2, 42 },
-#endif // !defined (OS_LINUX)
- { "01-06-1979 02:42AM 458 Readme.txt",
+ { "458 A 01-06-1979 02:42 Readme.txt",
FtpDirectoryListingEntry::FILE, "Readme.txt", 458,
1979, 1, 6, 2, 42 },
- { "11-02-09 05:32PM <DIR> My Directory",
+ { "0 DIR 11-02-09 17:32 My Directory",
FtpDirectoryListingEntry::DIRECTORY, "My Directory", -1,
2009, 11, 2, 17, 32 },
- { "12-25-10 12:00AM <DIR> Christmas Midnight",
+ { "0 DIR 12-25-10 00:00 Christmas Midnight",
FtpDirectoryListingEntry::DIRECTORY, "Christmas Midnight", -1,
2010, 12, 25, 0, 0 },
- { "12-25-10 12:00PM <DIR> Christmas Midday",
+ { "0 DIR 12-25-10 12:00 Christmas Midday",
FtpDirectoryListingEntry::DIRECTORY, "Christmas Midday", -1,
2010, 12, 25, 12, 0 },
};
@@ -62,60 +56,56 @@ TEST_F(FtpDirectoryListingParserWindowsTest, Good) {
good_cases[i].input));
std::vector<FtpDirectoryListingEntry> entries;
- EXPECT_TRUE(ParseFtpDirectoryListingWindows(
+ EXPECT_TRUE(ParseFtpDirectoryListingOS2(
GetSingleLineTestCase(good_cases[i].input),
&entries));
VerifySingleLineTestCase(good_cases[i], entries);
}
}
-TEST_F(FtpDirectoryListingParserWindowsTest, Ignored) {
+TEST_F(FtpDirectoryListingParserOS2Test, Ignored) {
const char* ignored_cases[] = {
- "12-07-10 12:05AM <DIR> ", // http://crbug.com/66097
- "12-07-10 12:05AM 1234 ",
+ "1234 A 12-07-10 12:05",
+ "0 DIR 11-02-09 05:32",
};
for (size_t i = 0; i < arraysize(ignored_cases); i++) {
SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i,
ignored_cases[i]));
std::vector<FtpDirectoryListingEntry> entries;
- EXPECT_TRUE(ParseFtpDirectoryListingWindows(
+ EXPECT_TRUE(ParseFtpDirectoryListingOS2(
GetSingleLineTestCase(ignored_cases[i]),
&entries));
EXPECT_EQ(0U, entries.size());
}
}
-TEST_F(FtpDirectoryListingParserWindowsTest, Bad) {
+TEST_F(FtpDirectoryListingParserOS2Test, Bad) {
const char* bad_cases[] = {
"garbage",
- "11-02-09 05:32PM <GARBAGE>",
- "11-02-09 05:32PM <GARBAGE> NT",
- "11-02-09 05:32 <DIR>",
- "11-FEB-09 05:32PM <DIR>",
- "11-02 05:32PM <DIR>",
- "11-02-09 05:32PM -1",
- "11-02-09 05:32 <DIR> NT",
- "11-FEB-09 05:32PM <DIR> NT",
- "11-02 05:32PM <DIR> NT",
- "11-02-09 05:32PM -1 NT",
- "99-25-10 12:00AM 0",
- "12-99-10 12:00AM 0",
- "12-25-10 99:00AM 0",
- "12-25-10 12:99AM 0",
- "12-25-10 12:00ZM 0",
- "99-25-10 12:00AM 0 months out of range",
- "12-99-10 12:00AM 0 days out of range",
- "12-25-10 99:00AM 0 hours out of range",
- "12-25-10 12:99AM 0 minutes out of range",
- "12-25-10 12:00ZM 0 what does ZM mean",
+ "0 GARBAGE 11-02-09 05:32",
+ "0 GARBAGE 11-02-09 05:32 NT",
+ "0 DIR 11-FEB-09 05:32",
+ "0 DIR 11-02 05:32",
+ "-1 A 11-02-09 05:32",
+ "0 DIR 11-FEB-09 05:32",
+ "0 DIR 11-02 05:32 NT",
+ "-1 A 11-02-09 05:32 NT",
+ "0 A 99-25-10 12:00",
+ "0 A 12-99-10 12:00",
+ "0 A 12-25-10 99:00",
+ "0 A 12-25-10 12:99",
+ "0 A 99-25-10 12:00 months out of range",
+ "0 A 12-99-10 12:00 days out of range",
+ "0 A 12-25-10 99:00 hours out of range",
+ "0 A 12-25-10 12:99 minutes out of range",
};
for (size_t i = 0; i < arraysize(bad_cases); i++) {
SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i,
bad_cases[i]));
std::vector<FtpDirectoryListingEntry> entries;
- EXPECT_FALSE(ParseFtpDirectoryListingWindows(
+ EXPECT_FALSE(ParseFtpDirectoryListingOS2(
GetSingleLineTestCase(bad_cases[i]),
&entries));
}
« no previous file with comments | « net/ftp/ftp_directory_listing_parser_os2.cc ('k') | net/ftp/ftp_directory_listing_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698