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

Unified Diff: chrome/browser/download/save_page_uitest.cc

Issue 18417: Add a UI test for "Encoding" menu Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 11 years, 10 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
Index: chrome/browser/download/save_page_uitest.cc
===================================================================
--- chrome/browser/download/save_page_uitest.cc (revision 10924)
+++ chrome/browser/download/save_page_uitest.cc (working copy)
@@ -20,35 +20,16 @@
protected:
SavePageTest() : UITest() {}
- void CheckFile(const std::wstring& client_file,
- const std::wstring& server_file,
+ void CheckFile(const std::wstring& generated_file,
+ const std::wstring& expect_result_file,
bool check_equal) {
- bool exist = false;
- for (int i = 0; i < 20; ++i) {
- if (file_util::PathExists(client_file)) {
- exist = true;
- break;
- }
- Sleep(sleep_timeout_ms());
- }
- EXPECT_TRUE(exist);
+ std::wstring expect_result_filepath =
+ UITest::GetTestFilePath(kTestDir, expect_result_file);
- if (check_equal) {
- std::wstring server_file_name;
- ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA,
- &server_file_name));
- server_file_name += L"\\" + kTestDir + L"\\" + server_file;
- ASSERT_TRUE(file_util::PathExists(server_file_name));
-
- int64 client_file_size = 0;
- int64 server_file_size = 0;
- EXPECT_TRUE(file_util::GetFileSize(client_file, &client_file_size));
- EXPECT_TRUE(file_util::GetFileSize(server_file_name, &server_file_size));
- EXPECT_EQ(client_file_size, server_file_size);
- EXPECT_TRUE(file_util::ContentsEqual(client_file, server_file_name));
- }
-
- EXPECT_TRUE(DieFileDie(client_file, false));
+ ASSERT_TRUE(file_util::PathExists(expect_result_filepath));
+ WaitForGeneratedFileAndCheck(generated_file,
+ expect_result_filepath,
+ check_equal, true);
}
virtual void SetUp() {

Powered by Google App Engine
This is Rietveld 408576698