Code changes for testcase review

SuthiYuvaraj · SuthiYuvaraj · commit de74b28d7e31 · 2026-03-02T22:34:42.000+05:30
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue12008.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue12008.cs
@@ -1,4 +1,5 @@
 using System.Collections.ObjectModel;
+using Microsoft.Maui.Controls.Shapes;
 
 namespace Maui.Controls.Sample.Issues;
 
@@ -38,7 +39,7 @@ public Issue12008()
 			ItemsSource = Groups,
 			IsGrouped = true,
 			CanReorderItems = true,
-            CanMixGroups = true,
+			CanMixGroups = true,
 			SelectionMode = SelectionMode.None
 		};
 
@@ -59,7 +60,7 @@ public Issue12008()
 				TextColor = Colors.Gray,
 				HorizontalTextAlignment = TextAlignment.End
 			};
-			countLabel.SetBinding(Label.TextProperty, new Binding("Items.Count", stringFormat: "({0} items)"));
+			countLabel.SetBinding(Label.TextProperty, new Binding("Count", stringFormat: "({0} items)"));
 
 			var headerGrid = new Grid
 			{
@@ -73,7 +74,7 @@ public Issue12008()
 				}
 			};
 			headerGrid.SetColumn(countLabel, 1);
-			
+
 			// Set AutomationId based on group name
 			headerGrid.SetBinding(AutomationProperties.NameProperty, new Binding("Name"));
 
@@ -90,16 +91,16 @@ public Issue12008()
 			};
 			itemLabel.SetBinding(Label.TextProperty, "Name");
 
-			var itemContainer = new Frame
+			var itemContainer = new Border
 			{
 				Padding = 0,
 				Margin = new Thickness(12, 4, 12, 4),
 				Content = itemLabel,
 				BackgroundColor = Colors.White,
-				CornerRadius = 5,
-				HasShadow = true
+				StrokeShape = new RoundRectangle { CornerRadius = 5 },
+				Shadow = new Shadow { Opacity = 0.3f, Radius = 2 }
 			};
-			
+
 			// Set AutomationId based on item name for testability
 			itemContainer.SetBinding(AutomationProperties.NameProperty, new Binding("Name"));
 
@@ -134,31 +135,22 @@ public Issue12008()
 
 	void OnReorderCompleted(object sender, EventArgs e)
 	{
-		// Update status label when reorder completes
+		// Update status label with per-group counts so tests can verify actual data model changes
 		if (Content is VerticalStackLayout layout && layout.Children[0] is Label statusLabel)
 		{
-			statusLabel.Text = "Reorder completed!";
+			var groupCounts = string.Join(", ", Groups.Select(g => $"{g.Name}:{g.Count}"));
+			statusLabel.Text = $"Reorder completed! {groupCounts}";
 			statusLabel.BackgroundColor = Color.FromArgb("#C8E6C9");
-
-			// Reset status after 2 seconds
-			MainThread.BeginInvokeOnMainThread(async () =>
-			{
-				await Task.Delay(2000);
-				statusLabel.Text = "Ready to reorder items";
-				statusLabel.BackgroundColor = Color.FromArgb("#E8F5E9");
-			});
 		}
 	}
 
 	public class Issue12008Group : ObservableCollection<Item>
 	{
 		public string Name { get; set; }
-		public new ObservableCollection<Item> Items { get; }
 
 		public Issue12008Group(string name, ObservableCollection<Item> items)
 		{
 			Name = name;
-			Items = items;
 
 			foreach (var item in items)
 				Add(item);
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue12008.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue12008.cs
@@ -1,4 +1,4 @@
-# if TEST_FAILS_ON_WINDOWS  && TEST_FAILS_ON_ANDROID
+#if TEST_FAILS_ON_WINDOWS && TEST_FAILS_ON_ANDROID
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
@@ -25,10 +25,13 @@ public void CanDragItemIntoEmptyGroup()
 		// Drag an item from Group A into the Empty Group
 		App.DragAndDrop("Item A1", "Empty Group");
 
-		// Verify the reorder completed successfully by checking status label
+		// Verify the data model actually changed:
+		// - Group A should have lost one item (3 -> 2)
+		// - Empty Group should have gained one item (0 -> 1)
 		var statusLabel = App.WaitForElement("StatusLabel");
 		var statusText = statusLabel.GetText();
-		Assert.That(statusText, Does.Contain("Reorder completed"), "Status should show reorder completed after dragging into empty group");
+		Assert.That(statusText, Does.Contain("Empty Group:1"), "Empty Group should contain 1 item after drag-and-drop");
+		Assert.That(statusText, Does.Contain("Group A:2"), "Group A should contain 2 items after losing one to Empty Group");
 	}
 }
-#endif
+#endif
