FTP: Detect the character encoding only after the entire listing is received.

net/ftp/ftp_directory_listing_parser_unittest.cc

-// Copyright (c) 2009 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.
 
-#include "net/ftp/ftp_directory_listing_buffer.h"
+#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/string_number_conversions.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.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 {
 
 TEST(FtpDirectoryListingBufferTest, Parse) {
   const char* test_files[] = {
     "dir-listing-ls-1",
     "dir-listing-ls-1-utf8",
     "dir-listing-ls-2",
     "dir-listing-ls-3",
     "dir-listing-ls-4",
     "dir-listing-ls-5",
@@ skipping 38 matching lines @@
   mock_current_time_exploded.month = 11;
   mock_current_time_exploded.day_of_month = 15;
   mock_current_time_exploded.hour = 12;
   mock_current_time_exploded.minute = 45;
   base::Time mock_current_time(
       base::Time::FromLocalExploded(mock_current_time_exploded));
 
   for (size_t i = 0; i < arraysize(test_files); i++) {
     SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]: %s", i, test_files[i]));
 
-    net::FtpDirectoryListingBuffer buffer(mock_current_time);
-
     std::string test_listing;
     EXPECT_TRUE(file_util::ReadFileToString(test_dir.AppendASCII(test_files[i]),
                                             &test_listing));
 
-    EXPECT_EQ(net::OK, buffer.ConsumeData(test_listing.data(),
-                                          test_listing.length()));
-    EXPECT_EQ(net::OK, buffer.ProcessRemainingData());
+    std::vector<FtpDirectoryListingEntry> entries;
+    EXPECT_EQ(OK, ParseFtpDirectoryListing(test_listing,
+                                           mock_current_time,
+                                           &entries));
 
     std::string expected_listing;
     ASSERT_TRUE(file_util::ReadFileToString(
         test_dir.AppendASCII(std::string(test_files[i]) + ".expected"),
         &expected_listing));
 
     std::vector<std::string> lines;
     StringTokenizer tokenizer(expected_listing, "\r\n");
     while (tokenizer.GetNext())
       lines.push_back(tokenizer.token());
     ASSERT_EQ(0U, lines.size() % 8);
 
+    ASSERT_EQ(lines.size() / 8, entries.size());

[eroman, 2011/03/24 23:09:35]

nit: these two asserts could be combined into one:

ASSERT_EQ(8 * entries.size(), lines.size());

(I am fine either way).

[Paweł Hajdan Jr., 2011/03/26 09:47:50]

Done.

+
     for (size_t i = 0; i < lines.size() / 8; i++) {
       std::string type(lines[8 * i]);
       std::string name(lines[8 * i + 1]);
       int64 size;
       base::StringToInt64(lines[8 * 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);
 
-      ASSERT_TRUE(buffer.EntryAvailable());
-      net::FtpDirectoryListingEntry entry = buffer.PopEntry();
+      FtpDirectoryListingEntry entry = entries[i];

[eroman, 2011/03/24 23:09:35]

nit: could make this |const FtpDirectoryListingEntry&|

[Paweł Hajdan Jr., 2011/03/26 09:47:50]

Done.

 
       if (type == "d") {
-        EXPECT_EQ(net::FtpDirectoryListingEntry::DIRECTORY, entry.type);
+        EXPECT_EQ(FtpDirectoryListingEntry::DIRECTORY, entry.type);
       } else if (type == "-") {
-        EXPECT_EQ(net::FtpDirectoryListingEntry::FILE, entry.type);
+        EXPECT_EQ(FtpDirectoryListingEntry::FILE, entry.type);
       } else if (type == "l") {
-        EXPECT_EQ(net::FtpDirectoryListingEntry::SYMLINK, entry.type);
+        EXPECT_EQ(FtpDirectoryListingEntry::SYMLINK, entry.type);
       } else {
         ADD_FAILURE() << "invalid gold test data: " << type;
       }
 
       EXPECT_EQ(UTF8ToUTF16(name), entry.name);
       EXPECT_EQ(size, entry.size);
 
       base::Time::Exploded time_exploded;
       entry.last_modified.LocalExplode(&time_exploded);
       EXPECT_EQ(year, time_exploded.year);
       EXPECT_EQ(month, time_exploded.month);
       EXPECT_EQ(day_of_month, time_exploded.day_of_month);
       EXPECT_EQ(hour, time_exploded.hour);
       EXPECT_EQ(minute, time_exploded.minute);
     }
-    EXPECT_FALSE(buffer.EntryAvailable());
   }
 }
 
 }  // namespace
+
+}  // namespace net