[Testing] Fixed Test case failure in PR 30115 - [2025/06/23] Candidate

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

@@ -6,8 +6,8 @@
     <VerticalStackLayout>
         <ScrollView Orientation="Horizontal"
                     x:Name="scrollView"
-                    HeightRequest="120">
-
+                    HeightRequest="120"
+                    HorizontalScrollBarVisibility="Never">
             <ScrollView.Background>
                 <LinearGradientBrush StartPoint="0,0.5"
                                      EndPoint="1,0.5">
@@ -19,29 +19,37 @@
                     </LinearGradientBrush.GradientStops>
                 </LinearGradientBrush>
             </ScrollView.Background>
-                <StackLayout Orientation="Horizontal">
-                    <BindableLayout.ItemsSource>
-                        <x:Array Type="{x:Type x:String}">
-                            <x:String>Item1</x:String>
-                            <x:String>Item2</x:String>
-                            <x:String>Item3</x:String>
-                            <x:String>Item4</x:String>
-                            <x:String>Item5</x:String>
-                        </x:Array>
-                    </BindableLayout.ItemsSource>
-                    <BindableLayout.ItemTemplate>
-                        <DataTemplate>
-                            <BoxView WidthRequest="100"
-                                     HeightRequest="100"
-                                     AutomationId="{Binding .}"
-                                     BackgroundColor="Black"
-                                     Margin="10"/>
-                        </DataTemplate>
-                    </BindableLayout.ItemTemplate>
-                </StackLayout>
+            <StackLayout Orientation="Horizontal">
+                <BindableLayout.ItemsSource>
+                    <x:Array Type="{x:Type x:String}">
+                        <x:String>Item1</x:String>
+                        <x:String>Item2</x:String>
+                        <x:String>Item3</x:String>
+                        <x:String>Item4</x:String>
+                        <x:String>Item5</x:String>
+                        <x:String>Item6</x:String>
+                        <x:String>Item7</x:String>
+                        <x:String>Item8</x:String>
+                        <x:String>Item9</x:String>
+                        <x:String>Item10</x:String>
+                    </x:Array>
+                </BindableLayout.ItemsSource>
+                <BindableLayout.ItemTemplate>
+                    <DataTemplate>
+                        <BoxView WidthRequest="100"
+                                 HeightRequest="100"
+                                 AutomationId="{Binding .}"
+                                 BackgroundColor="Black"
+                                 Margin="10"/>
+                    </DataTemplate>
+                </BindableLayout.ItemTemplate>
+            </StackLayout>
         </ScrollView>
         <Button AutomationId="button"
                 Clicked="Button_Clicked"
                 Text="Remove/Add scroll view background"/>
+        <Button AutomationId="scrollButton"
+                Clicked="ScrollButton_Clicked"
+                Text="Scroll to End"/>
     </VerticalStackLayout>
 </ContentPage>

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

@@ -23,10 +23,21 @@ public Issue24061()
 
 		private void Button_Clicked(object sender, EventArgs e)
 		{
-			if (scrollView.Background != null)
-				scrollView.Background = null;
+			if (scrollView.Background is LinearGradientBrush)
+			{
+				// Setting background to null will not reset to color on Android, Refer: https://github.com/dotnet/maui/issues/22914
+				//scrollView.Background = null;
+				scrollView.Background = new SolidColorBrush(Colors.White);
+			}
+
 			else
 				scrollView.Background = _linearGradientBrush;
 		}
+
+		private async void ScrollButton_Clicked(object sender, EventArgs e)
+		{
+			// Scroll to the end of the horizontal ScrollView
+			await scrollView.ScrollToAsync(scrollView.ContentSize.Width, 0, false);
+		}
 	}
 }

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

@@ -17,7 +17,9 @@ public Issue10025(TestDevice device) : base(device)
 	[Category(UITestCategories.CollectionView)]
 	public void VerifySelectedItemClearsOnNullAssignment()
 	{
+		App.WaitForElement("Item1");
 		App.Tap("Item1");
+		App.WaitForElement("DescriptionLabel");
 		App.Tap("DescriptionLabel");
 		VerifyScreenshot();
 	}

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

@@ -16,14 +16,22 @@ public Issue24061(TestDevice testDevice) : base(testDevice)
 		[Category(UITestCategories.ScrollView)]
 		public void ScrollViewGradientBackgroundShouldWorkWithScrollView()
 		{
-			App.WaitForElement("Item2");
-			App.SwipeRightToLeft("Item2", 0.99);
+			Exception? exception = null;
 
-			VerifyScreenshot("ScrollViewGradientBackground");
+			App.WaitForElement("scrollButton");
+
+			App.Click("scrollButton");
+			VerifyScreenshotOrSetException(ref exception, "ScrollViewGradientBackground");
 			App.Click("button");
-			VerifyScreenshot("ScrollViewWithoutGradientBackground");
+			App.WaitForElement("scrollButton");
+			VerifyScreenshotOrSetException(ref exception, "ScrollViewWithoutGradientBackground");
 			App.Click("button");
-			VerifyScreenshot("ScrollViewGradientBackground");
+			App.WaitForElement("scrollButton");
+			VerifyScreenshotOrSetException(ref exception, "ScrollViewGradientBackground");
+			if (exception != null)
+			{
+				throw exception;
+			}
 		}
 	}
 }