Merge pull request #57 from zebraxxl/feature/switch-window

SwitchToWindow command implementation
2gis · Oct 20, 2015 · 1858a1e · 1858a1e
2 parents 985acd5 + 005e905
commit 1858a1e
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/src/Winium.Desktop.Driver/CommandExecutors/SwitchToWindowExecutor.cs b/src/Winium.Desktop.Driver/CommandExecutors/SwitchToWindowExecutor.cs
@@ -0,0 +1,35 @@
+namespace Winium.Desktop.Driver.CommandExecutors
+{
+    #region using
+
+    using System.Windows.Automation;
+    using Winium.Cruciatus;
+    using Winium.Cruciatus.Core;
+    using Winium.StoreApps.Common;
+    using Winium.StoreApps.Common.Exceptions;
+
+    #endregion
+
+    internal class SwitchToWindowExecutor : CommandExecutorBase
+    {
+        #region Methods
+
+        protected override string DoImpl()
+        {
+            var windowHandle = int.Parse(this.ExecutedCommand.Parameters["name"].ToString());
+
+            var handleProperty = AutomationElement.NativeWindowHandleProperty;
+            var window = CruciatusFactory.Root.FindElement(By.AutomationProperty(handleProperty, windowHandle));
+            if (window == null)
+            {
+                throw new AutomationException("Window cannot be found", ResponseStatus.NoSuchElement);
+            }
+
+            window.SetFocus();
+
+            return this.JsonResponse();
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Winium.Desktop.Driver/Winium.Desktop.Driver.csproj b/src/Winium.Desktop.Driver/Winium.Desktop.Driver.csproj
@@ -62,7 +62,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Winium.Cruciatus, Version=2.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Winium.Cruciatus.2.8.0\lib\net45\Winium.Cruciatus.dll</HintPath>
+      <HintPath>..\packages\Winium.Cruciatus.2.9.1\lib\net45\Winium.Cruciatus.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -112,6 +112,7 @@
     <Compile Include="CommandExecutors\FindElementExecutor.cs" />
     <Compile Include="CommandExecutors\NewSessionExecutor.cs" />
     <Compile Include="CommandExecutors\NotImplementedExecutor.cs" />
+    <Compile Include="CommandExecutors\SwitchToWindowExecutor.cs" />
     <Compile Include="CommandLineOptions.cs" />
     <Compile Include="ElementsRegistry.cs" />
     <Compile Include="Extensions\AutomationPropertyHelper.cs" />

diff --git a/src/Winium.Desktop.Driver/packages.config b/src/Winium.Desktop.Driver/packages.config
@@ -6,5 +6,5 @@
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" userInstalled="true" />
   <package id="NLog" version="3.1.0.0" targetFramework="net451" />
   <package id="Selenium.WebDriver" version="2.46.0" targetFramework="net451" userInstalled="true" />
-  <package id="Winium.Cruciatus" version="2.8.0" targetFramework="net451" />
+  <package id="Winium.Cruciatus" version="2.9.1" targetFramework="net451" />
 </packages>