From 09c8152023510d5a0a5bd77f24832e5d93f3e2cb Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sat, 30 Dec 2023 09:29:31 +0200
Subject: [PATCH] Add some UI tests

Done: iOS/macOS/Android. TODO: Windows
---
 .../Concepts/AlertsGalleryPage.cs             |  96 ++++++++++++
 .../CoreViews/CorePageView.cs                 |   1 +
 .../samples/Controls.Sample.UITests/Test.cs   |  10 ++
 src/Controls/src/Core/Page/Page.cs            |   2 +-
 .../Tests/Concepts/AlertsGalleryTests.cs      | 142 ++++++++++++++++++
 .../Actions/AppiumAndroidAlertActions.cs      |  95 ++++++++++++
 .../Actions/AppiumAppleAlertActions.cs        |  88 +++++++++++
 .../src/UITest.Appium/AppiumAndroidApp.cs     |   1 +
 .../src/UITest.Appium/AppiumCatalystApp.cs    |   1 +
 .../src/UITest.Appium/AppiumIOSApp.cs         |   1 +
 .../src/UITest.Appium/HelperExtensions.cs     |  75 ++++++++-
 11 files changed, 507 insertions(+), 5 deletions(-)
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Concepts/AlertsGalleryPage.cs
 create mode 100644 src/Controls/tests/UITests/Tests/Concepts/AlertsGalleryTests.cs
 create mode 100644 src/TestUtils/src/UITest.Appium/Actions/AppiumAndroidAlertActions.cs
 create mode 100644 src/TestUtils/src/UITest.Appium/Actions/AppiumAppleAlertActions.cs

diff --git a/src/Controls/samples/Controls.Sample.UITests/Concepts/AlertsGalleryPage.cs b/src/Controls/samples/Controls.Sample.UITests/Concepts/AlertsGalleryPage.cs
new file mode 100644
index 000000000000..d4756fc656b0
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Concepts/AlertsGalleryPage.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample
+{
+	internal class AlertsGalleryPage : CoreGalleryBasePage
+	{
+		protected override void Build()
+		{
+			// ALERTS
+
+			// Test with a single button alert that can be dismissed by tapping the button
+			Add(Test.Alerts.AlertCancel, async t =>
+			{
+				await DisplayAlert(
+					"Alert Title Here",
+					"Alert Message Here",
+					"CANCEL");
+				t.ReportSuccessEvent();
+			});
+
+			// Test alert with options to Accept or Cancel, Accept is the correct option
+			Add(Test.Alerts.AlertAcceptCancelClickAccept, async t =>
+			{
+				var result = await DisplayAlert(
+					"Alert Title Here",
+					"Alert Message Here",
+					"ACCEPT", "CANCEL");
+				if (result)
+					t.ReportSuccessEvent();
+				else
+					t.ReportFailEvent();
+			});
+
+			// Test alert with options to Accept or Cancel, Cancel is the correct option
+			Add(Test.Alerts.AlertAcceptCancelClickCancel, async t =>
+			{
+				var result = await DisplayAlert(
+					"Alert Title Here",
+					"Alert Message Here",
+					"ACCEPT", "CANCEL");
+				if (result)
+					t.ReportFailEvent();
+				else
+					t.ReportSuccessEvent();
+			});
+
+			// ACTION SHEETS
+
+			// Test action sheet with items and Cancel, Item 2 is the correct option
+			Add(Test.Alerts.ActionSheetClickItem, async t =>
+			{
+				var result = await DisplayActionSheet(
+					"Action Sheet Title Here",
+					"CANCEL", "DESTROY",
+					"ITEM 1", "ITEM 2", "ITEM 3");
+				if (result == "ITEM 2")
+					t.ReportSuccessEvent();
+				else
+					t.ReportFailEvent();
+			});
+
+			// Test action sheet with items and Cancel, Cancel is the correct option
+			Add(Test.Alerts.ActionSheetClickCancel, async t =>
+			{
+				var result = await DisplayActionSheet(
+					"Action Sheet Title Here",
+					"CANCEL", "DESTROY",
+					"ITEM 1", "ITEM 2", "ITEM 3");
+				if (result == "CANCEL")
+					t.ReportSuccessEvent();
+				else
+					t.ReportFailEvent();
+			});
+
+			// Test action sheet with items and Cancel, Destroy is the correct option
+			Add(Test.Alerts.ActionSheetClickDestroy, async t =>
+			{
+				var result = await DisplayActionSheet(
+					"Action Sheet Title Here",
+					"CANCEL", "DESTROY",
+					"ITEM 1", "ITEM 2", "ITEM 3");
+				if (result == "DESTROY")
+					t.ReportSuccessEvent();
+				else
+					t.ReportFailEvent();
+			});
+		}
+
+		ExpectedEventViewContainer<Button>
+			Add(Test.Alerts test, Func<ExpectedEventViewContainer<Button>, Task> action) =>
+			Add(new ExpectedEventViewContainer<Button>(test, new Button { Text = "Click Me!" }))
+				.With(t => t.View.Clicked += (_, _) => action(t));
+	}
+}
diff --git a/src/Controls/samples/Controls.Sample.UITests/CoreViews/CorePageView.cs b/src/Controls/samples/Controls.Sample.UITests/CoreViews/CorePageView.cs
index 936cffcb443f..8600d71ff7a9 100644
--- a/src/Controls/samples/Controls.Sample.UITests/CoreViews/CorePageView.cs
+++ b/src/Controls/samples/Controls.Sample.UITests/CoreViews/CorePageView.cs
@@ -49,6 +49,7 @@ public override string ToString()
 			new GalleryPageFactory(() => new GestureRecognizerGallery(), "Gesture Recognizer Gallery"),
 			new GalleryPageFactory(() => new InputTransparencyGalleryPage(), "Input Transparency Gallery"),
 			new GalleryPageFactory(() => new ImageLoadingGalleryPage(), "Image Loading Gallery"),
+			new GalleryPageFactory(() => new AlertsGalleryPage(), "Alerts Gallery"),
 			// Elements
 			new GalleryPageFactory(() => new ActivityIndicatorCoreGalleryPage(), "ActivityIndicator Gallery"),
 			new GalleryPageFactory(() => new BoxViewCoreGalleryPage(), "Box Gallery"),
diff --git a/src/Controls/samples/Controls.Sample.UITests/Test.cs b/src/Controls/samples/Controls.Sample.UITests/Test.cs
index b5b94adc4ff6..54b5f9c88ecf 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Test.cs
+++ b/src/Controls/samples/Controls.Sample.UITests/Test.cs
@@ -731,6 +731,16 @@ public enum InputTransparency
 			CascadeTransLayoutOverlayWithButton,
 		}
 
+		public enum Alerts
+		{
+			AlertCancel,
+			AlertAcceptCancelClickAccept,
+			AlertAcceptCancelClickCancel,
+			ActionSheetClickItem,
+			ActionSheetClickCancel,
+			ActionSheetClickDestroy,
+		}
+
 		public static class InputTransparencyMatrix
 		{
 			// this is both for color diff and cols
diff --git a/src/Controls/src/Core/Page/Page.cs b/src/Controls/src/Core/Page/Page.cs
index e86197a2a1ba..853493dac656 100644
--- a/src/Controls/src/Core/Page/Page.cs
+++ b/src/Controls/src/Core/Page/Page.cs
@@ -241,7 +241,7 @@ public Task<string> DisplayActionSheet(string title, string cancel, string destr
 		/// Displays a platform action sheet, allowing the application user to choose from several buttons.
 		/// </summary>
 		/// <param name="title">Title of the displayed action sheet. Can be <see langword="null"/> to hide the title.</param>
-		/// <param name="cancel">Text to be displayed in the 'Cancel' button. Can be null to hide the <see langword="null"/> action.</param>
+		/// <param name="cancel">Text to be displayed in the 'Cancel' button. Can be null to hide the cancel action.</param>
 		/// <param name="destruction">Text to be displayed in the 'Destruct' button. Can be <see langword="null"/> to hide the destructive option.</param>
 		/// <param name="flowDirection">The flow direction to be used by the action sheet.</param>
 		/// <param name="buttons">Text labels for additional buttons.</param>
diff --git a/src/Controls/tests/UITests/Tests/Concepts/AlertsGalleryTests.cs b/src/Controls/tests/UITests/Tests/Concepts/AlertsGalleryTests.cs
new file mode 100644
index 000000000000..d7abe8dec96b
--- /dev/null
+++ b/src/Controls/tests/UITests/Tests/Concepts/AlertsGalleryTests.cs
@@ -0,0 +1,142 @@
+using Maui.Controls.Sample;
+using NUnit.Framework;
+using OpenQA.Selenium.Appium;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.AppiumTests
+{
+	public class AlertsGalleryTests : CoreGalleryBasePageTest
+	{
+		public AlertsGalleryTests(TestDevice device)
+			: base(device)
+		{
+		}
+
+		protected override void NavigateToGallery()
+		{
+			App.NavigateToGallery("Alerts Gallery");
+		}
+
+		[Test]
+		public void AlertCancel()
+		{
+			if (Device == TestDevice.Windows)
+				Assert.Ignore("UI testing alert code is not yet implemented on Windows.");
+
+			var test = Test.Alerts.AlertCancel;
+
+			var remote = new EventViewContainerRemote(UITestContext, test);
+			remote.GoTo(test.ToString());
+
+			var textBeforeClick = remote.GetEventLabel().GetText();
+			Assert.AreEqual($"Event: {test} (none)", textBeforeClick);
+
+			remote.TapView();
+
+			var alert = App.WaitForElement(() => App.GetAlert());
+			Assert.NotNull(alert);
+
+			var alertText = alert.GetAlertText();
+			CollectionAssert.Contains(alertText, "Alert Title Here");
+			CollectionAssert.Contains(alertText, "Alert Message Here");
+
+			var buttons = alert.GetAlertButtons();
+			CollectionAssert.IsNotEmpty(buttons);
+			Assert.True(buttons.Count == 1, $"Expected 1 buttonText, found {buttons.Count}.");
+
+			var cancel = buttons.First();
+			Assert.AreEqual("CANCEL", cancel.GetText());
+
+			cancel.Click();
+
+			App.WaitForNoElement(() => App.GetAlert());
+
+			var textAfterClick = remote.GetEventLabel().GetText();
+			Assert.AreEqual($"Event: {test} (SUCCESS 1)", textAfterClick);
+		}
+
+		[Test]
+		[TestCase(Test.Alerts.AlertAcceptCancelClickAccept, "ACCEPT")]
+		[TestCase(Test.Alerts.AlertAcceptCancelClickCancel, "CANCEL")]
+		public void AlertAcceptCancel(Test.Alerts test, string buttonText)
+		{
+			if (Device == TestDevice.Windows)
+				Assert.Ignore("UI testing alert code is not yet implemented on Windows.");
+
+			var remote = new EventViewContainerRemote(UITestContext, test);
+			remote.GoTo(test.ToString());
+
+			var textBeforeClick = remote.GetEventLabel().GetText();
+			Assert.AreEqual($"Event: {test} (none)", textBeforeClick);
+
+			remote.TapView();
+
+			var alert = App.WaitForElement(() => App.GetAlert());
+			Assert.NotNull(alert);
+
+			var alertText = alert.GetAlertText();
+			CollectionAssert.Contains(alertText, "Alert Title Here");
+			CollectionAssert.Contains(alertText, "Alert Message Here");
+
+			var buttons = alert.GetAlertButtons()
+				.Select(b => (Element: b, Text: b.GetText()))
+				.ToList();
+			CollectionAssert.IsNotEmpty(buttons);
+			Assert.True(buttons.Count == 2, $"Expected 2 buttons, found {buttons.Count}.");
+			CollectionAssert.Contains(buttons.Select(b => b.Text), "ACCEPT");
+			CollectionAssert.Contains(buttons.Select(b => b.Text), "CANCEL");
+
+			var button = buttons.Single(b => b.Text == buttonText);
+			button.Element.Click();
+
+			App.WaitForNoElement(() => App.GetAlert());
+
+			var textAfterClick = remote.GetEventLabel().GetText();
+			Assert.AreEqual($"Event: {test} (SUCCESS 1)", textAfterClick);
+		}
+
+		[Test]
+		[TestCase(Test.Alerts.ActionSheetClickItem, "ITEM 2")]
+		[TestCase(Test.Alerts.ActionSheetClickCancel, "CANCEL")]
+		[TestCase(Test.Alerts.ActionSheetClickDestroy, "DESTROY")]
+		public void ActionSheetClickItem(Test.Alerts test, string itemText)
+		{
+			if (Device == TestDevice.Windows)
+				Assert.Ignore("UI testing alert code is not yet implemented on Windows.");
+
+			var remote = new EventViewContainerRemote(UITestContext, test);
+			remote.GoTo(test.ToString());
+
+			var textBeforeClick = remote.GetEventLabel().GetText();
+			Assert.AreEqual($"Event: {test} (none)", textBeforeClick);
+
+			remote.TapView();
+
+			var alert = App.WaitForElement(() => App.GetAlert());
+			Assert.NotNull(alert);
+
+			var alertText = alert.GetAlertText();
+			CollectionAssert.Contains(alertText, "Action Sheet Title Here");
+
+			var buttons = alert.GetAlertButtons()
+				.Select(b => (Element: b, Text: b.GetText()))
+				.ToList();
+			CollectionAssert.IsNotEmpty(buttons);
+			Assert.True(buttons.Count == 5, $"Expected 5 buttons, found {buttons.Count}.");
+			CollectionAssert.Contains(buttons.Select(b => b.Text), "CANCEL");
+			CollectionAssert.Contains(buttons.Select(b => b.Text), "DESTROY");
+			CollectionAssert.Contains(buttons.Select(b => b.Text), "ITEM 1");
+			CollectionAssert.Contains(buttons.Select(b => b.Text), "ITEM 2");
+			CollectionAssert.Contains(buttons.Select(b => b.Text), "ITEM 3");
+
+			var button = buttons.Single(b => b.Text == itemText);
+			button.Element.Click();
+
+			App.WaitForNoElement(() => App.GetAlert());
+
+			var textAfterClick = remote.GetEventLabel().GetText();
+			Assert.AreEqual($"Event: {test} (SUCCESS 1)", textAfterClick);
+		}
+	}
+}
diff --git a/src/TestUtils/src/UITest.Appium/Actions/AppiumAndroidAlertActions.cs b/src/TestUtils/src/UITest.Appium/Actions/AppiumAndroidAlertActions.cs
new file mode 100644
index 000000000000..5ad699a1ce74
--- /dev/null
+++ b/src/TestUtils/src/UITest.Appium/Actions/AppiumAndroidAlertActions.cs
@@ -0,0 +1,95 @@
+using System.Collections.ObjectModel;
+using OpenQA.Selenium;
+using OpenQA.Selenium.Appium;
+using UITest.Core;
+
+namespace UITest.Appium
+{
+	public class AppiumAndroidAlertActions : ICommandExecutionGroup
+	{
+		const string GetAlertsCommand = "getAlerts";
+		const string GetAlertButtonsCommand = "getAlertButtons";
+		const string GetAlertTextCommand = "getAlertText";
+
+		readonly List<string> _commands = new()
+		{
+			GetAlertsCommand,
+			GetAlertButtonsCommand,
+			GetAlertTextCommand,
+		};
+		readonly AppiumApp _appiumApp;
+
+		public AppiumAndroidAlertActions(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
+			{
+				GetAlertsCommand => GetAlerts(parameters),
+				GetAlertButtonsCommand => GetAlertButtons(parameters),
+				GetAlertTextCommand => GetAlertText(parameters),
+				_ => CommandResponse.FailedEmptyResponse,
+			};
+		}
+
+		CommandResponse GetAlerts(IDictionary<string, object> parameters)
+		{
+			var alerts = _appiumApp.Query.ById("parentPanel");
+
+			if (alerts is null || alerts.Count == 0)
+				return CommandResponse.FailedEmptyResponse;
+
+			return new CommandResponse(alerts, CommandResponseResult.Success);
+		}
+
+		CommandResponse GetAlertButtons(IDictionary<string, object> parameters)
+		{
+			var alert = GetAppiumElement(parameters["element"]);
+			if (alert is null)
+				return CommandResponse.FailedEmptyResponse;
+
+			var items = AppiumQuery.ByClass("android.widget.ListView")
+				.FindElements(alert, _appiumApp)
+				.FirstOrDefault()
+				?.ByClass("android.widget.TextView");
+
+			var buttons = AppiumQuery.ByClass("android.widget.Button")
+				.FindElements(alert, _appiumApp);
+
+			var all = new List<IUIElement>();
+			if (items is not null)
+				all.AddRange(items);
+			all.AddRange(buttons);
+
+			return new CommandResponse(all, CommandResponseResult.Success);
+		}
+
+		CommandResponse GetAlertText(IDictionary<string, object> parameters)
+		{
+			var alert = GetAppiumElement(parameters["element"]);
+			if (alert is null)
+				return CommandResponse.FailedEmptyResponse;
+
+			var text = AppiumQuery.ByClass("android.widget.TextView").FindElements(alert, _appiumApp);
+			var strings = text.Select(t => t.GetText()).ToList();
+
+			return new CommandResponse(strings, CommandResponseResult.Success);
+		}
+
+		static AppiumElement? GetAppiumElement(object element) =>
+			element switch
+			{
+				AppiumElement appiumElement => appiumElement,
+				AppiumDriverElement driverElement => driverElement.AppiumElement,
+				_ => null
+			};
+	}
+}
diff --git a/src/TestUtils/src/UITest.Appium/Actions/AppiumAppleAlertActions.cs b/src/TestUtils/src/UITest.Appium/Actions/AppiumAppleAlertActions.cs
new file mode 100644
index 000000000000..8ca970387846
--- /dev/null
+++ b/src/TestUtils/src/UITest.Appium/Actions/AppiumAppleAlertActions.cs
@@ -0,0 +1,88 @@
+using OpenQA.Selenium;
+using OpenQA.Selenium.Appium;
+using UITest.Core;
+
+namespace UITest.Appium
+{
+	public class AppiumAppleAlertActions : ICommandExecutionGroup
+	{
+		const string GetAlertsCommand = "getAlerts";
+		const string GetAlertButtonsCommand = "getAlertButtons";
+		const string GetAlertTextCommand = "getAlertText";
+
+		readonly List<string> _commands = new()
+		{
+			GetAlertsCommand,
+			GetAlertButtonsCommand,
+			GetAlertTextCommand,
+		};
+		readonly AppiumApp _appiumApp;
+
+		public AppiumAppleAlertActions(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
+			{
+				GetAlertsCommand => GetAlerts(parameters),
+				GetAlertButtonsCommand => GetAlertButtons(parameters),
+				GetAlertTextCommand => GetAlertText(parameters),
+				_ => CommandResponse.FailedEmptyResponse,
+			};
+		}
+
+		CommandResponse GetAlerts(IDictionary<string, object> parameters)
+		{
+			// first try the type used on iOS
+			var alerts = _appiumApp.FindElements(AppiumQuery.ByClass("XCUIElementTypeAlert"));
+
+			// then try the type used on macOS
+			if (alerts is null || alerts.Count == 0)
+				alerts = _appiumApp.FindElements(AppiumQuery.ByClass("XCUIElementTypeSheet"));
+
+			if (alerts is null || alerts.Count == 0)
+				return CommandResponse.FailedEmptyResponse;
+
+			return new CommandResponse(alerts, CommandResponseResult.Success);
+		}
+
+		CommandResponse GetAlertButtons(IDictionary<string, object> parameters)
+		{
+			var alert = GetAppiumElement(parameters["element"]);
+			if (alert is null)
+				return CommandResponse.FailedEmptyResponse;
+
+			var buttons = AppiumQuery.ByClass("XCUIElementTypeButton").FindElements(alert, _appiumApp);
+
+			return new CommandResponse(buttons, CommandResponseResult.Success);
+		}
+
+		CommandResponse GetAlertText(IDictionary<string, object> parameters)
+		{
+			var alert = GetAppiumElement(parameters["element"]);
+			if (alert is null)
+				return CommandResponse.FailedEmptyResponse;
+
+			var text = AppiumQuery.ByClass("XCUIElementTypeStaticText").FindElements(alert, _appiumApp);
+			var strings = text.Select(t => t.GetText()).ToList();
+
+			return new CommandResponse(strings, CommandResponseResult.Success);
+		}
+
+		static AppiumElement? GetAppiumElement(object element) =>
+			element switch
+			{
+				AppiumElement appiumElement => appiumElement,
+				AppiumDriverElement driverElement => driverElement.AppiumElement,
+				_ => null
+			};
+	}
+}
diff --git a/src/TestUtils/src/UITest.Appium/AppiumAndroidApp.cs b/src/TestUtils/src/UITest.Appium/AppiumAndroidApp.cs
index 0ecfa53ae558..773f30a0f396 100644
--- a/src/TestUtils/src/UITest.Appium/AppiumAndroidApp.cs
+++ b/src/TestUtils/src/UITest.Appium/AppiumAndroidApp.cs
@@ -11,6 +11,7 @@ private AppiumAndroidApp(Uri remoteAddress, IConfig config)
 			: base(new AndroidDriver(remoteAddress, GetOptions(config)), config)
 		{
 			_commandExecutor.AddCommandGroup(new AppiumAndroidVirtualKeyboardActions(this));
+			_commandExecutor.AddCommandGroup(new AppiumAndroidAlertActions(this));
 		}
 
 		public static AppiumAndroidApp CreateAndroidApp(Uri remoteAddress, IConfig config)
diff --git a/src/TestUtils/src/UITest.Appium/AppiumCatalystApp.cs b/src/TestUtils/src/UITest.Appium/AppiumCatalystApp.cs
index 9ac2ccce5c87..79031dbda82a 100644
--- a/src/TestUtils/src/UITest.Appium/AppiumCatalystApp.cs
+++ b/src/TestUtils/src/UITest.Appium/AppiumCatalystApp.cs
@@ -11,6 +11,7 @@ public AppiumCatalystApp(Uri remoteAddress, IConfig config)
 			: base(new MacDriver(remoteAddress, GetOptions(config)), config)
 		{
 			_commandExecutor.AddCommandGroup(new AppiumCatalystPointerActions(this));
+			_commandExecutor.AddCommandGroup(new AppiumAppleAlertActions(this));
 		}
 
 		public override ApplicationState AppState
diff --git a/src/TestUtils/src/UITest.Appium/AppiumIOSApp.cs b/src/TestUtils/src/UITest.Appium/AppiumIOSApp.cs
index fd60c02bb753..6252bf50ce27 100644
--- a/src/TestUtils/src/UITest.Appium/AppiumIOSApp.cs
+++ b/src/TestUtils/src/UITest.Appium/AppiumIOSApp.cs
@@ -13,6 +13,7 @@ public AppiumIOSApp(Uri remoteAddress, IConfig config)
 		{
 			_commandExecutor.AddCommandGroup(new AppiumIOSPointerActions(this));
 			_commandExecutor.AddCommandGroup(new AppiumIOSVirtualKeyboardActions(this));
+			_commandExecutor.AddCommandGroup(new AppiumAppleAlertActions(this));
 		}
 
 		public override ApplicationState AppState
diff --git a/src/TestUtils/src/UITest.Appium/HelperExtensions.cs b/src/TestUtils/src/UITest.Appium/HelperExtensions.cs
index a274bfadcdc8..9b7ee158abc5 100644
--- a/src/TestUtils/src/UITest.Appium/HelperExtensions.cs
+++ b/src/TestUtils/src/UITest.Appium/HelperExtensions.cs
@@ -166,6 +166,51 @@ public static void ScrollTo(this IApp app, string toElementId, bool down = true)
 			});
 		}
 
+		/// <summary>
+		/// Return the currently presented alert.
+		/// </summary>
+		/// <param name="app">Represents the main gateway to interact with an app.</param>
+		public static IUIElement? GetAlert(this IApp app)
+		{
+			return app.GetAlerts().FirstOrDefault();
+		}
+
+		/// <summary>
+		/// Return the currently presented alerts.
+		/// </summary>
+		/// <param name="app">Represents the main gateway to interact with an app.</param>
+		public static IReadOnlyCollection<IUIElement> GetAlerts(this IApp app)
+		{
+			var result = app.CommandExecutor.Execute("getAlerts", ImmutableDictionary<string, object>.Empty);
+			return (IReadOnlyCollection<IUIElement>?)result.Value?? Array.Empty<IUIElement>();
+		}
+
+		/// <summary>
+		/// Return the buttons in the alert.
+		/// </summary>
+		/// <param name="alertElement">The element that represents the alert.</param>
+		public static IReadOnlyCollection<IUIElement> GetAlertButtons(this IUIElement alertElement)
+		{
+			var result = alertElement.Command.Execute("getAlertButtons", new Dictionary<string, object>
+			{
+				["element"] = alertElement
+			});
+			return (IReadOnlyCollection<IUIElement>?)result.Value ?? Array.Empty<IUIElement>();
+		}
+
+		/// <summary>
+		/// Return the text messages in the alert.
+		/// </summary>
+		/// <param name="alertElement">The element that represents the alert.</param>
+		public static IReadOnlyCollection<string> GetAlertText(this IUIElement alertElement)
+		{
+			var result = alertElement.Command.Execute("getAlertText", new Dictionary<string, object>
+			{
+				["element"] = alertElement
+			});
+			return (IReadOnlyCollection<string>?)result.Value ?? Array.Empty<string>();
+		}
+
 		public static IUIElement WaitForElement(this IApp app, string marked, string timeoutMessage = "Timed out waiting for element...", TimeSpan? timeout = null, TimeSpan? retryFrequency = null, TimeSpan? postTimeout = null)
 		{
 			IUIElement result() => app.FindElement(marked);
@@ -174,12 +219,34 @@ public static void ScrollTo(this IApp app, string toElementId, bool down = true)
 			return results;
 		}
 
+		public static IUIElement WaitForElement(
+			this IApp app,
+			Func<IUIElement?> query,
+			string? timeoutMessage = null,
+			TimeSpan? timeout = null,
+			TimeSpan? retryFrequency = null)
+		{
+			var results = Wait(query, i => i != null, timeoutMessage, timeout, retryFrequency);
+
+			return results;
+		}
+
 		public static void WaitForNoElement(this IApp app, string marked, string timeoutMessage = "Timed out waiting for no element...", TimeSpan? timeout = null, TimeSpan? retryFrequency = null, TimeSpan? postTimeout = null)
 		{
 			IUIElement result() => app.FindElement(marked);
 			WaitForNone(result, timeoutMessage, timeout, retryFrequency);
 		}
 
+		public static void WaitForNoElement(
+			this IApp app,
+			Func<IUIElement?> query,
+			string? timeoutMessage = null,
+			TimeSpan? timeout = null,
+			TimeSpan? retryFrequency = null)
+		{
+			Wait(query, i => i is null, timeoutMessage, timeout, retryFrequency);
+		}
+
 		public static bool WaitForTextToBePresentInElement(this IApp app, string automationId, string text)
 		{
 			TimeSpan timeout = DefaultTimeout;
@@ -541,8 +608,8 @@ public static void Back(this IApp app)
 			app.CommandExecutor.Execute("back", ImmutableDictionary<string, object>.Empty);
 		}
 
-		static IUIElement Wait(Func<IUIElement> query,
-			Func<IUIElement, bool> satisfactory,
+		static IUIElement Wait(Func<IUIElement?> query,
+			Func<IUIElement?, bool> satisfactory,
 			string? timeoutMessage = null,
 			TimeSpan? timeout = null, TimeSpan? retryFrequency = null)
 		{
@@ -552,7 +619,7 @@ static IUIElement Wait(Func<IUIElement> query,
 
 			DateTime start = DateTime.Now;
 
-			IUIElement result = query();
+			IUIElement? result = query();
 
 			while (!satisfactory(result))
 			{
@@ -568,7 +635,7 @@ static IUIElement Wait(Func<IUIElement> query,
 				result = query();
 			}
 
-			return result;
+			return result!;
 		}
 
 		static IUIElement WaitForAtLeastOne(Func<IUIElement> query,