Pull changes from NetlifeBackupSolutions/Winium.StoreApps fork

README.md

@@ -1,3 +1,8 @@
+
+# Capture Winium tests
+
+The Capture specific SystemTest documentation can be found [here.](https://gist.github.com/ole-vegard/05ae46c2d7accd170f9f)
+
 <p align="right">
 English description | <a href="README_RU.md">Описание на русском</a>
 </p>

Winium/Winium.Mobile.Connectivity/Deployer.cs

@@ -128,6 +128,25 @@ public void SendFiles(List<KeyValuePair<string, string>> files)
             }
         }
 
+        public void InstallDependencies(List<string> dependencies )
+        {
+            if (dependencies == null || !dependencies.Any())
+            {
+                return;
+            }
+
+            foreach (var dependency in dependencies)
+            {
+                InstallDependency(dependency);
+            }
+        }
+
+        public void InstallDependency(string path)
+        {
+            var appManifest = Utils.ReadAppManifestInfoFromPackage(path);
+            Utils.InstallApplication(this.deviceInfo, appManifest, DeploymentOptions.None, path);
+        }
+
         public void Terminate()
         {
             throw new NotImplementedException("Deployer.Terminate");
@@ -167,19 +186,6 @@ private IAppManifestInfo InstallApplicationPackage(string path)
             return appManifest;
         }
 
-        private void InstallDependencies(List<string> dependencies)
-        {
-            if (dependencies == null || !dependencies.Any())
-            {
-                return;
-            }
-
-            foreach (var dependency in dependencies)
-            {
-                this.InstallApplicationPackage(dependency);
-            }
-        }
-
         #endregion
     }
 }

Winium/Winium.StoreApps.Driver/Automator/Automator.cs

@@ -244,6 +244,41 @@ private void InitializeDeployer()
             return new Point(x, y);
         }
 
+        public Rectangle? RequestElementRect(JToken element)
+        {
+            var command = new Command(
+                DriverCommand.GetElementRect, 
+                new Dictionary<string, JToken> { { "ID", element } });
+
+            var responseBody = this.CommandForwarder.ForwardCommand(command);
+
+            var deserializeObject = JsonConvert.DeserializeObject<JsonResponse>(responseBody);
+
+            if (deserializeObject.Status != ResponseStatus.Success)
+            {
+                return null;
+            }
+
+            var locationObject = deserializeObject.Value as JObject;
+            if (locationObject == null)
+            {
+                return null;
+            }
+
+            var location = locationObject.ToObject<Dictionary<string, int>>();
+
+            if (location == null)
+            {
+                return null;
+            }
+
+            var x = location["x"];
+            var y = location["y"];
+            var width = location["width"];
+            var height = location["height"];
+            return new Rectangle(x, y, width, height);
+        }
+
         #endregion
 
         #region Methods

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

Winium/Winium.StoreApps.Driver/CommandExecutors/ExecuteScriptExecutor.cs

@@ -1,4 +1,6 @@
-namespace Winium.StoreApps.Driver.CommandExecutors
+using System.Collections.Generic;
+
+namespace Winium.StoreApps.Driver.CommandExecutors
 {
     #region
 
@@ -50,6 +52,17 @@ internal object ExecuteMobileScript(string command)
             return null;
         }
 
+        internal object ExecuteStorageScript(string command)
+        {
+            switch (command)
+            {
+                case "ReadLocalTextFile":
+                    return ReadLocalTextFileExecutor.ReadFile(this.Automator, ExecutedCommand);
+                default:
+                    throw new AutomationException("Unknown storage command: " + command, ResponseStatus.UnknownCommand);
+            }
+        }
+
         internal object ForwardCommand()
         {
             var responseBody = this.Automator.CommandForwarder.ForwardCommand(this.ExecutedCommand);
@@ -87,6 +100,9 @@ protected override string DoImpl()
                 case "mobile:":
                     response = this.ExecuteMobileScript(command);
                     break;
+                case "storage:":
+                    response = this.ExecuteStorageScript(command);
+                    break;
                 default:
                     response = this.ForwardCommand();
                     break;

Winium/Winium.StoreApps.Driver/CommandExecutors/MouseMoveToExecutor.cs

@@ -17,16 +17,26 @@ internal class MouseMoveToExecutor : CommandExecutorBase
         protected override string DoImpl()
         {
             var elementId = Automator.GetValue<string>(this.ExecutedCommand.Parameters, "element");
-            Point coordinates;
-            if (elementId != null)
+            var xOffsetParam = this.ExecutedCommand.Parameters["xoffset"];
+            var yOffsetParam = this.ExecutedCommand.Parameters["yoffset"];
+
+            Point coordinates = new Point();
+            if (xOffsetParam != null && yOffsetParam != null)
             {
-                coordinates = this.Automator.RequestElementLocation(elementId).GetValueOrDefault();
+                var xOffset = Convert.ToInt32(xOffsetParam, CultureInfo.InvariantCulture);
+                var yOffset = Convert.ToInt32(yOffsetParam, CultureInfo.InvariantCulture);
+                coordinates = new Point(xOffset, yOffset);
+
+                if (elementId != null)
+                {
+                    var elementRect = Automator.RequestElementRect(elementId).GetValueOrDefault();
+                    coordinates.X += elementRect.X;
+                    coordinates.Y += elementRect.Y;
+                }
             }
-            else
+            else if (elementId != null)
             {
-                var xOffset = Convert.ToInt32(this.ExecutedCommand.Parameters["xoffset"], CultureInfo.InvariantCulture);
-                var yOffset = Convert.ToInt32(this.ExecutedCommand.Parameters["yoffset"], CultureInfo.InvariantCulture);
-                coordinates = new Point(xOffset, yOffset);
+                coordinates = this.Automator.RequestElementLocation(elementId).GetValueOrDefault();
             }
 
             this.Automator.EmulatorController.MoveCursorTo(coordinates);

Winium/Winium.StoreApps.Driver/CommandExecutors/ReadLocalTextFileExecutor.cs

@@ -0,0 +1,47 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Winium.StoreApps.Common.Exceptions;
+
+namespace Winium.StoreApps.Driver.CommandExecutors
+{
+    using System;
+    using System.Threading;
+
+    using Winium.StoreApps.Common;
+    using Winium.StoreApps.Driver.Automator;
+
+    internal class ReadLocalTextFileExecutor : CommandExecutorBase
+    {
+        #region Public Methods and Operators
+
+        public static string ReadFile(Automator automator, Command command)
+        {
+            var args = command.Parameters["args"] as JArray;
+            if (args == null || args.Count == 0) {
+                throw new AutomationException("Missing file name", ResponseStatus.UnknownCommand);
+            }
+
+            var filename = args[0].ToString();
+            var filePath = Path.GetTempFileName();
+            automator.Deployer.ReceiveFile("Local", filename, filePath);
+            using (var file = File.OpenText(filePath)) {
+                return file.ReadToEnd();
+            }
+        }
+
+        #endregion
+
+        #region Methods
+
+        protected override string DoImpl()
+        {
+            var fileContent = ReadFile(this.Automator, this.ExecutedCommand);
+            return this.JsonResponse(ResponseStatus.Success, fileContent);
+        }
+
+        #endregion
+    }
+}

Winium/Winium.StoreApps.Driver/Winium.StoreApps.Driver.csproj

@@ -56,6 +56,7 @@
   <ItemGroup>
     <Compile Include="Automator\Automator.cs" />
     <Compile Include="Automator\Capabilities.cs" />
+    <Compile Include="CommandExecutors\ReadLocalTextFileExecutor.cs" />
     <Compile Include="CommandExecutors\GetElementAttributeExecutor.cs" />
     <Compile Include="CommandExecutors\CloseAppExecutor.cs" />
     <Compile Include="CommandExecutors\LaunchAppExecutor.cs" />

Winium/Winium.StoreApps.InnerServer/Automator.cs

@@ -157,6 +157,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);

Winium/Winium.StoreApps.InnerServer/Commands/AlertCommand.cs

@@ -40,8 +40,14 @@ protected override string DoImpl()
         {
             var buttonName = this.Action == With.Accept ? "Button1Host" : "Button2Host";
 
-            var popup = WiniumVirtualRoot.Current.OpenPopups.FirstOrDefault();
-            if (popup == null || !popup.ClassName.EndsWith(".ContentDialog"))
+            WiniumElement popup = null;
+            foreach (var winiumElement in WiniumVirtualRoot.Current.OpenPopups) {
+                if (winiumElement.ClassName.EndsWith(".ContentDialog")) {
+                    popup = winiumElement;
+                    break;
+                }
+            }
+            if (popup == null)
             {
                 throw new AutomationException("No alert is displayed", ResponseStatus.NoAlertOpenError);
             }

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
+    }
+}

Winium/Winium.StoreApps.InnerServer/Commands/CommandBase.cs

@@ -43,11 +43,11 @@ public string Do()
             }
             catch (AutomationException exception)
             {
-                response = this.JsonResponse(exception.Status, exception);
+                response = this.JsonResponse(exception.Status, exception.ToString());
             }
             catch (Exception exception)
             {
-                response = this.JsonResponse(ResponseStatus.UnknownError, exception);
+                response = this.JsonResponse(ResponseStatus.UnknownError, exception.ToString());
             }
 
             return response;
@@ -93,7 +93,7 @@ private static void InvokeSync(CoreDispatcher dispatcher, Action action)
 
             if (exception != null)
             {
-                throw exception;
+                throw new Exception("An exception occured while execuiting a command. ", exception);
             }
         }
 

Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs

@@ -56,6 +56,11 @@ internal static object GetPropertyCascade(
                 return propertyObject;
             }
 
+            if (element.TryGetExtensionProperty(key, out propertyObject))
+            {
+                return propertyObject;
+            }
+
             return null;
         }