[Testing] Fixed Test case failure in PR 34173 - [02/21/2026] Candidate - 1

src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs

@@ -390,13 +390,6 @@ public virtual void ScrollTo(ScrollToRequestEventArgs args)
 
 			var position = DetermineTargetPosition(args);
 
-			// The collection view includes a header at the zeroth index, so the collection view scrolling is not correct using the index.
-			bool hasHeader = ItemsViewAdapter.ItemsSource.HasHeader;
-			if (hasHeader)
-			{
-				position += 1;
-			}
-
 			if (args.IsAnimated)
 			{
 				ScrollHelper.AnimateScrollToPosition(position, args.ScrollToPosition);

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

@@ -1,4 +1,6 @@
-using NUnit.Framework;
+#if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_IOS // Issue: https://github.com/dotnet/maui/issues/26798
+
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -20,4 +22,5 @@ public void VerifyCollectionViewVerticalOffset()
 		App.Tap("Empty");
 		Assert.That(App.FindElement("Label").GetText(), Is.EqualTo("0"));
 	}
-}
+}
+#endif

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

@@ -21,14 +21,7 @@ public void PageShouldNotScroll()
     {
         App.WaitForElement("EntNumber").GetRect();
         App.WaitForElement("TopLabel").GetRect();
-        if (App is AppiumIOSApp iosApp && HelperExtensions.IsIOS26OrHigher(iosApp))
-        {
-            VerifyScreenshot(cropBottom: 1400);
-        }
-        else
-        {
-            VerifyScreenshot();
-        }
+        VerifyScreenshot(cropBottom: 1400);
     }
 }
 #endif

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

@@ -30,13 +30,10 @@ public void ValidateEntryClearButtonVisibilityBehavior()
 			App.DismissKeyboard();
 #endif
 
-		if (App is AppiumIOSApp iosApp && HelperExtensions.IsIOS26OrHigher(iosApp))
-		{
-			VerifyScreenshot(cropBottom: 1400);
-		}
-		else
-		{
-			VerifyScreenshot();
-		}
+#if IOS
+		VerifyScreenshot(cropBottom: 1400);
+#else
+		VerifyScreenshot();
+#endif
 	}
 }

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

@@ -18,14 +18,11 @@ public void EditorShouldNotMoveToBottom()
 		{
 			App.WaitForElement("Editor");
 			App.Tap("Editor");
-			if (App is AppiumIOSApp iosApp && HelperExtensions.IsIOS26OrHigher(iosApp))
-			{
-				VerifyScreenshot(cropBottom:1400);
-			}
-			else
-			{
-				VerifyScreenshot();
-			}
+#if IOS
+			VerifyScreenshot(cropBottom: 1400);
+#else
+			VerifyScreenshot();
+#endif
 		}
 	}
 }

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

@@ -1,5 +1,5 @@
-#if TEST_FAILS_ON_WINDOWS // NullReferenceException occurs when switching isGrouped to true
-// refer to https://github.com/dotnet/maui/issues/28824
+#if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_IOS && TEST_FAILS_ON_WINDOWS // NullReferenceException occurs when switching isGrouped to true
+// refer to https://github.com/dotnet/maui/issues/29141, https://github.com/dotnet/maui/issues/28824
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;

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

@@ -22,6 +22,16 @@ public void CollectionViewInsideCarouselViewShouldNotThrowIndexOutOfRangeExcepti
         // but the issue can be consistently reproduced manually with each scroll.
         App.ScrollDown("MainCollectionView", ScrollStrategy.Gesture, 0.99, swipeSpeed: 50, true);
         App.ScrollDown("MainCollectionView", ScrollStrategy.Gesture, 0.99, swipeSpeed: 50, true);
+#if MACCATALYST
+        // MacCatalyst needs more scroll gestures to reach the bottom.
+        for (int i = 0; i < 5; i++)
+        {
+            App.ScrollDown("MainCollectionView", ScrollStrategy.Gesture, 0.99, swipeSpeed: 50, true);
+
+            if (App.FindElements("Footer").Count > 0)
+                break;
+        }
+#endif
         App.ScrollTo("Footer");
         App.WaitForElement("Footer");
     }

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

@@ -12,6 +12,7 @@ public Issue32223(TestDevice testDevice) : base(testDevice)
 	public override string Issue => "[Android] CollectionView items do not reorder correctly when using an item DataTemplateSelector";
 
 	[Test]
+	[Retry(5)]
 	[Category(UITestCategories.CollectionView)]
 	public void CanReorderWithItemDataTemplateSelector()
 	{

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

@@ -1,3 +1,5 @@
+#if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_IOS // Issue: https://github.com/dotnet/maui/issues/34190
+
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
@@ -39,3 +41,4 @@ public void OnBackButtonPressedShouldFireForShellNavigationBarButton()
 		}
 	}
 }
+#endif

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

@@ -35,7 +35,14 @@ public void BackButtonBehaviorTriggersWithCollectionView()
 #if ANDROID || WINDOWS
 		App.TapBackArrow();
 #elif IOS || MACCATALYST
-		App.TapBackArrow("Main");
+		if (App is AppiumIOSApp iosApp && HelperExtensions.IsIOS26OrHigher(iosApp))
+		{
+			App.TapBackArrow();
+		}
+		else
+		{
+			App.TapBackArrow("Main");
+		}
 #endif
 
 		// Wait for navigation back and verify BackButtonBehavior was triggered