Adding ability to handle W3C spec compliant element serialization in .NET

Author: jimevans

dotnet/src/webdriver/Remote/RemoteTargetLocator.cs

@@ -90,6 +90,7 @@ public IWebDriver Frame(IWebElement frameElement)
 
             Dictionary<string, object> elementDictionary = new Dictionary<string, object>();
             elementDictionary.Add("ELEMENT", convertedElement.InternalElementId);
+            elementDictionary.Add("element-6066-11e4-a52e-4f735466cecf", convertedElement.InternalElementId);
 
             Dictionary<string, object> parameters = new Dictionary<string, object>();
             parameters.Add("id", elementDictionary);

dotnet/src/webdriver/Remote/RemoteWebDriver.cs

@@ -800,13 +800,13 @@ internal IWebElement GetElementFromResponse(Response response)
                 // TODO: Remove this "if" logic once the spec is properly updated
                 // and remote-end implementations comply.
                 string id = string.Empty;
-                if (elementDictionary.ContainsKey("ELEMENT"))
+                if (elementDictionary.ContainsKey("element-6066-11e4-a52e-4f735466cecf"))
                 {
-                    id = (string)elementDictionary["ELEMENT"];
+                    id = (string)elementDictionary["element-6066-11e4-a52e-4f735466cecf"];
                 }
-                else if (elementDictionary.ContainsKey("id"))
+                else if (elementDictionary.ContainsKey("ELEMENT"))
                 {
-                    id = (string)elementDictionary["id"];
+                    id = (string)elementDictionary["ELEMENT"];
                 }
 
                 element = this.CreateElement(id);
@@ -832,13 +832,13 @@ internal ReadOnlyCollection<IWebElement> GetElementsFromResponse(Response respon
                     // TODO: Remove this "if" logic once the spec is properly updated
                     // and remote-end implementations comply.
                     string id = string.Empty;
-                    if (elementDictionary.ContainsKey("ELEMENT"))
+                    if (elementDictionary.ContainsKey("element-6066-11e4-a52e-4f735466cecf"))
                     {
-                        id = (string)elementDictionary["ELEMENT"];
+                        id = (string)elementDictionary["element-6066-11e4-a52e-4f735466cecf"];
                     }
-                    else if (elementDictionary.ContainsKey("id"))
+                    else if (elementDictionary.ContainsKey("ELEMENT"))
                     {
-                        id = (string)elementDictionary["id"];
+                        id = (string)elementDictionary["ELEMENT"];
                     }
 
                     RemoteWebElement element = this.CreateElement(id);
@@ -1036,7 +1036,7 @@ private static object ConvertObjectToJavaScriptObject(object arg)
                 // TODO: Remove addition of 'id' key when spec is changed.
                 Dictionary<string, object> elementDictionary = new Dictionary<string, object>();
                 elementDictionary.Add("ELEMENT", argAsElement.InternalElementId);
-                elementDictionary.Add("id", argAsElement.InternalElementId);
+                elementDictionary.Add("element-6066-11e4-a52e-4f735466cecf", argAsElement.InternalElementId);
                 converted = elementDictionary;
             }
             else if (argAsDictionary != null)
@@ -1183,16 +1183,15 @@ private object ParseJavaScriptReturnValue(object responseValue)
 
             if (resultAsDictionary != null)
             {
-                if (resultAsDictionary.ContainsKey("ELEMENT"))
+                if (resultAsDictionary.ContainsKey("element-6066-11e4-a52e-4f735466cecf"))
                 {
-                    string id = (string)resultAsDictionary["ELEMENT"];
+                    string id = (string)resultAsDictionary["element-6066-11e4-a52e-4f735466cecf"];
                     RemoteWebElement element = this.CreateElement(id);
                     returnValue = element;
                 }
-                else if (resultAsDictionary.ContainsKey("id"))
+                else if (resultAsDictionary.ContainsKey("ELEMENT"))
                 {
-                    // TODO: Remove addition of 'id' key when spec is changed.
-                    string id = (string)resultAsDictionary["id"];
+                    string id = (string)resultAsDictionary["ELEMENT"];
                     RemoteWebElement element = this.CreateElement(id);
                     returnValue = element;
                 }