| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 FPL("readme(1).TXT"), false}, | 168 FPL("readme(1).TXT"), false}, |
| 169 | 169 |
| 170 {"filename=READme.txt", "http://www.savepage.com", | 170 {"filename=READme.txt", "http://www.savepage.com", |
| 171 FPL("readme(2).txt"), false}, | 171 FPL("readme(2).txt"), false}, |
| 172 | 172 |
| 173 {"filename=Readme(1).txt", "http://www.savepage.com", | 173 {"filename=Readme(1).txt", "http://www.savepage.com", |
| 174 FPL("readme(3).txt"), false}, | 174 FPL("readme(3).txt"), false}, |
| 175 }; | 175 }; |
| 176 | 176 |
| 177 TEST_F(SavePackageTest, TestSuccessfullyGenerateSavePackageFilename) { | 177 TEST_F(SavePackageTest, TestSuccessfullyGenerateSavePackageFilename) { |
| 178 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kGeneratedFiles); ++i) { | 178 for (size_t i = 0; i < arraysize(kGeneratedFiles); ++i) { |
| 179 base::FilePath::StringType file_name; | 179 base::FilePath::StringType file_name; |
| 180 bool ok = GetGeneratedFilename(true, | 180 bool ok = GetGeneratedFilename(true, |
| 181 kGeneratedFiles[i].disposition, | 181 kGeneratedFiles[i].disposition, |
| 182 kGeneratedFiles[i].url, | 182 kGeneratedFiles[i].url, |
| 183 kGeneratedFiles[i].need_htm_ext, | 183 kGeneratedFiles[i].need_htm_ext, |
| 184 &file_name); | 184 &file_name); |
| 185 ASSERT_TRUE(ok); | 185 ASSERT_TRUE(ok); |
| 186 EXPECT_EQ(kGeneratedFiles[i].expected_name, file_name); | 186 EXPECT_EQ(kGeneratedFiles[i].expected_name, file_name); |
| 187 } | 187 } |
| 188 } | 188 } |
| 189 | 189 |
| 190 TEST_F(SavePackageTest, TestUnSuccessfullyGenerateSavePackageFilename) { | 190 TEST_F(SavePackageTest, TestUnSuccessfullyGenerateSavePackageFilename) { |
| 191 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kGeneratedFiles); ++i) { | 191 for (size_t i = 0; i < arraysize(kGeneratedFiles); ++i) { |
| 192 base::FilePath::StringType file_name; | 192 base::FilePath::StringType file_name; |
| 193 bool ok = GetGeneratedFilename(false, | 193 bool ok = GetGeneratedFilename(false, |
| 194 kGeneratedFiles[i].disposition, | 194 kGeneratedFiles[i].disposition, |
| 195 kGeneratedFiles[i].url, | 195 kGeneratedFiles[i].url, |
| 196 kGeneratedFiles[i].need_htm_ext, | 196 kGeneratedFiles[i].need_htm_ext, |
| 197 &file_name); | 197 &file_name); |
| 198 ASSERT_FALSE(ok); | 198 ASSERT_FALSE(ok); |
| 199 } | 199 } |
| 200 } | 200 } |
| 201 | 201 |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 {FPL("helloworld."), FPL("helloworld.") FPL_HTML_EXTENSION}, | 274 {FPL("helloworld."), FPL("helloworld.") FPL_HTML_EXTENSION}, |
| 275 }; | 275 }; |
| 276 | 276 |
| 277 // Crashing on Windows, see http://crbug.com/79365 | 277 // Crashing on Windows, see http://crbug.com/79365 |
| 278 #if defined(OS_WIN) | 278 #if defined(OS_WIN) |
| 279 #define MAYBE_TestEnsureHtmlExtension DISABLED_TestEnsureHtmlExtension | 279 #define MAYBE_TestEnsureHtmlExtension DISABLED_TestEnsureHtmlExtension |
| 280 #else | 280 #else |
| 281 #define MAYBE_TestEnsureHtmlExtension TestEnsureHtmlExtension | 281 #define MAYBE_TestEnsureHtmlExtension TestEnsureHtmlExtension |
| 282 #endif | 282 #endif |
| 283 TEST_F(SavePackageTest, MAYBE_TestEnsureHtmlExtension) { | 283 TEST_F(SavePackageTest, MAYBE_TestEnsureHtmlExtension) { |
| 284 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kExtensionTestCases); ++i) { | 284 for (size_t i = 0; i < arraysize(kExtensionTestCases); ++i) { |
| 285 base::FilePath original = base::FilePath(kExtensionTestCases[i].page_title); | 285 base::FilePath original = base::FilePath(kExtensionTestCases[i].page_title); |
| 286 base::FilePath expected = | 286 base::FilePath expected = |
| 287 base::FilePath(kExtensionTestCases[i].expected_name); | 287 base::FilePath(kExtensionTestCases[i].expected_name); |
| 288 base::FilePath actual = EnsureHtmlExtension(original); | 288 base::FilePath actual = EnsureHtmlExtension(original); |
| 289 EXPECT_EQ(expected.value(), actual.value()) << "Failed for page title: " << | 289 EXPECT_EQ(expected.value(), actual.value()) << "Failed for page title: " << |
| 290 kExtensionTestCases[i].page_title; | 290 kExtensionTestCases[i].page_title; |
| 291 } | 291 } |
| 292 } | 292 } |
| 293 | 293 |
| 294 // Crashing on Windows, see http://crbug.com/79365 | 294 // Crashing on Windows, see http://crbug.com/79365 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 319 { FPL("filename.html"), FPL("filename.html"), | 319 { FPL("filename.html"), FPL("filename.html"), |
| 320 "application/xhtml+xml" }, | 320 "application/xhtml+xml" }, |
| 321 { FPL("filename"), FPL("filename.xhtml"), "application/xhtml+xml" }, | 321 { FPL("filename"), FPL("filename.xhtml"), "application/xhtml+xml" }, |
| 322 { FPL("filename.txt"), FPL("filename.txt"), "text/plain" }, | 322 { FPL("filename.txt"), FPL("filename.txt"), "text/plain" }, |
| 323 { FPL("filename"), FPL("filename.txt"), "text/plain" }, | 323 { FPL("filename"), FPL("filename.txt"), "text/plain" }, |
| 324 { FPL("filename.css"), FPL("filename.css"), "text/css" }, | 324 { FPL("filename.css"), FPL("filename.css"), "text/css" }, |
| 325 { FPL("filename"), FPL("filename.css"), "text/css" }, | 325 { FPL("filename"), FPL("filename.css"), "text/css" }, |
| 326 { FPL("filename.abc"), FPL("filename.abc"), "unknown/unknown" }, | 326 { FPL("filename.abc"), FPL("filename.abc"), "unknown/unknown" }, |
| 327 { FPL("filename"), FPL("filename"), "unknown/unknown" }, | 327 { FPL("filename"), FPL("filename"), "unknown/unknown" }, |
| 328 }; | 328 }; |
| 329 for (uint32 i = 0; i < ARRAYSIZE_UNSAFE(kExtensionTests); ++i) { | 329 for (uint32 i = 0; i < arraysize(kExtensionTests); ++i) { |
| 330 base::FilePath original = base::FilePath(kExtensionTests[i].page_title); | 330 base::FilePath original = base::FilePath(kExtensionTests[i].page_title); |
| 331 base::FilePath expected = base::FilePath(kExtensionTests[i].expected_name); | 331 base::FilePath expected = base::FilePath(kExtensionTests[i].expected_name); |
| 332 std::string mime_type(kExtensionTests[i].contents_mime_type); | 332 std::string mime_type(kExtensionTests[i].contents_mime_type); |
| 333 base::FilePath actual = EnsureMimeExtension(original, mime_type); | 333 base::FilePath actual = EnsureMimeExtension(original, mime_type); |
| 334 EXPECT_EQ(expected.value(), actual.value()) << "Failed for page title: " << | 334 EXPECT_EQ(expected.value(), actual.value()) << "Failed for page title: " << |
| 335 kExtensionTests[i].page_title << " MIME:" << mime_type; | 335 kExtensionTests[i].page_title << " MIME:" << mime_type; |
| 336 } | 336 } |
| 337 } | 337 } |
| 338 | 338 |
| 339 // Test that the suggested names generated by SavePackage are reasonable: | 339 // Test that the suggested names generated by SavePackage are reasonable: |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 432 GURL view_source_url = | 432 GURL view_source_url = |
| 433 GURL(kViewSourceScheme + std::string(":") + mock_url.spec()); | 433 GURL(kViewSourceScheme + std::string(":") + mock_url.spec()); |
| 434 GURL actual_url = net::URLRequestMockHTTPJob::GetMockUrl( | 434 GURL actual_url = net::URLRequestMockHTTPJob::GetMockUrl( |
| 435 base::FilePath(kTestDir).Append(file_name)); | 435 base::FilePath(kTestDir).Append(file_name)); |
| 436 NavigateAndCommit(view_source_url); | 436 NavigateAndCommit(view_source_url); |
| 437 EXPECT_EQ(actual_url, GetUrlToBeSaved()); | 437 EXPECT_EQ(actual_url, GetUrlToBeSaved()); |
| 438 EXPECT_EQ(view_source_url, contents()->GetLastCommittedURL()); | 438 EXPECT_EQ(view_source_url, contents()->GetLastCommittedURL()); |
| 439 } | 439 } |
| 440 | 440 |
| 441 } // namespace content | 441 } // namespace content |
| OLD | NEW |