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

Unified Diff: chrome/test/automated_ui_tests/automated_ui_tests.cc

Issue 164371: Checkpoint for event automation porting.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 4 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/automated_ui_tests/automated_ui_tests.cc
===================================================================
--- chrome/test/automated_ui_tests/automated_ui_tests.cc (revision 23045)
+++ chrome/test/automated_ui_tests/automated_ui_tests.cc (working copy)
@@ -41,10 +41,19 @@
const wchar_t* const kWaitSwitch = L"wait-after-action";
-const wchar_t* const kDefaultInputFilePath = L"C:\\automated_ui_tests.txt";
+const FilePath::CharType* const kDefaultInputFilePath =
+#if defined(OS_WIN)
+ L"C:\\automated_ui_tests.txt";
+#else
+ "/tmp/automated_ui_tests.txt";
+#endif
-const wchar_t* const kDefaultOutputFilePath
- = L"C:\\automated_ui_tests_error_report.txt";
+const FilePath::CharType* const kDefaultOutputFilePath =
+#if defined(OS_WIN)
+ L"C:\\automated_ui_tests_error_report.txt";
+#else
+ "/tmp/automated_ui_tests_error_report.txt";
+#endif
const int kDebuggingTimeoutMsec = 5000;
@@ -54,6 +63,26 @@
void SilentRuntimeReportHandler(const std::string& str) {
}
+FilePath GetInputFilePath() {
+ const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
+ if (parsed_command_line.HasSwitch(kInputFilePathSwitch)) {
+ return FilePath::FromWStringHack(
+ parsed_command_line.GetSwitchValue(kInputFilePathSwitch));
+ } else {
+ return FilePath(kDefaultInputFilePath);
+ }
+}
+
+FilePath GetOutputFilePath() {
+ const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
+ if (parsed_command_line.HasSwitch(kOutputFilePathSwitch)) {
+ return FilePath::FromWStringHack(
+ parsed_command_line.GetSwitchValue(kOutputFilePathSwitch));
+ } else {
+ return FilePath(kDefaultOutputFilePath);
+ }
+}
+
} // namespace
// This subset of commands is used to test dialog boxes, which aren't likely
@@ -93,7 +122,7 @@
if (str.empty()) {
post_action_delay_ = 1;
} else {
- post_action_delay_ = static_cast<int>(StringToInt64(str));
+ post_action_delay_ = static_cast<int>(StringToInt64(WideToUTF16(str)));
}
}
if (base::SysInfo::HasEnvVar(env_vars::kHeadless))
@@ -114,7 +143,7 @@
std::wstring num_reproductions_string =
parsed_command_line.GetSwitchValue(kReproRepeatSwitch);
std::string test = WideToASCII(num_reproductions_string);
- num_reproductions = StringToInt64(num_reproductions_string);
+ num_reproductions = StringToInt64(test);
}
std::vector<std::string> actions;
SplitString(action_string, L',', &actions);
@@ -282,12 +311,15 @@
did_complete_action = PressDownArrow();
} else if (LowerCaseEqualsASCII(action, "downloads")) {
did_complete_action = ShowDownloads();
+// TODO(estade): port.
+#if defined(OS_WIN)
} else if (LowerCaseEqualsASCII(action, "dragtableft")) {
did_complete_action = DragActiveTab(false);
} else if (LowerCaseEqualsASCII(action, "dragtabout")) {
did_complete_action = DragTabOut();
} else if (LowerCaseEqualsASCII(action, "dragtabright")) {
did_complete_action = DragActiveTab(true);
+#endif // defined(OS_WIN)
} else if (LowerCaseEqualsASCII(action, "duplicatetab")) {
did_complete_action = DuplicateTab();
} else if (LowerCaseEqualsASCII(action, "editsearchengines")) {
@@ -390,7 +422,7 @@
xml_writer_.EndElement();
if (post_action_delay_)
- ::Sleep(1000 * post_action_delay_);
+ PlatformThread::Sleep(1000 * post_action_delay_);
return did_complete_action;
}
@@ -609,12 +641,7 @@
}
bool AutomatedUITest::InitXMLReader() {
- std::wstring input_path;
- const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
- if (parsed_command_line.HasSwitch(kInputFilePathSwitch))
- input_path = parsed_command_line.GetSwitchValue(kInputFilePathSwitch);
- else
- input_path = kDefaultInputFilePath;
+ FilePath input_path = GetInputFilePath();
if (!file_util::ReadFileToString(input_path, &xml_init_file_))
return false;
@@ -622,16 +649,10 @@
}
bool AutomatedUITest::WriteReportToFile() {
+ FilePath path = GetOutputFilePath();
std::ofstream error_file;
- std::wstring path;
- const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
- if (parsed_command_line.HasSwitch(kOutputFilePathSwitch))
- path = parsed_command_line.GetSwitchValue(kOutputFilePathSwitch);
- else
- path = kDefaultOutputFilePath;
-
if (!path.empty())
- error_file.open(path.c_str(), std::ios::out);
+ error_file.open(path.value().c_str(), std::ios::out);
// Closes all open elements and free the writer. This is required
// in order to retrieve the contents of the buffer.
@@ -642,16 +663,10 @@
}
void AutomatedUITest::AppendToOutputFile(const std::string &append_string) {
+ FilePath path = GetOutputFilePath();
std::ofstream error_file;
- std::wstring path;
- const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
- if (parsed_command_line.HasSwitch(kOutputFilePathSwitch))
- path = parsed_command_line.GetSwitchValue(kOutputFilePathSwitch);
- else
- path = kDefaultOutputFilePath;
-
if (!path.empty())
- error_file.open(path.c_str(), std::ios::out | std::ios_base::app);
+ error_file.open(path.value().c_str(), std::ios::out | std::ios_base::app);
error_file << append_string << " ";
error_file.close();
@@ -702,6 +717,8 @@
}
std::wstring AutomatedUITest::GetMostRecentCrashDump() {
+// TODO(estade): port.
+#if defined(OS_WIN)
std::wstring crash_dump_path;
int file_count = 0;
FILETIME most_recent_file_time;
@@ -739,6 +756,10 @@
file_util::AppendToPath(&crash_dump_path, most_recent_file_name);
return crash_dump_path;
}
+#else
+ NOTIMPLEMENTED();
+ return std::wstring();
+#endif
}
bool AutomatedUITest::DidCrash(bool update_total_crashes) {

Powered by Google App Engine
This is Rietveld 408576698