FTP: correctly handle newlines in file names

net/ftp/ftp_directory_listing_parser_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "net/ftp/ftp_directory_listing_parser.h"
 
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
-#include "base/string_tokenizer.h"
+#include "base/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/net_errors.h"
 #include "net/ftp/ftp_directory_listing_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
 class FtpDirectoryListingParserTest
@@ skipping 26 matching lines @@
   EXPECT_EQ(OK, ParseFtpDirectoryListing(test_listing,
                                          mock_current_time,
                                          &entries));
 
   std::string expected_listing;
   ASSERT_TRUE(file_util::ReadFileToString(
                   test_dir.AppendASCII(std::string(GetParam()) + ".expected"),
                   &expected_listing));
 
   std::vector<std::string> lines;
-  StringTokenizer tokenizer(expected_listing, "\r\n");
-  while (tokenizer.GetNext())
-    lines.push_back(tokenizer.token());
+  base::SplitStringUsingSubstr(expected_listing, "\r\n", &lines);
 
-  ASSERT_EQ(8 * entries.size(), lines.size());
+  // Special case for empty listings.
+  if (lines.size() == 1 && lines[0].empty())
+    lines.clear();
 
-  for (size_t i = 0; i < lines.size() / 8; i++) {
-    std::string type(lines[8 * i]);
-    std::string name(lines[8 * i + 1]);
+  ASSERT_EQ(9 * entries.size(), lines.size());
+
+  for (size_t i = 0; i < lines.size() / 9; i++) {
+    std::string type(lines[9 * i]);
+    std::string name(lines[9 * i + 1]);
     int64 size;
-    base::StringToInt64(lines[8 * i + 2], &size);
+    base::StringToInt64(lines[9 * i + 2], &size);
 
     SCOPED_TRACE(base::StringPrintf("Filename: %s", name.c_str()));
 
     int year, month, day_of_month, hour, minute;
-    base::StringToInt(lines[8 * i + 3], &year);
-    base::StringToInt(lines[8 * i + 4], &month);
-    base::StringToInt(lines[8 * i + 5], &day_of_month);
-    base::StringToInt(lines[8 * i + 6], &hour);
-    base::StringToInt(lines[8 * i + 7], &minute);
+    base::StringToInt(lines[9 * i + 3], &year);
+    base::StringToInt(lines[9 * i + 4], &month);
+    base::StringToInt(lines[9 * i + 5], &day_of_month);
+    base::StringToInt(lines[9 * i + 6], &hour);
+    base::StringToInt(lines[9 * i + 7], &minute);
 
     const FtpDirectoryListingEntry& entry = entries[i];
 
     if (type == "d") {
       EXPECT_EQ(FtpDirectoryListingEntry::DIRECTORY, entry.type);
     } else if (type == "-") {
       EXPECT_EQ(FtpDirectoryListingEntry::FILE, entry.type);
     } else if (type == "l") {
       EXPECT_EQ(FtpDirectoryListingEntry::SYMLINK, entry.type);
     } else {
@@ skipping 42 matching lines @@
 
   // Tests for Russian listings. The only difference between those
   // files is character encoding:
   "dir-listing-ls-25",  // UTF-8
   "dir-listing-ls-26",  // KOI8-R
   "dir-listing-ls-27",  // windows-1251
 
   "dir-listing-ls-28",  // Hylafax FTP server
   "dir-listing-ls-29",
   "dir-listing-ls-30",
+  "dir-listing-ls-31",
 
   "dir-listing-netware-1",
   "dir-listing-netware-2",
   "dir-listing-netware-3",  // Spaces in file names.
   "dir-listing-os2-1",
   "dir-listing-vms-1",
   "dir-listing-vms-2",
   "dir-listing-vms-3",
   "dir-listing-vms-4",
   "dir-listing-vms-5",
   "dir-listing-windows-1",
   "dir-listing-windows-2",
 };
 
 INSTANTIATE_TEST_CASE_P(, FtpDirectoryListingParserTest,
                         testing::ValuesIn(kTestFiles));
 
 }  // namespace
 
 }  // namespace net