Compatibility with Selenium 4 and Appium

src/Winium.Desktop.Driver/Automator/Automator.cs

@@ -1,5 +1,6 @@
 namespace Winium.Desktop.Driver.Automator
 {
+    using System;
     #region using
 
     using System.Collections.Generic;
@@ -63,7 +64,13 @@ public static Automator InstanceForSession(string sessionId)
                     {
                         if (sessionId == null)
                         {
-                            sessionId = "AwesomeSession";
+                            Random random = new Random();
+                            string randomNumber = string.Empty;
+                            for (int i = 0; i < 10; i++)
+                            {
+                                randomNumber += random.Next(0, 10).ToString();
+                            }
+                            sessionId = randomNumber;
                         }
 
                         // TODO: Add actual support for sessions. Temporary return single Automator for any season

src/Winium.Desktop.Driver/Automator/Capabilities.cs

@@ -27,22 +27,22 @@ internal Capabilities()
 
         #region Public Properties
 
-        [JsonProperty("app")]
+        [JsonProperty("winium:app")]
         public string App { get; set; }
 
-        [JsonProperty("args")]
+        [JsonProperty("winium:args")]
         public string Arguments { get; set; }
 
-        [JsonProperty("debugConnectToRunningApp")]
+        [JsonProperty("winium:debugConnectToRunningApp")]
         public bool DebugConnectToRunningApp { get; set; }
 
-        [JsonProperty("innerPort")]
+        [JsonProperty("winium:innerPort")]
         public int InnerPort { get; set; }
 
-        [JsonProperty("keyboardSimulator")]
+        [JsonProperty("winium:keyboardSimulator")]
         public KeyboardSimulatorType KeyboardSimulator { get; set; }
 
-        [JsonProperty("launchDelay")]
+        [JsonProperty("winium:launchDelay")]
         public int LaunchDelay { get; set; }
 
         #endregion

src/Winium.Desktop.Driver/CommandExecutors/DoubleClickElementExecutor.cs

@@ -0,0 +1,17 @@
+namespace Winium.Desktop.Driver.CommandExecutors
+{
+    internal class DoubleClickElementExecutor : CommandExecutorBase
+    {
+        #region Methods
+
+        protected override string DoImpl()
+        {
+            var registeredKey = this.ExecutedCommand.Parameters["ID"].ToString();
+            this.Automator.ElementsRegistry.GetRegisteredElement(registeredKey).DoubleClick();
+
+            return this.JsonResponse();
+        }
+
+        #endregion
+    }
+}

src/Winium.Desktop.Driver/CommandExecutors/NewSessionExecutor.cs

@@ -5,6 +5,7 @@
     using System.Threading;
 
     using Newtonsoft.Json;
+    using Newtonsoft.Json.Linq;
 
     using Winium.Cruciatus;
     using Winium.Cruciatus.Settings;
@@ -22,17 +23,22 @@ protected override string DoImpl()
         {
             // It is easier to reparse desired capabilities as JSON instead of re-mapping keys to attributes and calling type conversions, 
             // so we will take possible one time performance hit by serializing Dictionary and deserializing it as Capabilities object
-            var serializedCapability =
-                JsonConvert.SerializeObject(this.ExecutedCommand.Parameters["desiredCapabilities"]);
-            this.Automator.ActualCapabilities = Capabilities.CapabilitiesFromJsonString(serializedCapability);
+            JObject cap = 
+                JObject.Parse(
+                    JsonConvert.SerializeObject(
+                        this.ExecutedCommand.Parameters["capabilities"]));
+            var alwaysMatch = cap.SelectToken("alwaysMatch");
+            this.Automator.ActualCapabilities =
+                Capabilities.CapabilitiesFromJsonString(alwaysMatch.ToString());
 
             this.InitializeApplication(this.Automator.ActualCapabilities.DebugConnectToRunningApp);
             this.InitializeKeyboardEmulator(this.Automator.ActualCapabilities.KeyboardSimulator);
 
             // Gives sometime to load visuals (needed only in case of slow emulation)
             Thread.Sleep(this.Automator.ActualCapabilities.LaunchDelay);
 
-            return this.JsonResponse(ResponseStatus.Success, this.Automator.ActualCapabilities);
+            AutomatorResponse resp = new AutomatorResponse(this.Automator.Session, this.Automator.ActualCapabilities);
+            return this.JsonResponse(ResponseStatus.Success, resp);
         }
 
         private void InitializeApplication(bool debugDoNotDeploy = false)
@@ -56,4 +62,25 @@ private void InitializeKeyboardEmulator(KeyboardSimulatorType keyboardSimulatorT
 
         #endregion
     }
+
+    internal class AutomatorResponse
+    {
+        #region Constructors and Destructors
+
+        public AutomatorResponse(string sessionId, Capabilities capabilities)
+        {
+            this.SessionId = sessionId;
+            this.Capabilities = capabilities;
+        }
+        #endregion
+
+        #region Public Properties
+
+        [JsonProperty("sessionId")]
+        public string SessionId { get; set; }
+
+        [JsonProperty("capabilities")]
+        public Capabilities Capabilities { get; set; }
+        #endregion
+    }
 }

src/Winium.Desktop.Driver/UriDispatchTables.cs

@@ -163,6 +163,9 @@ private void InitializeSeleniumCommandDictionary()
             this.commandDictionary.Add(
                 DriverCommand.ClickElement,
                 new CommandInfo("POST", "/session/{sessionId}/element/{id}/click"));
+            this.commandDictionary.Add(
+                DriverCommand.DoubleClickElement,
+                new CommandInfo("POST", "/session/{sessionId}/element/{id}/doubleClickElement"));
             this.commandDictionary.Add(
                 DriverCommand.GetElementText,
                 new CommandInfo("GET", "/session/{sessionId}/element/{id}/text"));

src/Winium.Desktop.Driver/Winium.Desktop.Driver.csproj

@@ -69,6 +69,7 @@
   <ItemGroup>
     <Compile Include="Automator\Automator.cs" />
     <Compile Include="Automator\Capabilities.cs" />
+    <Compile Include="CommandExecutors\DoubleClickElementExecutor.cs" />
     <Compile Include="CommandExecutors\CollapseComboBoxExecutor.cs" />
     <Compile Include="CommandExecutors\FindComboBoxSelectedItemExecutor.cs" />
     <Compile Include="CommandExecutors\GetOrientationExecutor.cs" />

src/Winium.Desktop.Driver/packages.config

@@ -3,7 +3,7 @@
   <package id="CommandLineParser" version="1.9.71" targetFramework="net451" userInstalled="true" />
   <package id="ILMerge.Tools" version="2.14.1208" />
   <package id="InputSimulator" version="1.0.4.0" targetFramework="net451" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" userInstalled="true" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net45" userInstalled="true" />
   <package id="NLog" version="3.1.0.0" targetFramework="net451" />
   <package id="Selenium.WebDriver" version="2.53.1" targetFramework="net451" />
   <package id="Winium.Cruciatus" version="2.10.0" targetFramework="net451" />

src/Winium.StoreApps.Common/DriverCommand.cs

@@ -35,6 +35,12 @@ public static class DriverCommand
         /// </summary>
         public static readonly string ClickElement = "clickElement";
 
+        /// <summary>
+        /// Represents DoubleClickElement command
+        /// 
+        /// </summary>
+        public static readonly string DoubleClickElement = "doubleClickElement";
+
         /// <summary>
         /// Represents a Browser close command
         /// 

src/Winium.StoreApps.Common/JsonWireClasses.cs

@@ -23,7 +23,7 @@ public JsonElementContent(string element)
 
         #region Public Properties
 
-        [JsonProperty("ELEMENT")]
+        [JsonProperty("element-6066-11e4-a52e-4f735466cecf")]
         public string Element { get; set; }
 
         #endregion