Merge pull request #13 from pictos/pj/update-code-to-match-21305

Update files to match .NET MAUI implementation
jfversluis · May 14, 2024 · 7a7dff8 · 7a7dff8
2 parents 6ef4fe9 + 44b3136
commit 7a7dff8
Show file tree

Hide file tree

Showing 10 changed files with 859 additions and 21 deletions.
diff --git a/src/Plugin.Maui.UITestHelpers.Appium/Actions/AppiumCatalystMouseActions.cs b/src/Plugin.Maui.UITestHelpers.Appium/Actions/AppiumCatalystMouseActions.cs
@@ -0,0 +1,63 @@
+using OpenQA.Selenium.Appium;
+using Plugin.Maui.UITestHelpers.Core;
+
+namespace Plugin.Maui.UITestHelpers.Appium
+{
+	public class AppiumCatalystMouseActions : ICommandExecutionGroup
+	{
+		const string DoubleClickCommand = "doubleClick";
+
+		readonly List<string> _commands = new()
+		{
+			DoubleClickCommand,
+		};
+		readonly AppiumApp _appiumApp;
+
+		public AppiumCatalystMouseActions(AppiumApp appiumApp)
+		{
+			_appiumApp = appiumApp;
+		}
+
+		public bool IsCommandSupported(string commandName)
+		{
+			return _commands.Contains(commandName, StringComparer.OrdinalIgnoreCase);
+		}
+
+		public CommandResponse Execute(string commandName, IDictionary<string, object> parameters)
+		{
+			return commandName switch
+			{
+				DoubleClickCommand => DoubleClick(parameters),
+				_ => CommandResponse.FailedEmptyResponse,
+			};
+		}
+
+		CommandResponse DoubleClick(IDictionary<string, object> parameters)
+		{
+			var element = GetAppiumElement(parameters["element"]);
+
+			if (element != null)
+			{
+				_appiumApp.Driver.ExecuteScript("macos: doubleClick", new Dictionary<string, object>
+				{
+					{ "elementId", element.Id },
+				});
+			}
+			return CommandResponse.SuccessEmptyResponse;
+		}
+
+		static AppiumElement? GetAppiumElement(object element)
+		{
+			if (element is AppiumElement appiumElement)
+			{
+				return appiumElement;
+			}
+			else if (element is AppiumDriverElement driverElement)
+			{
+				return driverElement.AppiumElement;
+			}
+
+			return null;
+		}
+	}
+}
diff --git a/...m/Actions/AppiumCatalystPointerActions.cs → ...ium/Actions/AppiumCatalystTouchActions.cs b/...m/Actions/AppiumCatalystPointerActions.cs → ...ium/Actions/AppiumCatalystTouchActions.cs
@@ -3,19 +3,19 @@
 
 namespace Plugin.Maui.UITestHelpers.Appium
 {
-	public class AppiumCatalystPointerActions : ICommandExecutionGroup
+	public class AppiumCatalystTouchActions : ICommandExecutionGroup
 	{
-		const string DoubleClickCommand = "doubleClick";
+		const string DoubleTapCommand = "doubleTap";
 		const string DragAndDropCommand = "dragAndDrop";
 
 		readonly List<string> _commands = new()
 		{
-			DoubleClickCommand,
+			DoubleTapCommand,
 			DragAndDropCommand,
 		};
 		readonly AppiumApp _appiumApp;
 
-		public AppiumCatalystPointerActions(AppiumApp appiumApp)
+		public AppiumCatalystTouchActions(AppiumApp appiumApp)
 		{
 			_appiumApp = appiumApp;
 		}
@@ -29,13 +29,13 @@ public CommandResponse Execute(string commandName, IDictionary<string, object> p
 		{
 			return commandName switch
 			{
-				DoubleClickCommand => DoubleClick(parameters),
+				DoubleTapCommand => DoubleTap(parameters),
 				DragAndDropCommand => DragAndDrop(parameters),
 				_ => CommandResponse.FailedEmptyResponse,
 			};
 		}
 
-		CommandResponse DoubleClick(IDictionary<string, object> parameters)
+		CommandResponse DoubleTap(IDictionary<string, object> parameters)
 		{
 			var element = GetAppiumElement(parameters["element"]);
 

diff --git a/src/Plugin.Maui.UITestHelpers.Appium/Actions/AppiumIOSMouseActions.cs b/src/Plugin.Maui.UITestHelpers.Appium/Actions/AppiumIOSMouseActions.cs
@@ -0,0 +1,65 @@
+using OpenQA.Selenium.Appium;
+using Plugin.Maui.UITestHelpers.Core;
+
+
+namespace Plugin.Maui.UITestHelpers.Appium
+{
+	public class AppiumIOSMouseActions : ICommandExecutionGroup
+	{
+		const string DoubleClickCommand = "doubleClick";
+
+		readonly List<string> _commands = new()
+		{
+			DoubleClickCommand,
+		};
+		readonly AppiumApp _appiumApp;
+
+		public AppiumIOSMouseActions(AppiumApp appiumApp)
+		{
+			_appiumApp = appiumApp;
+		}
+
+		public bool IsCommandSupported(string commandName)
+		{
+			return _commands.Contains(commandName, StringComparer.OrdinalIgnoreCase);
+		}
+
+		public CommandResponse Execute(string commandName, IDictionary<string, object> parameters)
+		{
+			return commandName switch
+			{
+				DoubleClickCommand => DoubleClick(parameters),
+				_ => CommandResponse.FailedEmptyResponse,
+			};
+		}
+
+		CommandResponse DoubleClick(IDictionary<string, object> parameters)
+		{
+			var element = GetAppiumElement(parameters["element"]);
+
+			if (element != null)
+			{
+				_appiumApp.Driver.ExecuteScript("mobile: doubleTap", new Dictionary<string, object>
+				{
+					{ "elementId", element.Id },
+				});
+			}
+
+			return CommandResponse.SuccessEmptyResponse;
+		}
+
+		static AppiumElement? GetAppiumElement(object element)
+		{
+			if (element is AppiumElement appiumElement)
+			{
+				return appiumElement;
+			}
+			else if (element is AppiumDriverElement driverElement)
+			{
+				return driverElement.AppiumElement;
+			}
+
+			return null;
+		}
+	}
+}
diff --git a/...Appium/Actions/AppiumIOSPointerActions.cs → ...s.Appium/Actions/AppiumIOSTouchActions.cs b/...Appium/Actions/AppiumIOSPointerActions.cs → ...s.Appium/Actions/AppiumIOSTouchActions.cs
@@ -3,19 +3,19 @@
 
 namespace Plugin.Maui.UITestHelpers.Appium
 {
-	public class AppiumIOSPointerActions : ICommandExecutionGroup
+	public class AppiumIOSTouchActions : ICommandExecutionGroup
 	{
-		const string DoubleClickCommand = "doubleClick";
+		const string DoubleTapCommand = "doubleTap";
 		const string DragAndDropCommand = "dragAndDrop";
 
 		readonly List<string> _commands = new()
 		{
-			DoubleClickCommand,
+			DoubleTapCommand,
 			DragAndDropCommand
 		};
 		readonly AppiumApp _appiumApp;
 
-		public AppiumIOSPointerActions(AppiumApp appiumApp)
+		public AppiumIOSTouchActions(AppiumApp appiumApp)
 		{
 			_appiumApp = appiumApp;
 		}
@@ -29,13 +29,13 @@ public CommandResponse Execute(string commandName, IDictionary<string, object> p
 		{
 			return commandName switch
 			{
-				DoubleClickCommand => DoubleClick(parameters),
+				DoubleTapCommand => DoubleTap(parameters),
 				DragAndDropCommand => DragAndDrop(parameters),
 				_ => CommandResponse.FailedEmptyResponse,
 			};
 		}
 
-		CommandResponse DoubleClick(IDictionary<string, object> parameters)
+		CommandResponse DoubleTap(IDictionary<string, object> parameters)
 		{
 			var element = GetAppiumElement(parameters["element"]);