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

Unified Diff: chrome/test/ui/ui_test.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/test/ui/ui_test.cc
===================================================================
--- chrome/test/ui/ui_test.cc (revision 10924)
+++ chrome/test/ui/ui_test.cc (working copy)
@@ -755,15 +755,21 @@
L"[", L"]", units, important);
}
-GURL UITest::GetTestUrl(const std::wstring& test_directory,
+std::wstring UITest::GetTestFilePath(const std::wstring& test_directory,
const std::wstring &test_case) {
Johnny(Jianning) Ding 2009/03/09 12:31:46 make the parameter of this line aligned with previ
std::wstring path;
PathService::Get(chrome::DIR_TEST_DATA, &path);
file_util::AppendToPath(&path, test_directory);
file_util::AppendToPath(&path, test_case);
- return net::FilePathToFileURL(path);
+ return path;
}
+// Static
+GURL UITest::GetTestUrl(const std::wstring& test_directory,
+ const std::wstring &test_case){
+ return net::FilePathToFileURL(GetTestFilePath(test_directory, test_case));
+}
+
void UITest::WaitForFinish(const std::string &name,
const std::string &id,
const GURL &url,
@@ -808,4 +814,35 @@
units.c_str());
}
+void UITest::WaitForGeneratedFileAndCheck(const std::wstring& generated_file,
+ const std::wstring& source_file,
+ bool need_equal,
+ bool delete_generate_file){
+ bool exist = false;
+ // Wait the the generated file ready.
+ for (int i = 0; i < 20; ++i) {
+ if (file_util::PathExists(generated_file)) {
+ exist = true;
+ break;
+ }
+ Sleep(kWaitForActionMaxMsec / 20);
+ }
+ EXPECT_TRUE(exist);
+
+ int64 generated_file_size = 0;
+ int64 server_file_size = 0;
+ EXPECT_TRUE(file_util::GetFileSize(generated_file, &generated_file_size));
+ EXPECT_TRUE(file_util::GetFileSize(source_file, &server_file_size));
+ if (need_equal) {
+ EXPECT_EQ(generated_file_size, server_file_size);
+ EXPECT_TRUE(file_util::ContentsEqual(generated_file, source_file));
+ } else {
+ EXPECT_NE(generated_file_size, server_file_size);
+ EXPECT_FALSE(file_util::ContentsEqual(generated_file, source_file));
+ }
+ if (delete_generate_file)
+ EXPECT_TRUE(DieFileDie(generated_file, false));
+}
+
+
#endif // OS_WIN

Powered by Google App Engine
This is Rietveld 408576698