[Testing] Enabling more UI Tests by removing platform specific condition - 5

src/Controls/tests/TestCases.HostApp/Issues/Issue25473.xaml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
 				 xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-				 xmlns:local="clr-namespace:Maui.Controls.Sample.Issues"
+         xmlns:local="clr-namespace:Maui.Controls.Sample"
 				 x:Class="Maui.Controls.Sample.Issues.Issue25473">
 
       <VerticalStackLayout Spacing="20" HorizontalOptions="Center">
         <!-- Entry control with ClearButtonVisibility set to 'WhileEditing' -->
         <HorizontalStackLayout>
-          <Entry
+            <local:UITestEntry
                 x:Name="mainEntryField"
                 AutomationId="MainEntryField"
                 BackgroundColor="Transparent"

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

@@ -1,7 +1,7 @@
 namespace Maui.Controls.Sample.Issues
 {
 
-	[Issue(IssueTracker.Github, 25473, "MAUI Entry in Windows always shows ClearButton despite ClearButtonVisibility set to 'Never'", PlatformAffected.UWP)]
+	[Issue(IssueTracker.Github, 25473, "MAUI Entry in Windows always shows ClearButton despite ClearButtonVisibility set to Never", PlatformAffected.UWP)]
 	public partial class Issue25473 : ContentPage
 	{
 		public Issue25473()

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

@@ -1,5 +1,4 @@
-#if ANDROID
-using NUnit.Framework;
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -28,8 +27,7 @@ public void ScrollViewInHeaderDisposesProperly()
 			App.WaitForElement(Back);
 			App.Tap(Back);
 
-			App.WaitForNoElement(Success);
+			App.WaitForElement(Success);
 		}
 	}
-}
-#endif
+}

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

@@ -1,5 +1,4 @@
-#if !MACCATALYST
-using NUnit.Framework;
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -24,5 +23,4 @@ public void BackButtonBehaviorIsVisibleWorksWithCustomIcon()
 			VerifyScreenshot();
 		}
 	}
-}
-#endif
+}

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

@@ -1,4 +1,4 @@
-#if ANDROID
+#if TEST_FAILS_ON_WINDOWS //SearchHandler Fails to Trigger Focused Event on Windows, for more information: https://github.com/dotnet/maui/issues/27551
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;

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

@@ -1,5 +1,4 @@
-#if ANDROID
-using NUnit.Framework;
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -22,9 +21,8 @@ public Issue2482(TestDevice testDevice) : base(testDevice)
 		public void AnimationCancel()
 		{
 			App.WaitForElement(ButtonId);
-			App.DoubleClick(ButtonId);
-			App.WaitForNoElement(Success, timeout: TimeSpan.FromSeconds(25));
+			App.DoubleTap(ButtonId);
+			App.WaitForElement(Success);
 		}
 	}
-}
-#endif
+}

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

@@ -1,4 +1,4 @@
-#if ANDROID
+# if TEST_FAILS_ON_IOS //In iOS platform, the scrollbar in the CollectionView fades out when taking a screenshot, making it difficult to verify its visibility in UI tests. 
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;

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

@@ -1,4 +1,5 @@
-#if WINDOWS
+#if TEST_FAILS_ON_CATALYST
+//In MacCatalyst platform, the Clear Button in the Entry control is not visible during screenshots, but this issue is fixed after enabling the test for verifyScreenshot (https://github.com/dotnet/maui/pull/27531).
 using Microsoft.Maui.Platform;
 using NUnit.Framework;
 using UITest.Appium;
@@ -12,8 +13,7 @@ public Issue25473(TestDevice testDevice) : base(testDevice)
 		{
 		}
 
-		public override string Issue => "MAUI Entry in Windows always shows ClearButton despite ClearButtonVisibility set to 'Never'";
-
+		public override string Issue => "MAUI Entry in Windows always shows ClearButton despite ClearButtonVisibility set to Never";
 		[Test]
 		[Category(UITestCategories.Entry)]
 		public void VerifyEntryClearButtonVisibilitySetToWhileEditing()

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

@@ -1,5 +1,4 @@
-#if WINDOWS
-using NUnit.Framework;
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -20,5 +19,4 @@ public void CustomStyleEditorFromPlatformViewWorks()
 			VerifyScreenshot();
 		}
 	}
-}
-#endif
+}

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

@@ -1,5 +1,4 @@
-#if ANDROID || IOS
-using NUnit.Framework;
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -21,5 +20,4 @@ public void GradientAndShadowShouldWork()
 			VerifyScreenshot();
 		}
 	}
-}
-#endif
+}

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

@@ -1,4 +1,3 @@
-#if ANDROID || IOS
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
@@ -19,8 +18,7 @@ public void UpdatedBackButtonTitleForEmptyString()
 		{
 			App.WaitForElement("GotoPage2");
 			App.Tap("GotoPage2");
-			VerifyScreenshot();
+			App.WaitForElement("Welcome to Page 2");
 		}
 	}
-}
-#endif
+}