Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update files to match .NET MAUI implementation #13

Merged
merged 3 commits into from
May 14, 2024
Merged

Update files to match .NET MAUI implementation #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4a37b5
update files following the #21305 from the .NET MAUI PR
pictos May 8, 2024
5649cb1
update AppiumApp to call the new CommandGroups
pictos May 8, 2024
44b3136
update HelperExtensions to match .NET MUI
pictos May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 63 additions & 0 deletions src/Plugin.Maui.UITestHelpers.Appium/Actions/AppiumCatalystMouseActions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
}
}
12 changes: 6 additions & 6 deletions ...m/Actions/AppiumCatalystPointerActions.cs → ...ium/Actions/AppiumCatalystTouchActions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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"]);

Expand Down
65 changes: 65 additions & 0 deletions src/Plugin.Maui.UITestHelpers.Appium/Actions/AppiumIOSMouseActions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
}
}
12 changes: 6 additions & 6 deletions ...Appium/Actions/AppiumIOSPointerActions.cs → ...s.Appium/Actions/AppiumIOSTouchActions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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"]);

Expand Down
Loading