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

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

@@ -12,7 +12,8 @@
                 StrokeThickness="9"
                 StrokeShape="RoundRectangle 16"
                 AutomationId="border">
-                <Image BackgroundColor="Green"/>
+                <Image BackgroundColor="Green"
+                        AutomationId="image"/>
         </Border>
 
          <Border WidthRequest="100"

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

@@ -7,9 +7,10 @@
         <Label
             x:Name="TestLabel"
             AutomationId="TestLabel" />
+            <!-- Set the RowHeight to enable scrolling on the Windows platform -->
         <ListView 
             AutomationId="TestListView"
-            Grid.Row="1" 
+            Grid.Row="1" RowHeight="40"
             Scrolled="OnListViewScrolled">
             <ListView.ItemsSource>
                 <x:Array Type="{x:Type x:String}">

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

@@ -12,15 +12,13 @@ public Issue21173(TestDevice device)
 		: base(device)
 	{ }
 
-#if ANDROID
 	[Test]
 	[Category(UITestCategories.Border)]
 	public void BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt()
 	{
-		_ = App.WaitForElement("border");
+		_ = App.WaitForElement("image");
 
 		// The test passes if corners of borders' contents' have proper corner radiuses
 		VerifyScreenshot();
 	}
-#endif
 }

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

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

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

@@ -1,4 +1,3 @@
-#if IOS
 using NUnit.Framework;
 using NUnit.Framework.Legacy;
 using UITest.Appium;
@@ -22,5 +21,4 @@ public void ImageShouldBePortrait()
 			ClassicAssert.Greater(image.Height, image.Width);
         }
     }
-}
-#endif
+}

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

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

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

@@ -1,5 +1,4 @@
-#if ANDROID
-using NUnit.Framework;
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -17,10 +16,10 @@ public Issue21437(TestDevice device)
 	[Category(UITestCategories.Gestures)]
 	public void ExceptionShouldNotBeThrown()
 	{
-		_ = App.WaitForElement("Item2");
-		App.DoubleClick("Item2");
+		App.WaitForElement("Item2");
+		App.DoubleTap("Item2");
+		App.WaitForNoElement("Item2");
 
 		//The test passes if no exception is thrown
 	}
-}
-#endif
+}

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

@@ -1,5 +1,4 @@
-#if WINDOWS
-using NUnit.Framework;
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -23,5 +22,4 @@ public async Task ImageButtonStuckAfterRightClick()
 			VerifyScreenshot();
 		}
 	}
-}
-#endif
+}

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21787.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 LabelTextDecorationsWorks()
 
 		VerifyScreenshot();
 	}
-}
-#endif
+}

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

@@ -1,5 +1,4 @@
-#if !MACCATALYST
-using NUnit.Framework;
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -29,4 +28,3 @@ public void BorderColorShouldChange()
 		}
 	}
 }
-#endif

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

@@ -1,5 +1,4 @@
-#if IOS
-using NUnit.Framework;
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -29,4 +28,3 @@ public void RadioButtonWithValueChangeSelected()
 		}
 	}
 }
-#endif

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

@@ -1,4 +1,4 @@
-#if IOS
+#if IOS || ANDROID  //The test fails on Windows and MacCatalyst because the SetOrientation method, which is intended to change the device orientation, is only supported on mobile platforms iOS and Android.
 using NUnit.Framework;
 using NUnit.Framework.Legacy;
 using UITest.Appium;
@@ -19,12 +19,11 @@ public Issue2241(TestDevice testDevice) : base(testDevice)
 		[Category(UITestCategories.Compatibility)]
 		public void ChangeOrientationCheckScroll()
 		{
-			var grid1 = App.FindElement("MainGrid").GetRect();
+			var grid1 = App.WaitForElement("MainGrid").GetRect();
 			App.SetOrientationLandscape();
 			App.ScrollDown("TestScrollView", ScrollStrategy.Programmatically);
 			App.SetOrientationPortrait();
-			var grid2 = App.FindElement("MainGrid").GetRect();
-			App.Screenshot("Did it resize ok? Do you see some white on the bottom?");
+			var grid2 = App.WaitForElement("MainGrid").GetRect();
 
 			ClassicAssert.AreEqual(grid1.CenterY(), grid2.CenterY());
 		}

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

@@ -11,7 +11,6 @@ public Issue22606(TestDevice device) : base(device) { }
 
 		public override string Issue => "Border does not expand on Content size changed";
 
-#if !MACCATALYST
 		[Test]
 		public void BorderBackgroundExpandsOnContentSizeChanged()
 		{
@@ -22,9 +21,8 @@ public void BorderBackgroundExpandsOnContentSizeChanged()
 			App.Tap("SetHeightTo500");
 			VerifyScreenshot("Issue22606_SetHeightTo500");
 		}
-#endif
 
-#if ANDROID || IOS
+#if ANDROID || IOS  //The test fails on Windows and MacCatalyst because the SetOrientation method, which is intended to change the device orientation, is only supported on mobile platforms iOS and Android.
 		[Test]
 		public void BorderBackgroundSizeUpdatesWhenRotatingScreen()
 		{

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

@@ -1,5 +1,4 @@
-#if IOS
-using NUnit.Framework;
+using NUnit.Framework;
 using NUnit.Framework.Legacy;
 using UITest.Appium;
 using UITest.Core;
@@ -20,8 +19,7 @@ public void ListViewScrolled()
 	{
 		App.WaitForElement("TestListView");
 		App.ScrollDown("TestListView", ScrollStrategy.Gesture, swipeSpeed: 1000);
-		var result = App.FindElement("TestLabel").GetText();
+		var result = App.WaitForElement("TestLabel").GetText();
 		ClassicAssert.AreEqual("Success", result);
 	}
-}
-#endif
+}

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

@@ -1,5 +1,4 @@
-#if ANDROID
-using NUnit.Framework;
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -28,5 +27,4 @@ public void RadioButtonUpdateValueInsideBorder()
 			VerifyScreenshot("RadioButtonUpdateValueInsideBorderYes");
 		}
 	}
-}
-#endif
+}

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

@@ -1,5 +1,4 @@
-#if ANDROID || WINDOWS
-using NUnit.Framework;
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -23,5 +22,4 @@ public void ToolbarItemFontColorDynamicUpdate()
 			VerifyScreenshot();
 		}
 	}
-}
-#endif
+}

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

@@ -1,4 +1,4 @@
-#if ANDROID
+#if ANDROID || IOS //The test fails on Windows and MacCatalyst because the SetOrientation method, which is intended to change the device orientation, is only supported on mobile platforms iOS and Android.
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;