Fix tests and improve API

lucassklp · Jul 2, 2023 · 09182dc · 09182dc
1 parent 2b453f4
commit 09182dc
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 40 deletions.
diff --git a/Desktop.Robot.TestApp/MouseTests.fs b/Desktop.Robot.TestApp/MouseTests.fs
@@ -112,10 +112,11 @@ let tests (window:Window) = testList "Mouse tests" [
 
     uiTest "Can scroll vertical" <| async {
         let wheelDeltas = window.PointerWheelChanged.Select(fun x -> x.Delta)
-
+        let robot = Robot();
+        robot.AutoDelay <- 100;
         let! deltaEvents = attemptUIActionList wheelDeltas <| async {
-            Robot().MouseScrollVertical(100) // scroll down
-            Robot().MouseScrollVertical(-100) // then scroll up
+            robot.MouseScroll(100) // scroll down
+            robot.MouseScroll(-100) // then scroll up
         }
         Expect.hasLength deltaEvents 2 "Should have a wheel event for each mouse scroll"
         let xDeltas = deltaEvents |> List.map (fun p -> p.X)

diff --git a/Desktop.Robot/AbstractRobot.cs b/Desktop.Robot/AbstractRobot.cs
@@ -1,4 +1,5 @@
 using Desktop.Robot.Clicks;
+using System;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Threading;
@@ -7,7 +8,7 @@ namespace Desktop.Robot
 {
     public abstract class AbstractRobot : IRobot
     {
-        public uint AutoDelay { get; set; }
+        public int AutoDelay { get; set; }
 
         public abstract Point GetMousePosition();
 
@@ -27,9 +28,9 @@ public abstract class AbstractRobot : IRobot
 
         public abstract void MouseScroll(int value);
 
-        public abstract void MouseScroll(int value, int duration);
+        public abstract void MouseScroll(int value, TimeSpan duration);
 
-        public abstract void MouseScroll(int value, int duration, int steps);
+        public abstract void MouseScroll(int value, TimeSpan duration, int steps);
 
         public void MouseMove(Point p) 
         {
@@ -68,14 +69,14 @@ public void MouseUp(IClick click)
             click.ExecuteMouseUp(new MouseContext(GetMousePosition()));
         }
 
-        public void Delay(uint ms)
+        public void Delay(int ms)
         {
-            Thread.Sleep((int)ms);
+            Thread.Sleep(ms);
         }
 
         protected void ApplyAutoDelay()
         {
-            Thread.Sleep((int)AutoDelay);    
+            Thread.Sleep(AutoDelay);    
         }
     }
 }
diff --git a/Desktop.Robot/Extensions/BezierMouseMovementExtension.cs b/Desktop.Robot/Extensions/BezierMouseMovementExtension.cs
@@ -46,13 +46,13 @@ public static void BezierMovement(this IRobot robot, Point initial, Point contro
                 points.Add(GetPoint(t, initial, controlPoint, ending));
             }
 
-            var interval = duration.TotalMilliseconds / points.Count;
+            var interval = Convert.ToInt32(duration.TotalMilliseconds / points.Count);
 
             robot.MouseMove(initial);
 
             //Avoiding AutoDelay
             var currentAutoDelay = robot.AutoDelay;
-            robot.AutoDelay = (uint)interval;
+            robot.AutoDelay = interval;
 
             foreach (var point in points)
             {

diff --git a/Desktop.Robot/Extensions/TypingExtension.cs b/Desktop.Robot/Extensions/TypingExtension.cs
@@ -14,9 +14,9 @@ public static IRobot Type(this IRobot robot, string text)
             return robot;
         }
 
-        public static IRobot Type(this IRobot robot, string text, uint delay)
+        public static IRobot Type(this IRobot robot, string text, int delay)
         {
-            Thread.Sleep((int)robot.AutoDelay);
+            Thread.Sleep(robot.AutoDelay);
             var currentDelay = robot.AutoDelay;
             robot.AutoDelay = delay;
             foreach (var ch in text)

diff --git a/Desktop.Robot/IRobot.cs b/Desktop.Robot/IRobot.cs
@@ -1,11 +1,12 @@
-using System.Drawing;
+using System;
+using System.Drawing;
 using Desktop.Robot.Clicks;
 
 namespace Desktop.Robot
 {
     public interface IRobot
     {
-        uint AutoDelay { get; set; }
+        int AutoDelay { get; set; }
         Image CreateScreenCapture(Rectangle screenRect);
         Color GetPixelColor(int x, int y);
         void KeyPress(Key key);
@@ -17,12 +18,12 @@ public interface IRobot
         void Click(IClick click);
         void MouseDown(IClick click);
         void MouseUp(IClick click);
-        void Delay(uint ms);
+        void Delay(int ms);
         void MouseMove(int x, int y);
         void MouseMove(Point p);
         void MouseScroll(int value);
-        void MouseScroll(int value, int duration);
-        void MouseScroll(int value, int duration, int steps);
+        void MouseScroll(int value, TimeSpan duration);
+        void MouseScroll(int value, TimeSpan duration, int steps);
         Point GetMousePosition();
     }
 }
diff --git a/Desktop.Robot/Linux/Robot.cs b/Desktop.Robot/Linux/Robot.cs
@@ -76,17 +76,17 @@ public override void MouseScroll(int value)
             DoMouseScroll(value, 100);
         }
 
-        public override void MouseScroll(int value, int duration)
+        public override void MouseScroll(int value, TimeSpan duration)
         {
             MouseScroll(value, duration, 100);
         }
 
-        public override void MouseScroll(int value, int duration, int steps)
+        public override void MouseScroll(int value, TimeSpan duration, int steps)
         {
             ApplyAutoDelay();
             for (int i = 0; i < steps; i++)
             {
-                DoMouseScroll(value / steps, duration / steps);
+                DoMouseScroll(value / steps, Convert.ToInt32(duration.TotalMilliseconds) / steps);
             }
         }
 

diff --git a/Desktop.Robot/OSX/Robot.cs b/Desktop.Robot/OSX/Robot.cs
@@ -74,12 +74,12 @@ public override void MouseScroll(int value)
             DoMouseScroll(value);
         }
 
-        public override void MouseScroll(int value, int duration)
+        public override void MouseScroll(int value, TimeSpan duration)
         {
             MouseScroll(value, duration, 50);
         }
 
-        public override void MouseScroll(int value, int duration, int steps)
+        public override void MouseScroll(int value, TimeSpan duration, int steps)
         {
             ApplyAutoDelay();
             for (int i = 0; i < steps; i++)

diff --git a/Desktop.Robot/Robot.cs b/Desktop.Robot/Robot.cs
@@ -29,7 +29,7 @@ public Robot()
             }
         }
 
-        public uint AutoDelay { get => robot.AutoDelay; set => robot.AutoDelay = value; }
+        public int AutoDelay { get => robot.AutoDelay; set => robot.AutoDelay = value; }
 
         public void Click(IClick click)
         {
@@ -41,7 +41,7 @@ public Image CreateScreenCapture(Rectangle screenRect)
             return robot.CreateScreenCapture(screenRect);
         }
 
-        public void Delay(uint ms)
+        public void Delay(int ms)
         {
             robot.Delay(ms);
         }
@@ -107,12 +107,12 @@ public void MouseScroll(int value)
             robot.MouseScroll(-1 * value);
 		}
 
-        public void MouseScroll(int value, int duration)
+        public void MouseScroll(int value, TimeSpan duration)
         {
             robot.MouseScroll(-1 * value, duration);
         }
 
-        public void MouseScroll(int value, int duration, int steps)
+        public void MouseScroll(int value, TimeSpan duration, int steps)
         {
             robot.MouseScroll(-1 * value, duration, steps); 
         }

diff --git a/Desktop.Robot/Windows/Robot.cs b/Desktop.Robot/Windows/Robot.cs
@@ -78,12 +78,12 @@ public override void MouseScroll(int value)
 			DoMouseScroll(value * 100);
         }
 
-        public override void MouseScroll(int value, int duration)
+        public override void MouseScroll(int value, TimeSpan duration)
         {
 			MouseScroll(value, duration, 10);
         }
 
-        public override void MouseScroll(int value, int duration, int steps)
+        public override void MouseScroll(int value, TimeSpan duration, int steps)
         {
             ApplyAutoDelay();
             for (int i = 0; i < steps; i++)

diff --git a/Example/Program.cs b/Example/Program.cs
@@ -13,20 +13,22 @@ public static class Program
         static void Main(string[] args)
         {
             var robot = new Robot();
-            //robot.OnMouseMove().Subscribe(position => Console.WriteLine(position));
+            robot.OnMouseMove().Subscribe(position => Console.WriteLine(position));
             robot.AutoDelay = 1000;
-            //robot.MouseMove(700, 500);
-            //robot.BezierMovement(new Point(0, 0), TimeSpan.FromMilliseconds(1000));
-            //robot.Click();
-            //robot.Type("A invisible cat is using my PC", 125);
-            //robot.CombineKeys(Key.Alt, Key.Tab);
-
-            //using var screenshot = robot.CreateScreenCapture(new Rectangle(100, 100, 200, 200));
-            //var path = Path.Combine(Directory.GetCurrentDirectory(), $"image-{Guid.NewGuid()}.bmp");
-            //screenshot.Save(path, ImageFormat.Bmp);
+            robot.MouseMove(700, 500);
+            robot.BezierMovement(new Point(0, 0), TimeSpan.FromMilliseconds(1000));
+            robot.Click();
+            robot.Type("A invisible cat is using my PC", 125);
+            robot.CombineKeys(Key.Alt, Key.Tab);
+
+            // Code available only on Windows. Need improvement.
+            using var screenshot = robot.CreateScreenCapture(new Rectangle(100, 100, 200, 200));
+            var path = Path.Combine(Directory.GetCurrentDirectory(), $"image-{Guid.NewGuid()}.bmp");
+            screenshot.Save(path, ImageFormat.Bmp);
+
             robot.LinearMovement(300, 300);
             robot.Click();
-            robot.MouseScroll(1000, 5000, 500);
+            robot.MouseScroll(value: -1000, duration: TimeSpan.FromSeconds(5), steps: 500);
         }
     }
 }