[Testing] Enable Catalyst UI Tests with Screenshot Verification - 2

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

@@ -29,7 +29,11 @@ protected override void Init()
 
 		private void TapGestureRecognizer_Tapped(object sender, TappedEventArgs e)
 		{
-			DisplayAlert("Entry", "Tapped", "OK");
+			Label label = new Label { Text = "Tapped" }; 
+			if (Content is Layout layout)
+			{
+				layout.Children.Add(label);
+			}
 		}
 	}
 }

src/Controls/tests/TestCases.HostApp/Issues/Issue25038.xaml.cs

@@ -1,7 +1,7 @@
 namespace Maui.Controls.Sample.Issues
 {
 
-	[Issue(IssueTracker.Github, 25038, "MAUI Entry in Windows always shows ClearButton if initially hidden and shown even if ClearButtonVisibility set to 'Never'", PlatformAffected.UWP)]
+	[Issue(IssueTracker.Github, 25038, "MAUI Entry in Windows always shows ClearButton if initially hidden and shown even if ClearButtonVisibility set to Never", PlatformAffected.UWP)]
 	public partial class Issue25038 : ContentPage
 	{
 		public Issue25038()

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

@@ -23,7 +23,7 @@ public void ControlCanBeFocusedByUnfocusedEvent()
 		{
 			App.WaitForElement(TheEntry);
 			App.EnterText(TheEntry, Success);
-			App.WaitForElement(Success);
+			App.WaitForElementTillPageNavigationSettled(Success);
 		}
 	}
 }

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

@@ -1,4 +1,4 @@
-#if !MACCATALYST && !WINDOWS
+#if TEST_FAILS_ON_WINDOWS //for more information:https://github.com/dotnet/maui/issues/24968
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;

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

@@ -1,5 +1,4 @@
-#if !MACCATALYST
-using NUnit.Framework;
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -20,8 +19,7 @@ public void TapGestureRecognizerNotWorkingOnEntry()
 		{
 			App.WaitForElement("Entry");
 			App.Tap("Entry");
-			VerifyScreenshot();
+			App.WaitForElement("Tapped");
 		}
 	}
-}
-#endif
+}

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

@@ -1,4 +1,5 @@
-using NUnit.Framework;
+#if TEST_FAILS_ON_WINDOWS
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -13,7 +14,6 @@ public Issue17283(TestDevice testDevice) : base(testDevice) { }
 		[Test]
 		[Category(UITestCategories.CarouselView)]
 		[FailsOnWindowsWhenRunningOnXamarinUITest("Currently fails on Windows; see https://github.com/dotnet/maui/issues/24482")]
-		[FailsOnMacWhenRunningOnXamarinUITest("VerifyScreenshot is not implemented on Mac")]
 		public void CarouselViewShouldScrollToRightPosition()
 		{
 			App.WaitForElement("goToLastItemButton");
@@ -24,4 +24,5 @@ public void CarouselViewShouldScrollToRightPosition()
 			VerifyScreenshot();
 		}
 	}
-}
+}
+#endif

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

@@ -15,7 +15,6 @@ public Issue18775(TestDevice device) : base(device)
 
 		[Test]
 		[Category(UITestCategories.TabbedPage)]
-		[FailsOnMacWhenRunningOnXamarinUITest]
 		public void TabbedPageUnselectedBarTextColorConsistency()
 		{
 			App.WaitForElement("MauiLabel");

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

@@ -1,4 +1,4 @@
-#if !ANDROID && !MACCATALYST
+#if TEST_FAILS_ON_ANDROID //more information: https://github.com/dotnet/maui/issues/26050
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;

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

@@ -14,8 +14,6 @@ public Issue22104(TestDevice testDevice) : base(testDevice)
 
 		[Test]
 		[Category(UITestCategories.CollectionView)]
-		[FailsOnMacWhenRunningOnXamarinUITest]
-		[FailsOnIOSWhenRunningOnXamarinUITest]
 		public void VerifyCollectionViewVisualState()
 		{
 			App.WaitForElement("CollectionView");

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

@@ -18,9 +18,9 @@ public void Issue23291Test()
 		{
 			App.WaitForElement("button");
 			App.Click("button");
-			App.WaitForElement("openFragmentTwoButton");
+			App.WaitForElementTillPageNavigationSettled("openFragmentTwoButton");
 			App.Click("openFragmentTwoButton");
-			App.WaitForElement("fragmentTwoLabel");
+			App.WaitForElementTillPageNavigationSettled("fragmentTwoLabel");
 		}
 	}
 }

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

@@ -14,7 +14,6 @@ public Issue24405(TestDevice testDevice) : base(testDevice)
 
 		[Test]
 		[Category(UITestCategories.Entry)]
-		[FailsOnMacWhenRunningOnXamarinUITest]
 		public void VerifyEntryHorizontalEndTextAlignmentPosition()
 		{
 			App.WaitForElement("button");

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

@@ -1,4 +1,4 @@
-#if !MACCATALYST && !WINDOWS
+#if TEST_FAILS_ON_WINDOWS // more information: https://github.com/dotnet/maui/issues/24968
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;

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

@@ -10,11 +10,10 @@ public Issue25038(TestDevice testDevice) : base(testDevice)
 		{
 		}
 
-		public override string Issue => "MAUI Entry in Windows always shows ClearButton if initially hidden and shown even if ClearButtonVisibility set to 'Never'";
+		public override string Issue => "MAUI Entry in Windows always shows ClearButton if initially hidden and shown even if ClearButtonVisibility set to Never";
 
 		[Test]
 		[Category(UITestCategories.Entry)]
-		[FailsOnMacWhenRunningOnXamarinUITest]
 		public void VerifyEntryClearButtonVisibility()
 		{
 			App.WaitForElement("button");

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

@@ -1,4 +1,3 @@
-#if !MACCATALYST
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
@@ -20,9 +19,14 @@ public void SearchBarMaxLength()
 			App.EnterText("SearchBar", "r");
 			App.Click("ChangeValue");
 			App.EnterText("SearchBar", "r");
-			App.EnterText("SearchBar", "c");
+			App.EnterText("SearchBar", "c");			
+#if MACCATALYST 
+			// On MacCatalyst, pressing the ESC key during screenshot capture clears the text.
+			// This causes the image generated in CI to differ from local runs.
+			Assert.That(App.WaitForElement("Sear").GetText(), Is.EqualTo("Sear"));
+#else
 			VerifyScreenshot();
+#endif
 		}
 	}
-}
-#endif
+}

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

@@ -1,4 +1,4 @@
-#if !MACCATALYST
+#if TEST_FAILS_ON_CATALYST // more information:https://github.com/dotnet/maui/issues/26864
 using System;
 using System.Collections.Generic;
 using System.Linq;