[Testing] Enabling ported UITests from Xamarin.UITests to Appium - 10

src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla56710.cs

@@ -65,11 +65,13 @@ public TestCell()
 	{
 		var menuItem = new MenuItem();
 		menuItem.SetBinding(MenuItem.TextProperty, "ItemText");
+		menuItem.SetBinding(MenuItem.AutomationIdProperty, "ItemText");
 		ContextActions.Add(menuItem);
 
 
 		var textLabel = new Label();
 		textLabel.SetBinding(Label.TextProperty, "Text");
+		textLabel.SetBinding(Label.AutomationIdProperty, "Text");
 		View = textLabel;
 	}
 }

src/Controls/tests/TestCases.HostApp/Issues/Issue7534.cs

@@ -30,7 +30,8 @@ protected override void Init()
 			var labelDescription = new Label
 			{
 				Text = "If you opened this page, the app didn't crash and you can read three lines in the label above, this test has passed",
-				VerticalOptions = LayoutOptions.StartAndExpand
+				VerticalOptions = LayoutOptions.StartAndExpand,
+				AutomationId = "Success"
 			};
 #pragma warning restore CS0618 // Type or member is obsolete
 

src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue1342.cs

@@ -40,9 +40,9 @@ public class MainPageCode : TabbedPage
 	{
 		public MainPageCode()
 		{
-			ToolbarItems.Add(new Microsoft.Maui.Controls.ToolbarItem() { Text = "add1" });
-			ToolbarItems.Add(new Microsoft.Maui.Controls.ToolbarItem() { Text = $"{add2}" });
-			ToolbarItems.Add(new Microsoft.Maui.Controls.ToolbarItem() { Text = $"{add3}" });
+			ToolbarItems.Add(new Microsoft.Maui.Controls.ToolbarItem() { Text = "add1" , AutomationId = "add1" });
+			ToolbarItems.Add(new Microsoft.Maui.Controls.ToolbarItem() { Text = $"{add2}", AutomationId = add2 });
+			ToolbarItems.Add(new Microsoft.Maui.Controls.ToolbarItem() { Text = $"{add3}", AutomationId = add3 });
 			ToolbarItems.Add(new Microsoft.Maui.Controls.ToolbarItem() { Text = "reload" });
 			ToolbarItems.Add(new Microsoft.Maui.Controls.ToolbarItem() { Text = "visible" });
 

src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue6484.cs

@@ -35,7 +35,7 @@ async void OnPageAppearing(object sender, EventArgs e)
 
 
 		await Task.Delay(1);
-		layout.AddLogicalChild(
+		layout.Children.Add(
 			new Label()
 			{
 				Text = "If app hasn't crashed test has succeeded",

src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue8203.cs

@@ -18,7 +18,7 @@ protected override void Init()
 				"event should have been raised twice. If not, this test has failed."
 			};
 
-			_eventRaisedCount = new Label();
+			_eventRaisedCount = new Label() { AutomationId = "SelectionChangedCount" };
 
 			var layout = new StackLayout();
 			var cv = new CollectionView();
@@ -30,9 +30,9 @@ protected override void Init()
 
 			cv.SelectionChanged += SelectionChangedHandler;
 
-			layout.AddLogicalChild(instructions);
-			layout.AddLogicalChild(_eventRaisedCount);
-			layout.AddLogicalChild(cv);
+			layout.Children.Add(instructions);
+			layout.Children.Add(_eventRaisedCount);
+			layout.Children.Add(cv);
 
 			Content = layout;
 		}

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla56710.cs

@@ -1,31 +1,26 @@
-#if IOS
-using NUnit.Framework;
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
 namespace Microsoft.Maui.TestCases.Tests.Issues;
 
 public class Bugzilla56710 : _IssuesUITest
 {
-	const string Success = "Success";
-	const string BtnAdd = "btnAdd";
-
 	public Bugzilla56710(TestDevice testDevice) : base(testDevice)
 	{
 	}
 
-	public override string Issue => "Multi-item add in INotifyCollectionChanged causes a NSInternalInconsistencyException in bindings on iOS";
+	public override string Issue => "ContextActionsCell.OnMenuItemPropertyChanged throws NullReferenceException";
 
-	// [Test]
-	// [Category(UITestCategories.ListView)]
-	// [Category(UITestCategories.Compatibility)]
-	// [FailsOnIOSWhenRunningOnXamarinUITest]
-	// [FailsOnMacWhenRunningOnXamarinUITest]
-	// public void Bugzilla56771Test()
-	// {
-	// 	App.WaitForElement(BtnAdd);
-	// 	App.Tap(BtnAdd);
-	// 	App.WaitForNoElement(Success);
-	// }
-}
-#endif
+	[Test]
+	[Category(UITestCategories.ListView)]
+	[Category(UITestCategories.Compatibility)]
+	public void Bugzilla56710Test()
+	{
+		App.WaitForElement("Go to Test Page");
+		App.Tap("Go to Test Page");
+		App.WaitForElement("Item 3");
+		App.TapBackArrow();
+		App.WaitForElement("Go to Test Page");
+	}
+}

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue3390.cs

@@ -12,16 +12,14 @@ public Issue3390(TestDevice testDevice) : base(testDevice)
 
 		public override string Issue => "Crash or incorrect behavior with corner radius 5";
 
-		// [Test]
-		// [Category(UITestCategories.Button)]
-		// [Category(UITestCategories.Compatibility)]
-		// [FailsOnIOSWhenRunningOnXamarinUITest]
-		// [FailsOnMacWhenRunningOnXamarinUITest]
-		// public void Issue3390Test()
-		// {
-		// 	App.WaitForElement("TestButton");
-		// 	App.Tap("TestButton");
-		// 	App.WaitForNoElement("Success");
-		// }
+		[Test]
+		[Category(UITestCategories.Button)]
+		[Category(UITestCategories.Compatibility)]
+		public void Issue3390Test()
+		{
+			App.WaitForElement("TestButton");
+			App.Tap("TestButton");
+			Assert.That(App.FindElement("TestButton").GetText(), Is.EqualTo("Success"));
+		}
 	}
 }

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue7534.cs

@@ -1,5 +1,6 @@
-#if ANDROID
+#if TEST_FAILS_ON_ANDROID // Getting Java.Lang.IndexOutOfBoundsException on Android (https://github.com/dotnet/maui/issues/25836)
 using NUnit.Framework;
+using UITest.Appium;
 using UITest.Core;
 
 namespace Microsoft.Maui.TestCases.Tests.Issues
@@ -12,18 +13,16 @@ public Issue7534(TestDevice testDevice) : base(testDevice)
 
 		public override string Issue => "Span with tail truncation and paragraph breaks with Java.Lang.IndexOutOfBoundsException";
 
-		// Crash after navigation
-		/*
+
 		[Test]
 		[Category(UITestCategories.Label)]
 		[Category(UITestCategories.Compatibility)]
-		[FailsOnAndroidWhenRunningOnXamarinUITest]
 		public void ExpectingPageNotToBreak()
 		{
-			App.Screenshot("Test passed, label is showing as it should!");
+			App.WaitForElement("Success");
 			//if it doesn't crash, we're good.
 		}
-		*/
+
 	}
 }
-#endif
+#endif

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Github1650.cs

@@ -1,4 +1,4 @@
-#if MACCATALYST
+#if TEST_FAILS_ON_WINDOWS && TEST_FAILS_ON_CATALYST // Need to Implement App.PressEnter() for Catalyst and Windows.
 using NUnit.Framework;
 using NUnit.Framework.Legacy;
 using UITest.Appium;
@@ -14,18 +14,15 @@ public Github1650(TestDevice testDevice) : base(testDevice)
 
 	public override string Issue => "[macOS] Completed event of Entry raised on Tab key";
 
-	// [Test]
-	// [Category(UITestCategories.Entry)]
-	// public void GitHub1650Test()
-	// {
-	// 	App.WaitForElement(q => q.Marked("CompletedTargetEntry"));
-	// 	App.Tap(q => q.Marked("CompletedTargetEntry"));
-
-	// 	Assert.AreEqual(0, _completedCount, "Completed should not have been fired");
-
-	// 	App.PressEnter();
-
-	// 	Assert.AreEqual(1, _completedCount, "Completed should have been fired once");
-	// }
+	[Test]
+	[Category(UITestCategories.Entry)]
+	public void GitHub1650Test()
+	{
+		App.WaitForElement("CompletedTargetEntry");
+		App.Tap("CompletedTargetEntry");
+		Assert.That(App.FindElement("CompletedCountLabel").GetText(), Is.EqualTo("Completed count: 0"));
+		App.PressEnter();
+		Assert.That(App.FindElement("CompletedCountLabel").GetText(), Is.EqualTo("Completed count: 1"));
+	}
 }
 #endif

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue1342.cs

@@ -6,21 +6,19 @@ namespace Microsoft.Maui.TestCases.Tests.Issues;
 
 public class Issue1342 : _IssuesUITest
 {
-	const string Success = "Success";
 
 	public Issue1342(TestDevice testDevice) : base(testDevice)
 	{
 	}
 
 	public override string Issue => "[iOS] ListView throws Exception on ObservableCollection.Add/Remove for non visible list view";
 
-	// [Test]
-	// [Category(UITestCategories.ListView)]
-	// [Ignore("Fails sometimes - needs a better test")]
-	// public void AddingItemsToNonVisibleListViewDoesntCrash()
-	// {
-	// 	App.Tap(add2);
-	// 	App.Tap(add3);
-	// 	App.WaitForElement(success);
-	// }
+	[Test]
+	[Category(UITestCategories.ListView)]
+	public void AddingItemsToNonVisibleListViewDoesntCrash()
+	{
+		App.Tap("add2");
+		App.Tap("add3");
+		App.WaitForElement("add1");
+	}
 }

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue6484.cs

@@ -1,4 +1,5 @@
-using NUnit.Framework;
+#if TEST_FAILS_ON_CATALYST // Getting OpenQA.Selenium.InvalidSelectorException on Catalyst Line No: 20. 
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -12,10 +13,11 @@ public Issue6484(TestDevice testDevice) : base(testDevice)
 
 	public override string Issue => "[iOS] Shell - Go back two pages crashes the app with a NullReferenceException";
 
-	//[Test]
-	//[Category(UITestCategories.Shell)]
-	//public void RemovingIntermediatePagesBreaksShell()
-	//{
-	//	App.WaitForElement("Success");
-	//}
-}
+	[Test]
+	[Category(UITestCategories.Shell)]
+	public void RemovingIntermediatePagesBreaksShell()
+	{
+		App.WaitForElement("Success");
+	}
+}
+#endif

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue8203.cs

@@ -1,4 +1,5 @@
-using NUnit.Framework;
+#if TEST_FAILS_ON_CATALYST // Need to fix the issue on Catalyst (https://github.com/dotnet/maui/issues/25826)
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -13,14 +14,14 @@ public Issue8203(TestDevice testDevice) : base(testDevice)
 	public override string Issue => "CollectionView fires SelectionChanged x (number of items selected +1) times, while incrementing SelectedItems from 0 " +
 	"to number of items each time";
 
-	//[Test]
-	//[Category(UITestCategories.CollectionView)]
-	//[FailsOnIOS]
-	//public void SelectionChangedShouldBeRaisedOnceWhenSelectionChanges()
-	//{
-	//	App.WaitForElement("one");
-	//	App.Tap("one");
-	//	App.Tap("two");
-	//	App.WaitForElement("SelectionChanged has been raised 2 times.");
-	//}
-}
+	[Test]
+	[Category(UITestCategories.CollectionView)]
+	public void SelectionChangedShouldBeRaisedOnceWhenSelectionChanges()
+	{
+		App.WaitForElement("one");
+		App.Tap("one");
+		App.Tap("two");
+		Assert.That(App.FindElement("SelectionChangedCount").GetText(), Is.EqualTo("SelectionChanged has been raised 2 times."));
+	}
+}
+#endif

src/TestUtils/src/UITest.Appium/AppiumApp.cs

@@ -90,7 +90,7 @@ public virtual IUIElement FindElement(IQuery query)
 #nullable disable
 		public virtual IUIElement FindElementByText(string text)
 		{
-			return AppiumQuery.ByXPath("//*[@text='" + text + "']").FindElement(this);
+			return AppiumQuery.ByXPath("//*[@text='" + text + "' or @Name='" + text + "']").FindElement(this);
 		}
 #nullable enable
 
@@ -101,7 +101,7 @@ public virtual IReadOnlyCollection<IUIElement> FindElements(string id)
 
 		public virtual IReadOnlyCollection<IUIElement> FindElementsByText(string text)
 		{
-			return AppiumQuery.ByXPath("//*[@text='" + text + "']").FindElements(this);
+			return AppiumQuery.ByXPath("//*[@text='" + text + "' or @Name='" + text + "']").FindElements(this);
 		}
 
 		public virtual IReadOnlyCollection<IUIElement> FindElements(IQuery query)
@@ -155,4 +155,4 @@ public void Dispose()
 			_driver?.Dispose();
 		}
 	}
-}
+}

src/TestUtils/src/UITest.Appium/HelperExtensions.cs

@@ -1679,6 +1679,26 @@ public static IList<object> GetPerformanceData(this IApp app, string performance
 			throw new InvalidOperationException($"Could not get the performance data");
 		}
 
+		/// <summary>
+		/// Navigates back in the application by simulating a tap on the platform-specific back navigation button.
+		/// </summary>
+		/// <param name="app">Represents the main gateway to interact with an app.</param>
+		public static void TapBackArrow(this IApp app)
+		{
+			if (app is AppiumAndroidApp)
+			{
+				app.Tap(AppiumQuery.ByXPath("//android.widget.ImageButton[@content-desc='Navigate up']"));
+			}
+			else if (app is AppiumIOSApp || app is AppiumCatalystApp)
+			{
+				app.Tap(AppiumQuery.ByAccessibilityId("Back"));
+			}
+			else if (app is AppiumWindowsApp)
+			{
+				app.Tap(AppiumQuery.ByAccessibilityId("NavigationViewBackButton"));
+			}
+		}
+
 		static IUIElement Wait(Func<IUIElement?> query,
 			Func<IUIElement?, bool> satisfactory,
 			string? timeoutMessage = null,