Merge pull request #7 from NetlifeBackupSolutions/olevegard/appbar

Changed click in Winium.StoreApps
2gis · Oct 23, 2015 · f2ca1de · f2ca1de
2 parents 3f799c0 + b404612
commit f2ca1de
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 3 deletions.
diff --git a/Winium/Winium.StoreApps.Driver/CommandExecutors/ClickElementExecutor.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/ClickElementExecutor.cs
@@ -3,6 +3,7 @@
     #region
 
     using Winium.StoreApps.Driver.Automator;
+    using System;
 
     #endregion
 
@@ -27,9 +28,12 @@ internal static bool ClickElement(Automator automator, string elementId)
 
         protected override string DoImpl()
         {
-            ClickElement(this.Automator, this.ExecutedCommand.Parameters["ID"].ToString());
-
-            return this.JsonResponse();
+            try {
+                return this.Automator.CommandForwarder.ForwardCommand(this.ExecutedCommand);
+            } catch (Exception e) {
+                ClickElement(this.Automator, this.ExecutedCommand.Parameters["ID"].ToString());
+                return this.JsonResponse();
+            }
         }
 
         #endregion

diff --git a/Winium/Winium.StoreApps.InnerServer/Automator.cs b/Winium/Winium.StoreApps.InnerServer/Automator.cs
@@ -153,6 +153,10 @@ public string ProcessCommand(string content)
             {
                 commandToExecute = new CloseAppCommand();
             }
+            else if (command.Equals(DriverCommand.ClickElement))
+            {
+                commandToExecute = new ClickCommand {ElementId = elementId};
+            }
             else
             {
                 throw new NotImplementedException("Not implemented: " + command);

diff --git a/Winium/Winium.StoreApps.InnerServer/Commands/ClickCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ClickCommand.cs
@@ -0,0 +1,44 @@
+namespace Winium.StoreApps.InnerServer.Commands
+{
+    #region
+
+    using Windows.UI.Xaml.Automation.Peers;
+    using Windows.UI.Xaml.Automation.Provider;
+    using Windows.UI.Xaml.Controls;
+    using Common;
+
+    #endregion
+
+    internal class ClickCommand : CommandBase
+    {
+        #region Public Properties
+
+        public string ElementId { private get; set; }
+
+        #endregion
+
+        #region Public Methods and Operators
+
+        protected override string DoImpl()
+        {
+            var element = this.Automator.ElementsRegistry.GetRegisteredElement(this.ElementId);
+            Button button = element.Element as Button;
+            if (button != null)
+            {
+                ButtonAutomationPeer peer = new ButtonAutomationPeer(button);
+                IInvokeProvider invokeProv = peer.GetPattern(PatternInterface.Invoke) as IInvokeProvider;
+                if (invokeProv != null)
+                {
+                    invokeProv.Invoke();
+                    return this.JsonResponse(ResponseStatus.Success, "");
+                }
+
+                return this.JsonResponse(ResponseStatus.UnknownError, "Failed to create invocation provider : " + this.ElementId);
+            }
+
+            return this.JsonResponse(ResponseStatus.UnknownError, "Element is not a button" + this.ElementId);
+        }
+
+        #endregion
+    }
+}
diff --git a/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj b/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj
@@ -47,6 +47,7 @@
     <Compile Include="AutomationServer.cs" />
     <Compile Include="Automator.cs" />
     <Compile Include="Commands\GetElementRectCommand.cs" />
+    <Compile Include="Commands\ClickCommand.cs" />
     <Compile Include="Commands\GetElementSizeCommand.cs" />
     <Compile Include="ElementsRegistry.cs" />
     <Compile Include="Commands\AlertCommand.cs" />