| Index: net/ftp/ftp_directory_listing_parser_unittest.cc
|
| diff --git a/net/ftp/ftp_directory_listing_parser_unittest.cc b/net/ftp/ftp_directory_listing_parser_unittest.cc
|
| index 145b90cc7b27eb1d1793d9a510049ae3d5990b98..437212b99ea11b995c4d4b51f8ae2d1b59e27250 100644
|
| --- a/net/ftp/ftp_directory_listing_parser_unittest.cc
|
| +++ b/net/ftp/ftp_directory_listing_parser_unittest.cc
|
| @@ -20,8 +20,7 @@ namespace net {
|
| namespace {
|
|
|
| class FtpDirectoryListingParserTest
|
| - : public testing::TestWithParam<const char*> {
|
| -};
|
| + : public testing::TestWithParam<const char*> {};
|
|
|
| TEST_P(FtpDirectoryListingParserTest, Parse) {
|
| base::FilePath test_dir;
|
| @@ -30,7 +29,7 @@ TEST_P(FtpDirectoryListingParserTest, Parse) {
|
| test_dir = test_dir.AppendASCII("data");
|
| test_dir = test_dir.AppendASCII("ftp");
|
|
|
| - base::Time::Exploded mock_current_time_exploded = { 0 };
|
| + base::Time::Exploded mock_current_time_exploded = {0};
|
| mock_current_time_exploded.year = 1994;
|
| mock_current_time_exploded.month = 11;
|
| mock_current_time_exploded.day_of_month = 15;
|
| @@ -42,18 +41,17 @@ TEST_P(FtpDirectoryListingParserTest, Parse) {
|
| SCOPED_TRACE(base::StringPrintf("Test case: %s", GetParam()));
|
|
|
| std::string test_listing;
|
| - EXPECT_TRUE(base::ReadFileToString(test_dir.AppendASCII(GetParam()),
|
| - &test_listing));
|
| + EXPECT_TRUE(
|
| + base::ReadFileToString(test_dir.AppendASCII(GetParam()), &test_listing));
|
|
|
| std::vector<FtpDirectoryListingEntry> entries;
|
| - EXPECT_EQ(OK, ParseFtpDirectoryListing(test_listing,
|
| - mock_current_time,
|
| - &entries));
|
| + EXPECT_EQ(
|
| + OK, ParseFtpDirectoryListing(test_listing, mock_current_time, &entries));
|
|
|
| std::string expected_listing;
|
| ASSERT_TRUE(base::ReadFileToString(
|
| - test_dir.AppendASCII(std::string(GetParam()) + ".expected"),
|
| - &expected_listing));
|
| + test_dir.AppendASCII(std::string(GetParam()) + ".expected"),
|
| + &expected_listing));
|
|
|
| std::vector<std::string> lines;
|
| base::SplitStringUsingSubstr(expected_listing, "\r\n", &lines);
|
| @@ -105,61 +103,36 @@ TEST_P(FtpDirectoryListingParserTest, Parse) {
|
| }
|
|
|
| const char* kTestFiles[] = {
|
| - "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",
|
| - "dir-listing-ls-6",
|
| - "dir-listing-ls-7",
|
| - "dir-listing-ls-8",
|
| - "dir-listing-ls-9",
|
| - "dir-listing-ls-10",
|
| - "dir-listing-ls-11",
|
| - "dir-listing-ls-12",
|
| - "dir-listing-ls-13",
|
| - "dir-listing-ls-14",
|
| - "dir-listing-ls-15",
|
| - "dir-listing-ls-16",
|
| - "dir-listing-ls-17",
|
| - "dir-listing-ls-18",
|
| - "dir-listing-ls-19",
|
| - "dir-listing-ls-20", // TODO(phajdan.jr): should use windows-1251 encoding.
|
| - "dir-listing-ls-21", // TODO(phajdan.jr): should use windows-1251 encoding.
|
| - "dir-listing-ls-22", // TODO(phajdan.jr): should use windows-1251 encoding.
|
| - "dir-listing-ls-23",
|
| - "dir-listing-ls-24",
|
| -
|
| - // 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-ls-32", // busybox
|
| -
|
| - "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-vms-6",
|
| - "dir-listing-vms-7",
|
| - "dir-listing-vms-8",
|
| - "dir-listing-windows-1",
|
| - "dir-listing-windows-2",
|
| + "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",
|
| + "dir-listing-ls-6", "dir-listing-ls-7", "dir-listing-ls-8",
|
| + "dir-listing-ls-9", "dir-listing-ls-10", "dir-listing-ls-11",
|
| + "dir-listing-ls-12", "dir-listing-ls-13", "dir-listing-ls-14",
|
| + "dir-listing-ls-15", "dir-listing-ls-16", "dir-listing-ls-17",
|
| + "dir-listing-ls-18", "dir-listing-ls-19",
|
| + "dir-listing-ls-20", // TODO(phajdan.jr): should use windows-1251 encoding.
|
| + "dir-listing-ls-21", // TODO(phajdan.jr): should use windows-1251 encoding.
|
| + "dir-listing-ls-22", // TODO(phajdan.jr): should use windows-1251 encoding.
|
| + "dir-listing-ls-23", "dir-listing-ls-24",
|
| +
|
| + // 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-ls-32", // busybox
|
| + "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-vms-6", "dir-listing-vms-7", "dir-listing-vms-8",
|
| + "dir-listing-windows-1", "dir-listing-windows-2",
|
| };
|
|
|
| -INSTANTIATE_TEST_CASE_P(, FtpDirectoryListingParserTest,
|
| +INSTANTIATE_TEST_CASE_P(,
|
| + FtpDirectoryListingParserTest,
|
| testing::ValuesIn(kTestFiles));
|
|
|
| } // namespace
|
|
|