[Testing] Enabling ported UITests from Xamarin.UITests to Appium - 61 (…

…dotnet#26761) * Migrated Issue Bugzilla36955 and Issue2818 * modified test case * Modified Bugzilla36955 * Migrated Issue5132 * enabled more tests * Updated enabled tests * Updated Issue link * Updated boxview height * Added iOS and Android Images * Added windows and mac images and resolved CI failures * Update Bugzilla41415.cs --------- Co-authored-by: NafeelaNazhir <[email protected]>
Tamilarasan-Paranthaman · Dec 25, 2024 · 76e5cd0 · 76e5cd0
1 parent 39ecd57
commit 76e5cd0
Show file tree

Hide file tree

Showing 14 changed files with 205 additions and 159 deletions.
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/AllScreenIsBlack.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/AllScreenIsBlack.png
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla36955.cs b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla36955.cs
@@ -12,10 +12,14 @@ protected override void Init()
 
 		var sc = new SwitchCell
 		{
-			Text = "Toggle switch; nothing should crash"
+			Text = "Toggle switch; nothing should crash",
+			AutomationId = "Switch"
 		};
 
-		var button = new Button();
+		var button = new Button
+		{
+			AutomationId = "Button"
+		};
 		button.SetBinding(Button.TextProperty, new Binding("On", source: sc));
 
 		var vc = new ViewCell

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla40092.cs b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla40092.cs
@@ -1,3 +1,4 @@
+using Microsoft.Maui.Layouts;
 namespace Maui.Controls.Sample.Issues;
 
 
@@ -30,8 +31,11 @@ protected override void Init()
 			Color = Colors.Black,
 			AutomationId = Black
 		};
+
+		mainLayout.Children.Add(view);
+		AbsoluteLayout.SetLayoutBounds(view, new Rect(0, 0, 1, 1));
+		AbsoluteLayout.SetLayoutFlags(view, AbsoluteLayoutFlags.All);
 
-		mainLayout.Add(view);
 		Content = thePage;
 
 	}

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla41415.cs b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla41415.cs
@@ -14,14 +14,15 @@ public Bugzilla41415()
 			var grid = new Grid
 			{
 				BackgroundColor = Colors.Yellow,
-				WidthRequest = 1000,
-				HeightRequest = 1000,
+				// To make this test works for desktop apps, we need to set a big size for the grid
+				WidthRequest = 3000,
+				HeightRequest = 3000,
 				Children =
 				{
 					new BoxView
 					{
-						WidthRequest =  200,
-						HeightRequest = 200,
+						WidthRequest =  2200,
+						HeightRequest = 2200,
 						BackgroundColor = Colors.Red,
 						HorizontalOptions = LayoutOptions.Center,
 						VerticalOptions = LayoutOptions.Center
@@ -82,7 +83,34 @@ public Bugzilla41415()
 				_x = 100;
 			};
 
-			Content = new StackLayout { Children = { button, labelx, labely, labelz, labela, scrollView } };
+			Grid.SetRow(button, 0);
+			Grid.SetRow(labelx, 1);
+			Grid.SetRow(labely, 2);
+			Grid.SetRow(labelz, 3);
+			Grid.SetRow(labela, 4);
+			Grid.SetRow(scrollView, 5);
+
+			Content = new Grid
+			{
+				RowDefinitions = new RowDefinitionCollection
+				{
+					new RowDefinition { Height = GridLength.Auto },
+					new RowDefinition { Height = GridLength.Auto },
+					new RowDefinition { Height = GridLength.Auto },
+					new RowDefinition { Height = GridLength.Auto },
+					new RowDefinition { Height = GridLength.Auto },
+					new RowDefinition { Height = GridLength.Star },
+				},
+				Children =
+				{
+					button,
+					labelx,
+					labely,
+					labelz,
+					labela,
+					scrollView,
+				}
+			};
 		}
 	}
 }
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue2818.cs b/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue2818.cs
@@ -12,7 +12,7 @@ protected override void Init()
 		{
 			Title = "Flyout",
 			BackgroundColor = Colors.SkyBlue,
-			IconImageSource = "menuIcon",
+			IconImageSource = "menu_icon",
 			Content = new StackLayout()
 			{
 				Children =

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue5132.cs b/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue5132.cs
@@ -10,17 +10,16 @@ protected override void Init()
 		Title = "Shell";
 		FlyoutIcon = new FontImageSource
 		{
-			Glyph = "\uf2fb",
-			FontFamily = DefaultFontFamily(),
+			Glyph = "\uf224",
+			FontFamily = "Ion",
 			Size = 20,
 			AutomationId = _idIconElement
 		};
-#pragma warning disable CS0618 // Type or member is obsolete
-		FlyoutIcon.SetValue(AutomationProperties.HelpTextProperty, "This as Shell FlyoutIcon");
-#pragma warning restore CS0618 // Type or member is obsolete
-#pragma warning disable CS0618 // Type or member is obsolete
-		FlyoutIcon.SetValue(AutomationProperties.NameProperty, "Shell Icon");
-#pragma warning restore CS0618 // Type or member is obsolete
+
+		FlyoutIcon.SetValue(SemanticProperties.HintProperty, "This as Shell FlyoutIcon");
+
+		FlyoutIcon.SetValue(SemanticProperties.DescriptionProperty, "Shell Icon");
+
 		Items.Add(new FlyoutItem
 		{
 			Title = _titleElement,
@@ -34,39 +33,39 @@ protected override void Init()
 		});
 	}
 
-	static string DefaultFontFamily()
-	{
-		var fontFamily = "";
-#pragma warning disable CS0618 // Type or member is obsolete
-#pragma warning disable CS0618 // Type or member is obsolete
-#pragma warning disable CS0618 // Type or member is obsolete
-#pragma warning disable CS0618 // Type or member is obsolete
-#pragma warning disable CS0612 // Type or member is obsolete
-#pragma warning disable CS0612 // Type or member is obsolete
-#pragma warning disable CS0612 // Type or member is obsolete
-#pragma warning disable CS0612 // Type or member is obsolete
-		switch (Device.RuntimePlatform)
-		{
-			case Device.iOS:
-				fontFamily = "Ionicons";
-				break;
-			case Device.WinUI:
-				fontFamily = "Assets/Fonts/ionicons.ttf#ionicons";
-				break;
-			case Device.Android:
-			default:
-				fontFamily = "fonts/ionicons.ttf#";
-				break;
-		}
-#pragma warning restore CS0612 // Type or member is obsolete
-#pragma warning restore CS0612 // Type or member is obsolete
-#pragma warning restore CS0612 // Type or member is obsolete
-#pragma warning restore CS0612 // Type or member is obsolete
-#pragma warning restore CS0618 // Type or member is obsolete
-#pragma warning restore CS0618 // Type or member is obsolete
-#pragma warning restore CS0618 // Type or member is obsolete
-#pragma warning restore CS0618 // Type or member is obsolete
+// 	static string DefaultFontFamily()
+// 	{
+// 		var fontFamily = "";
+// #pragma warning disable CS0618 // Type or member is obsolete
+// #pragma warning disable CS0618 // Type or member is obsolete
+// #pragma warning disable CS0618 // Type or member is obsolete
+// #pragma warning disable CS0618 // Type or member is obsolete
+// #pragma warning disable CS0612 // Type or member is obsolete
+// #pragma warning disable CS0612 // Type or member is obsolete
+// #pragma warning disable CS0612 // Type or member is obsolete
+// #pragma warning disable CS0612 // Type or member is obsolete
+// 		switch (Device.RuntimePlatform)
+// 		{
+// 			case Device.iOS:
+// 				fontFamily = "Ionicons";
+// 				break;
+// 			case Device.WinUI:
+// 				fontFamily = "Assets/Fonts/ionicons.ttf#ionicons";
+// 				break;
+// 			case Device.Android:
+// 			default:
+// 				fontFamily = "fonts/ionicons.ttf#";
+// 				break;
+// 		}
+// #pragma warning restore CS0612 // Type or member is obsolete
+// #pragma warning restore CS0612 // Type or member is obsolete
+// #pragma warning restore CS0612 // Type or member is obsolete
+// #pragma warning restore CS0612 // Type or member is obsolete
+// #pragma warning restore CS0618 // Type or member is obsolete
+// #pragma warning restore CS0618 // Type or member is obsolete
+// #pragma warning restore CS0618 // Type or member is obsolete
+// #pragma warning restore CS0618 // Type or member is obsolete
 
-		return fontFamily;
-	}
+// 		return fontFamily;
+// 	}
 }
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/AllScreenIsBlack.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/AllScreenIsBlack.png
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla36955.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla36955.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+#if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_WINDOWS //Unable to access the switch element directly when it placed inside the TableView, Also Hardcoded TapCoordinates don't work reliably in CI environments for desktop platforms.
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -12,17 +13,23 @@ public Bugzilla36955(TestDevice testDevice) : base(testDevice)
 
 	public override string Issue => "[iOS] ViewCellRenderer.UpdateIsEnabled referencing null object";
 
-	// TODO from Xamarin.UITest Migration, seems to be ignored already
-	// Also uses some specific XamUITest APIs that we need to find counterparts for
-	// [Ignore("Test failing due to unrelated issue, disable for moment")]
-	// [Category(UITestCategories.TableView)]
-	// [Test]
-	// public void Bugzilla36955Test()
-	// {
-	// 	AppResult[] buttonFalse = App.Query(q => q.Button().Text("False"));
-	// 	Assert.AreEqual(buttonFalse.Length == 1, true);
-	// 	App.Tap(q => q.Class("Switch"));
-	// 	AppResult[] buttonTrue = App.Query(q => q.Button().Text("True"));
-	// 	Assert.AreEqual(buttonTrue.Length == 1, true);
-	// }
-}
+	[Category(UITestCategories.TableView)]
+	[Test]
+	public void Bugzilla36955Test()
+	{
+		App.WaitForElement("Button");
+		Assert.That(App.FindElement("Button").GetText(), Is.EqualTo("False"));
+
+		ToggleSwitch();
+		Assert.That(App.FindElement("Button").GetText(), Is.EqualTo("True"));
+	}
+	void ToggleSwitch()
+	{
+#if ANDROID
+		App.TapCoordinates(1000, 100);
+#elif IOS
+        App.Tap(AppiumQuery.ByXPath("//XCUIElementTypeSwitch[@name='Toggle switch; nothing should crash']"));
+#endif
+	}
+}
+#endif
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla40092.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla40092.cs
@@ -6,26 +6,30 @@ namespace Microsoft.Maui.TestCases.Tests.Issues;
 
 public class Bugzilla40092 : _IssuesUITest
 {
+
+#if MACCATALYST
+	const string Ok = "action-button--999";
+#else
+	const string Ok = "Ok";
+#endif
+
 	public Bugzilla40092(TestDevice testDevice) : base(testDevice)
 	{
 	}
 
 	public override string Issue => "Ensure android devices with fractional scale factors (3.5) don't have a white line around the border";
 
-	// TODO: From Xamarin.UITest migration. 
-	// Does some advanced commands to determine layouts, need to find the equivalent on Appium
-	// [Test]
-	// [Category(UITestCategories.BoxView)]
-	// public void AllScreenIsBlack()
-	// {
-	// 	App.WaitForElement(Ok);
-	// 	App.Tap(Ok);
-	// 	var box = App.WaitForElement(Black)[0];
-	// 	var layout = App.WaitForElement(White)[0];
-
-	// 	var assert = box.Rect.Height == layout.Rect.Height &&
-	// 		box.Rect.Width == layout.Rect.Width;
 
-	// 	Assert.IsTrue(assert);
-	// }
+	[Test]
+	[Category(UITestCategories.BoxView)]
+	public void AllScreenIsBlack()
+	{
+#if !ANDROID // Display alert not shown in android also this is not a needed one for ensuring this case, so ignored the below steps on Android.
+		App.WaitForElement(Ok);
+	 	App.Tap(Ok);
+#else
+		App.WaitForElement("black");
+#endif
+		VerifyScreenshot();
+	}
 }
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla41415.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla41415.cs
@@ -1,4 +1,6 @@
-#if !IOS
+#if TEST_FAILS_ON_ANDROID && TEST_FAILS_ON_WINDOWS
+// On Android ScrollY and ScrollX values are resetted, Issue: https://github.com/dotnet/maui/issues/26747
+// On Windows tests are failing in CI, but not locally. Need to investigate more.
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
@@ -18,25 +20,22 @@ public Bugzilla41415UITests(TestDevice device)
 
 		public override string Issue => "ScrollX and ScrollY values are not consistent with iOS";
 
-		// Bugzilla41415 (src\Compatibility\ControlGallery\src\Issues.Shared\Bugzilla41415.cs)
 		[Test]
-		[FailsOnIOSWhenRunningOnXamarinUITest("This test is failing, likely due to product issue")]
-		[FailsOnMacWhenRunningOnXamarinUITest("This test is failing, likely due to product issue")]
 		public void Bugzilla41415Test()
 		{
-			// This test is failing, likely due to product issue
-
 			App.WaitForElement(ButtonId);
 			App.Tap(ButtonId);
-			App.WaitForNoElement("x: 100");
-			App.WaitForNoElement("y: 100");
-			App.WaitForNoElement("z: True", timeout: TimeSpan.FromSeconds(25));
-			App.WaitForNoElement("a: True");
+			App.WaitForElement(ButtonId);
+			App.WaitForElementTillPageNavigationSettled("x: 100");
+			App.WaitForElementTillPageNavigationSettled("y: 100");
+			App.WaitForElement("z: True");
+			App.WaitForElement("a: True");
 			App.Tap(ButtonId);
-			App.WaitForNoElement("x: 200");
-			App.WaitForNoElement("y: 100");
-			App.WaitForNoElement("z: True", timeout: TimeSpan.FromSeconds(25));
-			App.WaitForNoElement("a: False");
+			App.WaitForElement(ButtonId);
+			App.WaitForElementTillPageNavigationSettled("y: 100");
+			App.WaitForElement("z: True");
+			App.WaitForElement("a: False");
+			App.WaitForElementTillPageNavigationSettled("x: 200");
 		}
 	}
 }