[chromedriver] Added option to make element references W3C compliant.

chrome/test/chromedriver/client/chromedriver.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import sys
 import platform
 
 import command_executor
 from command_executor import Command
 from webelement import WebElement
@@ skipping 94 matching lines @@
 
   def __init__(self, server_url, chrome_binary=None, android_package=None,
                android_activity=None, android_process=None,
                android_use_running_app=None, chrome_switches=None,
                chrome_extensions=None, chrome_log_path=None,
                debugger_address=None, logging_prefs=None,
                mobile_emulation=None, experimental_options=None,
                download_dir=None, network_connection=None,
                send_w3c_capability=None, send_w3c_request=None,
                page_load_strategy=None):
+

[samuong, 2016/08/11 18:13:20]

nit: no need for a new blank line

[roisinmcl, 2016/08/13 01:47:26]

Done.

     self._executor = command_executor.CommandExecutor(server_url)
 
     options = {}
 
     if experimental_options:
       assert isinstance(experimental_options, dict)
       options = experimental_options.copy()
 
     if android_package:
       options['androidPackage'] = android_package
@@ skipping 84 matching lines @@
     self.capabilities = self._UnwrapValue(response['value'])
 
   def _WrapValue(self, value):
     """Wrap value from client side for chromedriver side."""
     if isinstance(value, dict):
       converted = {}
       for key, val in value.items():
         converted[key] = self._WrapValue(val)
       return converted
     elif isinstance(value, WebElement):
-      return {'ELEMENT': value._id}
+      if (self.w3c_compliant):
+        return {'element-6066-11e4-a52e-4f735466cecf': value._id}
+      else:
+        return {'ELEMENT': value._id}

[samuong, 2016/08/11 18:13:20]

let's create constants for the element keys, since they get used in a few
different places

[roisinmcl, 2016/08/13 01:47:26]

Done.

     elif isinstance(value, list):
       return list(self._WrapValue(item) for item in value)
     else:
       return value
 
   def _UnwrapValue(self, value):
     """Unwrap value from chromedriver side for client side."""
     if isinstance(value, dict):
-      if (len(value) == 1 and 'ELEMENT' in value
+      if (self.w3c_compliant and len(value) == 1
+          and 'element-6066-11e4-a52e-4f735466cecf' in value
+          and isinstance(
+            value['element-6066-11e4-a52e-4f735466cecf'], basestring)):

[samuong, 2016/08/11 18:13:20]

this is a big conjunction, let's do the len(value)==1 check first, and then do
the w3c/non-w3c inside that:

if len(value) == 1:
  if self.w3c_compliant and ...
    # ...
  elif not self.w3c_compliant and ...
    # ...

[roisinmcl, 2016/08/13 01:47:26]

Done.

+        return WebElement(self, value['element-6066-11e4-a52e-4f735466cecf'])
+      elif (len(value) == 1 and 'ELEMENT' in value
           and isinstance(value['ELEMENT'], basestring)):
         return WebElement(self, value['ELEMENT'])
       else:
         unwraped = {}
         for key, val in value.items():
           unwraped[key] = self._UnwrapValue(val)
         return unwraped
     elif isinstance(value, list):
       return list(self._UnwrapValue(item) for item in value)
     else:
@@ skipping 233 matching lines @@
 
   def GetNetworkConnection(self):
     return self.ExecuteCommand(Command.GET_NETWORK_CONNECTION)
 
   def DeleteNetworkConditions(self):
     self.ExecuteCommand(Command.DELETE_NETWORK_CONDITIONS)
 
   def SetNetworkConnection(self, connection_type):
     params = {'parameters': {'type': connection_type}}
     self.ExecuteCommand(Command.SET_NETWORK_CONNECTION, params)