[Testing] Re-Enabled UI Test - Issue12574Test (#29436)

* re-enabled the test for android

* modified test case

* Update src/Controls/tests/TestCases.HostApp/Issues/CarouselViewLoopNoFreeze.cs

Co-authored-by: Copilot <[email protected]>

---------

Co-authored-by: Copilot <[email protected]>

Author: TamilarasanSF4853

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

@@ -11,11 +11,13 @@ public class CarouselViewLoopNoFreeze : ContentPage
 		readonly string _carouselAutomationId = "carouselView";
 		readonly string _btnRemoveAutomationId = "btnRemove";
 		readonly string _btnRemoveAllAutomationId = "btnRemoveAll";
+		readonly string _btnSwipeAutomationId = "btnSwipe";
 
 		readonly ViewModelIssue12574 _viewModel;
 		readonly CarouselView2 _carouselView;
 		readonly Button _btn;
 		readonly Button _btn2;
+		readonly Button _btn3;
 
 		public CarouselViewLoopNoFreeze()
 		{
@@ -33,6 +35,19 @@ public CarouselViewLoopNoFreeze()
 			};
 			_btn2.SetBinding(Button.CommandProperty, "RemoveAllItemsCommand");
 
+			_btn3 = new Button
+			{
+				Text = "Swipe",
+				AutomationId = _btnSwipeAutomationId
+			};
+			_btn3.Clicked += (s, e) =>
+			{
+				if (_viewModel.Items.Count == 0)
+					return;
+				_viewModel.CurrentPosition = (_viewModel.CurrentPosition + 1) % _viewModel.Items.Count;
+				_carouselView.ScrollTo(_viewModel.CurrentPosition);
+			};
+
 			_carouselView = new CarouselView2
 			{
 				AutomationId = _carouselAutomationId,
@@ -62,11 +77,14 @@ public CarouselViewLoopNoFreeze()
 			var layout = new Grid();
 			layout.RowDefinitions.Add(new RowDefinition { Height = 100 });
 			layout.RowDefinitions.Add(new RowDefinition { Height = 100 });
+			layout.RowDefinitions.Add(new RowDefinition { Height = 100 });
 			layout.RowDefinitions.Add(new RowDefinition());
 			Grid.SetRow(_btn2, 1);
-			Grid.SetRow(_carouselView, 2);
+			Grid.SetRow(_btn3, 2);
+			Grid.SetRow(_carouselView, 3);
 			layout.Children.Add(_btn);
 			layout.Children.Add(_btn2);
+			layout.Children.Add(_btn3);
 			layout.Children.Add(_carouselView);
 
 			BindingContext = _viewModel = new ViewModelIssue12574();
@@ -85,6 +103,16 @@ class ViewModelIssue12574 : BaseViewModel1
 		public Command LoadItemsCommand { get; set; }
 		public Command RemoveAllItemsCommand { get; set; }
 		public Command RemoveLastItemCommand { get; set; }
+		private int _currentPosition = 0;
+		public int CurrentPosition
+		{
+			get => _currentPosition;
+			set
+			{
+				_currentPosition = value;
+				OnPropertyChanged(nameof(CurrentPosition));
+			}
+		}
 
 		public ViewModelIssue12574()
 		{
@@ -110,6 +138,10 @@ void ExecuteRemoveLastItemCommand()
 			Items.Remove(Items.Last());
 			RemoveAllItemsCommand.ChangeCanExecute();
 			RemoveLastItemCommand.ChangeCanExecute();
+			if (CurrentPosition > 0)
+			{
+				CurrentPosition--;
+			}
 		}
 
 		void ExecuteLoadItemsCommand()

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/CarouselViewUITests.LoopNoFreeze.cs

@@ -1,4 +1,4 @@
-#if TEST_FAILS_ON_WINDOWS && TEST_FAILS_ON_ANDROID // Related issue for windows: https://github.com/dotnet/maui/issues/24482 and For Android, see : https://github.com/dotnet/maui/issues/28760
+#if TEST_FAILS_ON_WINDOWS // Related issue for windows: https://github.com/dotnet/maui/issues/24482
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
@@ -10,6 +10,7 @@ public class CarouselViewLoopNoFreeze : _IssuesUITest
 		readonly string _carouselAutomationId = "carouselView";
 		readonly string _btnRemoveAutomationId = "btnRemove";
 		readonly string _btnRemoveAllAutomationId = "btnRemoveAll";
+		readonly string _btnSwipeAutomationId = "btnSwipe";
 
 		protected override bool ResetAfterEachTest => true;
 		public CarouselViewLoopNoFreeze(TestDevice device)
@@ -28,10 +29,11 @@ public void Issue12574Test()
 			App.WaitForElement("0 item");
 
 			App.WaitForElement(_carouselAutomationId);
-			App.ScrollRight(_carouselAutomationId, ScrollStrategy.Gesture, 0.99);
+			App.WaitForElement(_btnSwipeAutomationId);
+			App.Tap(_btnSwipeAutomationId);
 
 			App.WaitForElement("1 item");
-			App.ScrollRight(_carouselAutomationId, ScrollStrategy.Gesture, 0.99);
+			App.Tap(_btnSwipeAutomationId);
 
 
 			App.WaitForElement("2 item");
@@ -40,7 +42,7 @@ public void Issue12574Test()
 
 			App.WaitForElement("1 item");
 
-			App.ScrollRight(_carouselAutomationId, ScrollStrategy.Gesture, 0.99);
+			App.Tap(_btnSwipeAutomationId);
 
 			App.WaitForElement("0 item");
 		}