Skip to content

Commit b54c8ea

Browse files
jimevansjimevans
committed
Adding additional logging for new session command for IE
1 parent 188261e commit b54c8ea

File tree

1 file changed

+26
-3
lines changed

1 file changed

+26
-3
lines changed

‎cpp/iedriver/CommandHandlers/NewSessionCommandHandler.cpp‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ Json::Value NewSessionCommandHandler::GetCapability(
100100
const std::string& capability_name,
101101
const Json::ValueType& expected_capability_type,
102102
const Json::Value& default_value) {
103+
LOG(TRACE) << "Entering NewSessionCommandHandler::GetCapability "
104+
<< "for capability " << capability_name;
103105
Json::Value capability_value = capabilities.get(capability_name, default_value);
104106
if (!this->IsEquivalentType(capability_value.type(), expected_capability_type)) {
105107
LOG(WARN) << "Invalid capability setting: " << capability_name
@@ -146,6 +148,7 @@ std::string NewSessionCommandHandler::GetJsonTypeDescription(
146148

147149
std::string NewSessionCommandHandler::GetUnexpectedAlertBehaviorValue(
148150
const std::string& desired_value) {
151+
LOG(TRACE) << "Entering NewSessionCommandHandler::GetUnexpectedAlertBehaviorValue";
149152
std::string value = DISMISS_AND_NOTIFY_UNEXPECTED_ALERTS;
150153
if (desired_value == DISMISS_UNEXPECTED_ALERTS ||
151154
desired_value == ACCEPT_UNEXPECTED_ALERTS ||
@@ -163,6 +166,7 @@ std::string NewSessionCommandHandler::GetUnexpectedAlertBehaviorValue(
163166

164167
std::string NewSessionCommandHandler::GetPageLoadStrategyValue(
165168
const std::string& desired_value) {
169+
LOG(TRACE) << "Entering NewSessionCommandHandler::GetPageLoadStrategyValue";
166170
std::string value = NORMAL_PAGE_LOAD_STRATEGY;
167171
if (desired_value == NORMAL_PAGE_LOAD_STRATEGY ||
168172
desired_value == EAGER_PAGE_LOAD_STRATEGY ||
@@ -176,7 +180,10 @@ std::string NewSessionCommandHandler::GetPageLoadStrategyValue(
176180
return value;
177181
}
178182

179-
Json::Value NewSessionCommandHandler::ProcessLegacyCapabilities(const IECommandExecutor& executor, const Json::Value& capabilities, std::string* error_message) {
183+
Json::Value NewSessionCommandHandler::ProcessLegacyCapabilities(const IECommandExecutor& executor,
184+
const Json::Value& capabilities,
185+
std::string* error_message) {
186+
LOG(TRACE) << "Entering NewSessionCommandHandler::ProcessLegacyCapabilities";
180187
this->SetBrowserFactorySettings(executor, capabilities);
181188

182189
this->SetInputSettings(executor, capabilities);
@@ -197,7 +204,9 @@ Json::Value NewSessionCommandHandler::ProcessLegacyCapabilities(const IECommandE
197204
return this->CreateReturnedCapabilities(executor);
198205
}
199206

200-
Json::Value NewSessionCommandHandler::ValidateArguments(const Json::Value& capabilities, std::string* error_message) {
207+
Json::Value NewSessionCommandHandler::ValidateArguments(const Json::Value& capabilities,
208+
std::string* error_message) {
209+
LOG(TRACE) << "Entering NewSessionCommandHandler::ValidateArguments";
201210
Json::Value validated_capabilities(Json::arrayValue);
202211
if (!capabilities.isObject()) {
203212
*error_message = "'capabilities' in new session request body is not a JSON object.";
@@ -213,6 +222,7 @@ Json::Value NewSessionCommandHandler::ValidateArguments(const Json::Value& capab
213222
}
214223
}
215224

225+
LOG(DEBUG) << "Validating alwaysMatch capability set";
216226
if (this->ValidateCapabilities(always_match, "alwaysMatch", error_message)) {
217227
Json::Value empty_capabilities(Json::objectValue);
218228
Json::Value first_match_candidates(Json::arrayValue);
@@ -233,6 +243,7 @@ Json::Value NewSessionCommandHandler::ValidateArguments(const Json::Value& capab
233243
bool first_match_validation_failure = false;
234244
Json::Value validated_first_match_candidates(Json::arrayValue);
235245
for (size_t i = 0; i < first_match_candidates.size(); ++i) {
246+
LOG(DEBUG) << "Validating firstMatch capability set with index " << i;
236247
std::string first_match_validation_error = "";
237248
Json::Value first_match_candidate = first_match_candidates[static_cast<int>(i)];
238249
if (this->ValidateCapabilities(first_match_candidate, "firstMatch element " + std::to_string(i), &first_match_validation_error)) {
@@ -278,11 +289,15 @@ Json::Value NewSessionCommandHandler::ValidateArguments(const Json::Value& capab
278289
return validated_capabilities;
279290
}
280291

281-
Json::Value NewSessionCommandHandler::ProcessCapabilities(const IECommandExecutor& executor, const Json::Value& capabilities, std::string* error_message) {
292+
Json::Value NewSessionCommandHandler::ProcessCapabilities(const IECommandExecutor& executor,
293+
const Json::Value& capabilities,
294+
std::string* error_message) {
295+
LOG(TRACE) << "Entering NewSessionCommandHandler::ProcessCapabilities";
282296
for (size_t i = 0; i < capabilities.size(); ++i) {
283297
std::string match_error = "";
284298
Json::Value merged_capabilities = capabilities[static_cast<int>(i)];
285299
if (this->MatchCapabilities(executor, merged_capabilities, &match_error)) {
300+
LOG(DEBUG) << "Processing matched capability set with index " << i;
286301
IECommandExecutor& mutable_executor = const_cast<IECommandExecutor&>(executor);
287302

288303
Json::Value unexpected_alert_behavior = this->GetCapability(merged_capabilities, UNHANDLED_PROMPT_BEHAVIOR_CAPABILITY, Json::stringValue, "");
@@ -328,6 +343,7 @@ Json::Value NewSessionCommandHandler::ProcessCapabilities(const IECommandExecuto
328343
}
329344

330345
void NewSessionCommandHandler::SetTimeoutSettings(const IECommandExecutor& executor, const Json::Value& capabilities) {
346+
LOG(TRACE) << "Entering NewSessionCommandHandler::SetTimeoutSettings";
331347
IECommandExecutor& mutable_executor = const_cast<IECommandExecutor&>(executor);
332348
if (capabilities.isMember("implicit")) {
333349
mutable_executor.set_implicit_wait_timeout(capabilities["implicit"].asUInt64());
@@ -341,6 +357,7 @@ void NewSessionCommandHandler::SetTimeoutSettings(const IECommandExecutor& execu
341357
}
342358

343359
void NewSessionCommandHandler::SetBrowserFactorySettings(const IECommandExecutor& executor, const Json::Value& capabilities) {
360+
LOG(TRACE) << "Entering NewSessionCommandHandler::SetBrowserFactorySettings";
344361
std::string default_initial_url = "http://localhost:" + std::to_string(static_cast<long long>(executor.port())) + "/";
345362
if (!capabilities.isNull()) {
346363
BrowserFactorySettings factory_settings;
@@ -374,6 +391,7 @@ void NewSessionCommandHandler::SetBrowserFactorySettings(const IECommandExecutor
374391
}
375392

376393
void NewSessionCommandHandler::SetProxySettings(const IECommandExecutor& executor, const Json::Value& proxy_capability, const bool use_per_process_proxy) {
394+
LOG(TRACE) << "Entering NewSessionCommandHandler::SetProxySettings";
377395
ProxySettings proxy_settings = { false, "", "", "", "", "", "", "", "", "" };
378396
if (!proxy_capability.isNull()) {
379397
// TODO(JimEvans): Validate the members of the proxy JSON object.
@@ -418,6 +436,7 @@ void NewSessionCommandHandler::SetProxySettings(const IECommandExecutor& executo
418436
}
419437

420438
void NewSessionCommandHandler::SetInputSettings(const IECommandExecutor& executor, const Json::Value& capabilities) {
439+
LOG(TRACE) << "Entering NewSessionCommandHandler::SetInputSettings";
421440
IECommandExecutor& mutable_executor = const_cast<IECommandExecutor&>(executor);
422441
InputManagerSettings input_manager_settings;
423442
input_manager_settings.element_repository = mutable_executor.element_manager();
@@ -448,6 +467,7 @@ void NewSessionCommandHandler::SetInputSettings(const IECommandExecutor& executo
448467
}
449468

450469
Json::Value NewSessionCommandHandler::CreateReturnedCapabilities(const IECommandExecutor& executor) {
470+
LOG(TRACE) << "Entering NewSessionCommandHandler::CreateReturnedCapabilities";
451471
Json::Value capabilities;
452472
capabilities[BROWSER_NAME_CAPABILITY] = "internet explorer";
453473
capabilities[BROWSER_VERSION_CAPABILITY] = std::to_string(static_cast<long long>(executor.browser_factory()->browser_version()));
@@ -492,6 +512,7 @@ Json::Value NewSessionCommandHandler::CreateReturnedCapabilities(const IECommand
492512
}
493513

494514
bool NewSessionCommandHandler::MatchCapabilities(const IECommandExecutor& executor, const Json::Value& merged_capabilities, std::string* error_message) {
515+
LOG(TRACE) << "Entering NewSessionCommandHandler::MatchCapabilities";
495516
std::vector<std::string> capability_names = merged_capabilities.getMemberNames();
496517
std::vector<std::string>::const_iterator name_iterator = capability_names.begin();
497518
for (; name_iterator != capability_names.end(); ++name_iterator) {
@@ -549,6 +570,7 @@ bool NewSessionCommandHandler::MergeCapabilities(
549570
const Json::Value& secondary_capabilities,
550571
Json::Value* merged_capabilities,
551572
std::string* error_message) {
573+
LOG(TRACE) << "Entering NewSessionCommandHandler::MergeCapabilities";
552574
std::vector<std::string> primary_property_names = primary_capabilities.getMemberNames();
553575
for (size_t i = 0; i < primary_property_names.size(); ++i) {
554576
std::string property_name = primary_property_names[i];
@@ -572,6 +594,7 @@ bool NewSessionCommandHandler::ValidateCapabilities(
572594
const Json::Value& capabilities,
573595
const std::string& capability_set_name,
574596
std::string* error_message) {
597+
LOG(TRACE) << "Entering NewSessionCommandHandler::ValidateCapabilities";
575598
LOG(DEBUG) << "Validating capabilities object";
576599
if (!capabilities.isObject() && !capabilities.isNull()) {
577600
*error_message = capability_set_name + " is not a JSON object.";

0 commit comments

Comments
 (0)