A bunch more things

sample/test/DeviceTestingKitApp.UITests.NUnitTests/BaseUITests.cs

@@ -9,6 +9,7 @@ namespace DeviceTestingKitApp.UITests.NUnitTests;
 [TestFixture("android")]
 [TestFixture("windows")]
 [TestFixture("web")]
+[TestFixture("web_playwright")]
 [Parallelizable(ParallelScope.Fixtures)]
 public abstract class BaseUITests
 {

sample/test/DeviceTestingKitApp.UITests.NUnitTests/MainPageTests.cs

@@ -13,6 +13,7 @@ public MainPageTests(string appKey)
 	public void InitialStateIsCorrect()
 	{
 		var element = App.FindElement(by => by.Id("CounterButton"));
+		Assert.NotNull(element);
 
 		Assert.That(element.GetText(), Is.EqualTo("Click me!"));
 	}
@@ -21,6 +22,7 @@ public void InitialStateIsCorrect()
 	public async Task SingleIncrementIncrementsByOne()
 	{
 		var element = App.FindElement(by => by.Id("CounterButton"));
+		Assert.NotNull(element);
 
 		element.Click();
 		await Task.Delay(500);
@@ -36,6 +38,7 @@ public async Task SingleIncrementIncrementsByOne()
 	public async Task ClickingMultipleTimesKeepsIncrementing(int clicks, string text)
 	{
 		var element = App.FindElement(by => by.Id("CounterButton"));
+		Assert.NotNull(element);
 
 		for (var i = 0; i < clicks; i++)
 		{

sample/test/DeviceTestingKitApp.UITests.NUnitTests/PlaywrightServerTests.cs

@@ -18,7 +18,7 @@ public async Task IsReady()
 		using var playwright = await Playwright.CreateAsync();
 
 		await using var browser = await playwright.Chromium.LaunchAsync(new BrowserTypeLaunchOptions { Channel = "msedge" });
-		
+
 		var page = await browser.NewPageAsync();
 
 		await page.GotoAsync("https://playwright.dev/dotnet");

sample/test/DeviceTestingKitApp.UITests.NUnitTests/UITestsSetupFixture.cs

@@ -1,5 +1,6 @@
 using DeviceRunners.UIAutomation;
 using DeviceRunners.UIAutomation.Appium;
+using DeviceRunners.UIAutomation.Playwright;
 using DeviceRunners.UIAutomation.Selenium;
 
 using NUnit.Framework.Internal;
@@ -23,6 +24,9 @@ public void OneTimeSetUp()
 					.UseAppId("com.companyname.devicetestingkitapp_9zz4h110yvjzm!App")))
 			.AddSelenium(selenium => selenium
 				.AddMicrosoftEdge("web", options => options
+					.UseInitialUrl("https://localhost:7096/")))
+			.AddPlaywright(playwright => playwright
+				.AddMicrosoftEdge("web_playwright", options => options
 					.UseInitialUrl("https://localhost:7096/")));
 
 		TestSuite = builder.Build();

src/DeviceRunners.UIAutomation.Appium/Commands/AppiumClickCoordinatesCommand.cs

@@ -6,15 +6,17 @@
 
 namespace DeviceRunners.UIAutomation.Appium;
 
-public class AppiumClickCoordinatesCommand : AppiumElementCommand
+public class AppiumClickCoordinatesCommand : AutomatedAppCommand<AppiumAutomatedApp>
 {
 	public AppiumClickCoordinatesCommand()
 		: base(CommonCommandNames.ClickCoordinates)
 	{
 	}
 
-	public override object? Execute(AppiumAutomatedApp app, AppiumElement appiumElement, IReadOnlyDictionary<string, object> parameters)
+	public override object? Execute(AppiumAutomatedApp app, IReadOnlyDictionary<string, object>? parameters = null)
 	{
+		if (parameters is null)
+			throw new ArgumentException("No coordinates found in parameters", nameof(parameters));
 		if (!parameters.TryGetValue("x", out var x))
 			throw new ArgumentException("X coordinate not found in parameters", nameof(parameters));
 		if (!parameters.TryGetValue("y", out var y))

src/DeviceRunners.UIAutomation.Playwright/AutomatedBrowsers/Edge/PlaywrightAutomationOptionsBuilderExtensions.cs

@@ -0,0 +1,18 @@
+namespace DeviceRunners.UIAutomation.Playwright;
+
+public static partial class PlaywrightAutomationOptionsBuilderExtensions
+{
+	public static PlaywrightAutomationOptionsBuilder AddMicrosoftEdge(this PlaywrightAutomationOptionsBuilder builder, string key, Action<EdgePlaywrightAutomatedAppOptionsBuilder> optionsAction)
+	{
+		var optionsBuilder = new EdgePlaywrightAutomatedAppOptionsBuilder(key);
+
+		optionsBuilder.AddDefaultPlaywrightCommands();
+		//optionsBuilder.AddDefaultAndroidPlaywrightCommands();
+
+		optionsAction(optionsBuilder);
+
+		builder.AddApp(key, optionsBuilder.Build());
+
+		return builder;
+	}
+}

src/DeviceRunners.UIAutomation.Playwright/AutomationTestSuiteBuilderExtensions.cs

@@ -1,34 +1,34 @@
-//namespace DeviceRunners.UIAutomation.Playwright;
+namespace DeviceRunners.UIAutomation.Playwright;
 
-//public static class AutomationTestSuiteBuilderExtensions
-//{
-//	public static AutomationTestSuiteBuilder AddPlaywright(this AutomationTestSuiteBuilder builder, Action<PlaywrightAutomationOptionsBuilder> optionsAction)
-//	{
-//		var optionsBuilder = new PlaywrightAutomationOptionsBuilder();
+public static class AutomationTestSuiteBuilderExtensions
+{
+	public static AutomationTestSuiteBuilder AddPlaywright(this AutomationTestSuiteBuilder builder, Action<PlaywrightAutomationOptionsBuilder> optionsAction)
+	{
+		var optionsBuilder = new PlaywrightAutomationOptionsBuilder();
 
-//		optionsAction(optionsBuilder);
+		optionsAction(optionsBuilder);
 
-//		var playwright = new PlaywrightAutomationFramework(
-//			optionsBuilder.Options,
-//			optionsBuilder.Apps,
-//			new CompositeLogger(optionsBuilder.Loggers));
+		var playwright = new PlaywrightAutomationFramework(
+			optionsBuilder.Options,
+			optionsBuilder.Apps,
+			new CompositeLogger(optionsBuilder.Loggers));
 
-//		builder.AddAutomationFramework(playwright);
+		builder.AddAutomationFramework(playwright);
 
-//		return builder;
-//	}
+		return builder;
+	}
 
-//	class CompositeLogger : IPlaywrightDiagnosticLogger
-//	{
-//		private readonly List<IPlaywrightDiagnosticLogger> _loggers;
+	class CompositeLogger : IPlaywrightDiagnosticLogger
+	{
+		private readonly List<IPlaywrightDiagnosticLogger> _loggers;
 
-//		public CompositeLogger(IEnumerable<IPlaywrightDiagnosticLogger> loggers) =>
-//			_loggers = loggers.ToList();
+		public CompositeLogger(IEnumerable<IPlaywrightDiagnosticLogger> loggers) =>
+			_loggers = loggers.ToList();
 
-//		public void Log(string message)
-//		{
-//			foreach (var logger in _loggers)
-//				logger.Log(message);
-//		}
-//	}
-//}
+		public void Log(string message)
+		{
+			foreach (var logger in _loggers)
+				logger.Log(message);
+		}
+	}
+}