Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "chrome/test/chromedriver/capabilities.h" | 5 #include "chrome/test/chromedriver/capabilities.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| 11 #include "base/json/string_escape.h" | 11 #include "base/json/string_escape.h" |
| 12 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" |
| 14 #include "base/strings/string_split.h" | 14 #include "base/strings/string_split.h" |
| 15 #include "base/strings/string_tokenizer.h" | 15 #include "base/strings/string_tokenizer.h" |
| 16 #include "base/strings/string_util.h" | 16 #include "base/strings/string_util.h" |
| 17 #include "base/strings/stringprintf.h" | 17 #include "base/strings/stringprintf.h" |
| 18 #include "base/strings/utf_string_conversions.h" | 18 #include "base/strings/utf_string_conversions.h" |
| 19 #include "base/values.h" | 19 #include "base/values.h" |
| 20 #include "chrome/test/chromedriver/chrome/status.h" | 20 #include "chrome/test/chromedriver/chrome/status.h" |
| 21 #include "chrome/test/chromedriver/logging.h" | 21 #include "chrome/test/chromedriver/logging.h" |
| 22 #include "chrome/test/chromedriver/mobile_device.h" | |
| 22 #include "net/base/net_util.h" | 23 #include "net/base/net_util.h" |
| 23 | 24 |
| 24 namespace { | 25 namespace { |
| 25 | 26 |
| 26 typedef base::Callback<Status(const base::Value&, Capabilities*)> Parser; | 27 typedef base::Callback<Status(const base::Value&, Capabilities*)> Parser; |
| 27 | 28 |
| 28 Status ParseBoolean( | 29 Status ParseBoolean( |
| 29 bool* to_set, | 30 bool* to_set, |
| 30 const base::Value& option, | 31 const base::Value& option, |
| 31 Capabilities* capabilities) { | 32 Capabilities* capabilities) { |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 77 Status IgnoreCapability(const base::Value& option, Capabilities* capabilities) { | 78 Status IgnoreCapability(const base::Value& option, Capabilities* capabilities) { |
| 78 return Status(kOk); | 79 return Status(kOk); |
| 79 } | 80 } |
| 80 | 81 |
| 81 Status ParseLogPath(const base::Value& option, Capabilities* capabilities) { | 82 Status ParseLogPath(const base::Value& option, Capabilities* capabilities) { |
| 82 if (!option.GetAsString(&capabilities->log_path)) | 83 if (!option.GetAsString(&capabilities->log_path)) |
| 83 return Status(kUnknownError, "must be a string"); | 84 return Status(kUnknownError, "must be a string"); |
| 84 return Status(kOk); | 85 return Status(kOk); |
| 85 } | 86 } |
| 86 | 87 |
| 88 Status ParseDeviceName(std::string device_name, Capabilities* capabilities) { | |
| 89 scoped_ptr<MobileDevice> device; | |
| 90 Status status = FindMobileDevice(device_name, &device); | |
| 91 if (status.IsError()) | |
| 92 return Status(kUnknownError, | |
| 93 "'" + device_name + "' must be a valid device", | |
| 94 status); | |
| 95 | |
| 96 capabilities->device_metrics = device->device_metrics; | |
| 97 capabilities->switches.SetUnparsedSwitch( | |
| 98 "--user-agent='" + device->user_agent + "'"); | |
| 99 | |
| 100 return Status(kOk); | |
| 101 } | |
| 102 | |
| 103 Status ParseMobileEmulation(const base::Value& option, | |
| 104 Capabilities* capabilities) { | |
|
stgao
2014/05/14 05:10:14
indent.
sam.rawlins
2014/05/16 21:09:38
Done.
| |
| 105 const base::DictionaryValue* mobile_emulation; | |
| 106 if (!option.GetAsDictionary(&mobile_emulation)) | |
| 107 return Status(kUnknownError, "'mobileEmulation' must be a dictionary"); | |
| 108 | |
| 109 if (mobile_emulation->HasKey("deviceName")) { | |
| 110 // Cannot use any other options with deviceName. | |
| 111 if (mobile_emulation->size() > 1) | |
| 112 return Status(kUnknownError, "'deviceName' must be used alone"); | |
| 113 | |
| 114 std::string device_name; | |
| 115 if (!mobile_emulation->GetString("deviceName", &device_name)) | |
| 116 return Status(kUnknownError, "'deviceName' must be a string"); | |
| 117 | |
| 118 return ParseDeviceName(device_name, capabilities); | |
| 119 } | |
| 120 | |
| 121 if (mobile_emulation->HasKey("deviceMetrics")) { | |
| 122 const base::DictionaryValue* metrics; | |
| 123 if (!mobile_emulation->GetDictionary("deviceMetrics", &metrics)) | |
| 124 return Status(kUnknownError, "'deviceMetrics' must be a dictionary"); | |
| 125 | |
| 126 int width; | |
| 127 int height; | |
| 128 double device_scale_factor; | |
| 129 if (!metrics->GetInteger("width", &width) || | |
| 130 !metrics->GetInteger("height", &height) || | |
| 131 !metrics->GetDouble("pixelRatio", &device_scale_factor)) | |
| 132 return Status(kUnknownError, "invalid 'deviceMetrics'"); | |
| 133 capabilities->device_metrics = | |
| 134 DeviceMetrics(width, height, device_scale_factor); | |
| 135 } | |
| 136 | |
| 137 if (mobile_emulation->HasKey("userAgent")) { | |
|
stgao
2014/05/14 05:10:14
Do we want to support the case that the user provi
sam.rawlins
2014/05/16 21:09:38
I think this is fine. The behavior wouldn't be und
| |
| 138 std::string user_agent; | |
| 139 if (!mobile_emulation->GetString("userAgent", &user_agent)) | |
| 140 return Status(kUnknownError, "'userAgent' must be a string"); | |
| 141 | |
| 142 capabilities->switches.SetUnparsedSwitch( | |
| 143 "--user-agent='" + user_agent + "'"); | |
| 144 } | |
| 145 | |
| 146 return Status(kOk); | |
| 147 } | |
| 148 | |
| 87 Status ParseSwitches(const base::Value& option, | 149 Status ParseSwitches(const base::Value& option, |
| 88 Capabilities* capabilities) { | 150 Capabilities* capabilities) { |
| 89 const base::ListValue* switches_list = NULL; | 151 const base::ListValue* switches_list = NULL; |
| 90 if (!option.GetAsList(&switches_list)) | 152 if (!option.GetAsList(&switches_list)) |
| 91 return Status(kUnknownError, "must be a list"); | 153 return Status(kUnknownError, "must be a list"); |
| 92 for (size_t i = 0; i < switches_list->GetSize(); ++i) { | 154 for (size_t i = 0; i < switches_list->GetSize(); ++i) { |
| 93 std::string arg_string; | 155 std::string arg_string; |
| 94 if (!switches_list->GetString(i, &arg_string)) | 156 if (!switches_list->GetString(i, &arg_string)) |
| 95 return Status(kUnknownError, "each argument must be a string"); | 157 return Status(kUnknownError, "each argument must be a string"); |
| 96 capabilities->switches.SetUnparsedSwitch(arg_string); | 158 capabilities->switches.SetUnparsedSwitch(arg_string); |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 265 parser_map["androidUseRunningApp"] = | 327 parser_map["androidUseRunningApp"] = |
| 266 base::Bind(&ParseBoolean, &capabilities->android_use_running_app); | 328 base::Bind(&ParseBoolean, &capabilities->android_use_running_app); |
| 267 parser_map["args"] = base::Bind(&ParseSwitches); | 329 parser_map["args"] = base::Bind(&ParseSwitches); |
| 268 parser_map["loadAsync"] = base::Bind(&IgnoreDeprecatedOption, "loadAsync"); | 330 parser_map["loadAsync"] = base::Bind(&IgnoreDeprecatedOption, "loadAsync"); |
| 269 } else if (is_existing) { | 331 } else if (is_existing) { |
| 270 parser_map["debuggerAddress"] = base::Bind(&ParseUseExistingBrowser); | 332 parser_map["debuggerAddress"] = base::Bind(&ParseUseExistingBrowser); |
| 271 } else { | 333 } else { |
| 272 parser_map["args"] = base::Bind(&ParseSwitches); | 334 parser_map["args"] = base::Bind(&ParseSwitches); |
| 273 parser_map["binary"] = base::Bind(&ParseFilePath, &capabilities->binary); | 335 parser_map["binary"] = base::Bind(&ParseFilePath, &capabilities->binary); |
| 274 parser_map["detach"] = base::Bind(&ParseBoolean, &capabilities->detach); | 336 parser_map["detach"] = base::Bind(&ParseBoolean, &capabilities->detach); |
| 337 parser_map["mobileEmulation"] = base::Bind(&ParseMobileEmulation); | |
| 275 parser_map["excludeSwitches"] = base::Bind(&ParseExcludeSwitches); | 338 parser_map["excludeSwitches"] = base::Bind(&ParseExcludeSwitches); |
| 276 parser_map["extensions"] = base::Bind(&ParseExtensions); | 339 parser_map["extensions"] = base::Bind(&ParseExtensions); |
| 277 parser_map["forceDevToolsScreenshot"] = base::Bind( | 340 parser_map["forceDevToolsScreenshot"] = base::Bind( |
| 278 &ParseBoolean, &capabilities->force_devtools_screenshot); | 341 &ParseBoolean, &capabilities->force_devtools_screenshot); |
| 279 parser_map["loadAsync"] = base::Bind(&IgnoreDeprecatedOption, "loadAsync"); | 342 parser_map["loadAsync"] = base::Bind(&IgnoreDeprecatedOption, "loadAsync"); |
| 280 parser_map["localState"] = | 343 parser_map["localState"] = |
| 281 base::Bind(&ParseDict, &capabilities->local_state); | 344 base::Bind(&ParseDict, &capabilities->local_state); |
| 282 parser_map["logPath"] = base::Bind(&ParseLogPath); | 345 parser_map["logPath"] = base::Bind(&ParseLogPath); |
| 283 parser_map["minidumpPath"] = | 346 parser_map["minidumpPath"] = |
| 284 base::Bind(&ParseString, &capabilities->minidump_path); | 347 base::Bind(&ParseString, &capabilities->minidump_path); |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 433 if (desired_caps.Get(it->first, &capability)) { | 496 if (desired_caps.Get(it->first, &capability)) { |
| 434 Status status = it->second.Run(*capability, this); | 497 Status status = it->second.Run(*capability, this); |
| 435 if (status.IsError()) { | 498 if (status.IsError()) { |
| 436 return Status( | 499 return Status( |
| 437 kUnknownError, "cannot parse capability: " + it->first, status); | 500 kUnknownError, "cannot parse capability: " + it->first, status); |
| 438 } | 501 } |
| 439 } | 502 } |
| 440 } | 503 } |
| 441 return Status(kOk); | 504 return Status(kOk); |
| 442 } | 505 } |
| OLD | NEW |