Extracting JSON wire protocol element marker property names in .NET

Author: jimevans

dotnet/src/webdriver/Remote/RemoteWebDriver.cs

@@ -1018,13 +1018,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-6066-11e4-a52e-4f735466cecf"))
+                if (elementDictionary.ContainsKey(RemoteWebElement.ElementReferencePropertyName))
                 {
-                    id = (string)elementDictionary["element-6066-11e4-a52e-4f735466cecf"];
+                    id = (string)elementDictionary[RemoteWebElement.ElementReferencePropertyName];
                 }
-                else if (elementDictionary.ContainsKey("ELEMENT"))
+                else if (elementDictionary.ContainsKey(RemoteWebElement.LegacyElementReferencePropertyName))
                 {
-                    id = (string)elementDictionary["ELEMENT"];
+                    id = (string)elementDictionary[RemoteWebElement.LegacyElementReferencePropertyName];
                 }
 
                 element = this.CreateElement(id);
@@ -1052,13 +1052,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-6066-11e4-a52e-4f735466cecf"))
+                        if (elementDictionary.ContainsKey(RemoteWebElement.ElementReferencePropertyName))
                         {
-                            id = (string)elementDictionary["element-6066-11e4-a52e-4f735466cecf"];
+                            id = (string)elementDictionary[RemoteWebElement.ElementReferencePropertyName];
                         }
-                        else if (elementDictionary.ContainsKey("ELEMENT"))
+                        else if (elementDictionary.ContainsKey(RemoteWebElement.LegacyElementReferencePropertyName))
                         {
-                            id = (string)elementDictionary["ELEMENT"];
+                            id = (string)elementDictionary[RemoteWebElement.LegacyElementReferencePropertyName];
                         }
 
                         RemoteWebElement element = this.CreateElement(id);
@@ -1297,7 +1297,7 @@ private static object ConvertObjectToJavaScriptObject(object arg)
             {
                 // TODO: Remove "ELEMENT" addition when all remote ends are spec-compliant.
                 Dictionary<string, object> elementDictionary = argAsElementReference.ToDictionary();
-                elementDictionary.Add("ELEMENT", argAsElementReference.ElementReferenceId);
+                elementDictionary.Add(RemoteWebElement.LegacyElementReferencePropertyName, argAsElementReference.ElementReferenceId);
                 converted = elementDictionary;
             }
             else if (argAsDictionary != null)
@@ -1474,15 +1474,15 @@ private object ParseJavaScriptReturnValue(object responseValue)
 
             if (resultAsDictionary != null)
             {
-                if (resultAsDictionary.ContainsKey("element-6066-11e4-a52e-4f735466cecf"))
+                if (resultAsDictionary.ContainsKey(RemoteWebElement.ElementReferencePropertyName))
                 {
-                    string id = (string)resultAsDictionary["element-6066-11e4-a52e-4f735466cecf"];
+                    string id = (string)resultAsDictionary[RemoteWebElement.ElementReferencePropertyName];
                     RemoteWebElement element = this.CreateElement(id);
                     returnValue = element;
                 }
-                else if (resultAsDictionary.ContainsKey("ELEMENT"))
+                else if (resultAsDictionary.ContainsKey(RemoteWebElement.LegacyElementReferencePropertyName))
                 {
-                    string id = (string)resultAsDictionary["ELEMENT"];
+                    string id = (string)resultAsDictionary[RemoteWebElement.LegacyElementReferencePropertyName];
                     RemoteWebElement element = this.CreateElement(id);
                     returnValue = element;
                 }

dotnet/src/webdriver/Remote/RemoteWebElement.cs

@@ -35,6 +35,16 @@ namespace OpenQA.Selenium.Remote
     /// <seealso cref="ILocatable"/>
     public class RemoteWebElement : IWebElement, IFindsByLinkText, IFindsById, IFindsByName, IFindsByTagName, IFindsByClassName, IFindsByXPath, IFindsByPartialLinkText, IFindsByCssSelector, IWrapsDriver, ILocatable, ITakesScreenshot, IWebElementReference
     {
+        /// <summary>
+        /// The property name that represents a web element in the wire protocol.
+        /// </summary>
+        public const string ElementReferencePropertyName = "element-6066-11e4-a52e-4f735466cecf";
+
+        /// <summary>
+        /// The property name that represents a web element in the legacy dialect of the wire protocol.
+        /// </summary>
+        public const string LegacyElementReferencePropertyName = "ELEMENT";
+
         private RemoteWebDriver driver;
         private string elementId;
 
@@ -943,7 +953,7 @@ public override bool Equals(object obj)
         Dictionary<string, object> IWebElementReference.ToDictionary()
         {
             Dictionary<string, object> elementDictionary = new Dictionary<string, object>();
-            elementDictionary.Add("element-6066-11e4-a52e-4f735466cecf", this.elementId);
+            elementDictionary.Add(ElementReferencePropertyName, this.elementId);
             return elementDictionary;
         }