Enable now passing tests and add some TableView categories (#20531)

* Enable now passing tests and add some TableView categories * Update Bugzilla51503.cs * Update Issue7700.cs * Update Issue773.cs * - ignore a few that are still flakey
dotnet · Mar 5, 2024 · 7d53718 · 7d53718
1 parent 9bb4cd1
commit 7d53718
Show file tree

Hide file tree

Showing 56 changed files with 67 additions and 36 deletions.
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/BottomTabbedPageTests.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/BottomTabbedPageTests.cs
@@ -254,7 +254,6 @@ protected override void OnPagesChanged(NotifyCollectionChangedEventArgs e)
 		}
 
 #if UITEST && __ANDROID__
-[Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiAndroid]
 		[Test]
 		public async Task AddAndRemovePages()
 		{

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla27085.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla27085.cs
@@ -11,6 +11,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 {
 #if UITEST
 	[Category(Compatibility.UITests.UITestCategories.Bugzilla)]
+	[Category(Compatibility.UITests.UITestCategories.TableView)]
 #endif
 	[Issue(IssueTracker.Bugzilla, 27085, "EntryCell has no possibility to hide keyboard on iOS")]
 	public class Bugzilla27085 : TestContentPage // or TestFlyoutPage, etc ...

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29453.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29453.cs
@@ -66,7 +66,6 @@ protected override void Init()
 		}
 
 #if UITEST
-[Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiAndroid]
 [Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiIOS]
 		[Test]
 		public void Bugzilla29453Test()

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31333.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31333.cs
@@ -15,6 +15,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 {
 #if UITEST
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Bugzilla)]
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
 #endif
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Bugzilla, 31333,

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla32040.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla32040.cs
@@ -14,6 +14,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 	[Category(UITestCategories.Bugzilla)]
 	[Category(UITestCategories.Cells)]
 	[Category(UITestCategories.UwpIgnore)]
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
 #endif
 
 	[Preserve(AllMembers = true)]

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla32847.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla32847.cs
@@ -8,6 +8,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 {
 #if UITEST
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Bugzilla)]
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
 #endif
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Bugzilla, 32847,

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla33578.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla33578.cs
@@ -13,6 +13,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 {
 #if UITEST
 	[Category(Compatibility.UITests.UITestCategories.Bugzilla)]
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
 #endif
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Bugzilla, 33578, "TableView EntryCell shows DefaultKeyboard, but after scrolling down and back a NumericKeyboard (")]

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla36559.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla36559.cs
@@ -12,6 +12,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 {
 #if UITEST
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Bugzilla)]
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
 #endif
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Bugzilla, 36559, "[WP] Navigating to a ContentPage with a Grid inside a TableView affects Entry heights")]

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla36955.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla36955.cs
@@ -14,6 +14,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 {
 #if UITEST
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Bugzilla)]
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
 #endif
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Bugzilla, 36955, "[iOS] ViewCellRenderer.UpdateIsEnabled referencing null object", PlatformAffected.iOS)]

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla37841.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla37841.cs
@@ -14,6 +14,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 {
 #if UITEST
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Bugzilla)]
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
 #endif
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Bugzilla, 37841, "TableView EntryCells and TextCells cease to update after focus change", PlatformAffected.Android)]

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla38112.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla38112.cs
@@ -11,6 +11,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 {
 #if UITEST
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Bugzilla)]
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
 #endif
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Bugzilla, 38112, "Switch becomes reenabled when previous ViewCell is removed from TableView", PlatformAffected.Android)]

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla39486.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla39486.cs
@@ -12,6 +12,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 {
 #if UITEST
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Bugzilla)]
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
 #endif
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Bugzilla, 39486, "HasUnevenRows=true ignored in Forms iOS project in TableView with CustomCell; row heights are not auto-sized")]

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla40704.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla40704.cs
@@ -225,7 +225,6 @@ public PatientViewModel(string code)
 
 
 #if UITEST
-[Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiAndroid]
 [Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiIOS]
 		[Test]
 		public void Bugzilla40704HeaderPresentTest()

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla46458.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla46458.cs
@@ -99,7 +99,6 @@ protected override void Init()
 		}
 
 #if UITEST
-[Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiAndroid]
 [Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiIOS]
 		[Test]
 		public void GridIsEnabled()

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla49304.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla49304.cs
@@ -11,6 +11,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 {
 #if UITEST
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Bugzilla)]
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
 #endif
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Bugzilla, 49304, "[UWP] ScrollView and ListView are not scrolling after rotation", PlatformAffected.UWP)]

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla51503.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla51503.cs
@@ -80,4 +80,4 @@ public void Issue51503Test()
 		}
 #endif
 	}
-}
+}
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla57317.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla57317.cs
@@ -16,6 +16,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 #if UITEST
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Bugzilla)]
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.UwpIgnore)]
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
 #endif
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Bugzilla, 57317, "Modifying Cell.ContextActions can crash on Android", PlatformAffected.Android)]

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla59580.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla59580.cs
@@ -12,6 +12,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 #if UITEST
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Bugzilla)]
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.UwpIgnore)]
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
 #endif
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Bugzilla, 59580, "Raising Command.CanExecutChanged causes crash on Android",

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/DateTimePickerLocalizationTests.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/DateTimePickerLocalizationTests.cs
@@ -101,7 +101,6 @@ public void TimePickerOther()
 		[Test]
 		// Tests runs locally without issues but doesn't run successfully in a hosted agent yet
 		[Category(UITestCategories.UwpIgnore)]
-		[FailsOnMauiAndroid]
 		[FailsOnMauiIOS]
 		public void DatePickerDMY()
 		{
@@ -122,7 +121,6 @@ public void DatePickerDMY()
 		[Test]
 		// Tests runs locally without issues but doesn't run successfully in a hosted agent yet
 		[Category(UITestCategories.UwpIgnore)]
-		[FailsOnMauiAndroid]
 		[FailsOnMauiIOS]
 		public void DatePickerMissing()
 		{
@@ -140,7 +138,6 @@ public void DatePickerMissing()
 
 #if !WINDOWS
 		[Test]
-		[FailsOnMauiAndroid]
 		[FailsOnMauiIOS]
 		public void DatePickerLetters()
 		{

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/GestureBubblingTests.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/GestureBubblingTests.cs
@@ -35,12 +35,16 @@ public class GestureBubblingTests : TestNavigationPage
 		static NavigationPage NavigationPage;
 
 #if UITEST
-[Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiAndroid]
-[Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiIOS] // on iOS only menuItem=Slider, frameShouldRegisterTap=False fails
+		[Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiIOS] // on iOS only menuItem=Slider, frameShouldRegisterTap=False fails
 		[Test, TestCaseSource(nameof(TestCases))]
 		[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.UwpIgnore)]
 		public void VerifyTapBubbling(string menuItem, bool frameShouldRegisterTap)
 		{
+			if (menuItem == "Frame" && frameShouldRegisterTap)
+			{
+				Assert.Ignore("FailsOnMauiAndroid");
+			}
+
 			var results = RunningApp.WaitForElement(q => q.Marked(menuItem));
 
 			if (results.Length > 1)

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Github5623.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Github5623.xaml.cs
@@ -117,7 +117,6 @@ protected override void Init()
 #if UITEST
 		[Test]
 		[Compatibility.UITests.FailsOnMauiIOS]
-		[Compatibility.UITests.FailsOnMauiAndroid]
 		public void CollectionViewInfiniteScroll()
 		{
 			RunningApp.WaitForElement("CollectionView5623");

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/InputTransparentTests.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/InputTransparentTests.cs
@@ -29,11 +29,15 @@ public class InputTransparentTests : TestNavigationPage
 		static NavigationPage NavigationPage;
 
 #if UITEST
-[Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiAndroid]
-[Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiIOS] // Only menuItem=Frame fails on iOS
+		[Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiIOS] // Only menuItem=Frame fails on iOS
 		[Test, TestCaseSource(nameof(TestCases))]
 		public void VerifyInputTransparent(string menuItem)
 		{
+			if (menuItem == "BoxView" || menuItem == "Image" || menuItem == "Label")
+			{
+				Assert.Ignore("FailsOnMauiAndroid");
+			}
+
 			var results = RunningApp.WaitForElement(q => q.Marked(menuItem));
 
 			if(results.Length > 1)

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1028.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1028.cs
@@ -10,6 +10,10 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 {
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Github, 1028, "ViewCell in TableView raises exception - root page is ContentPage, Content is TableView", PlatformAffected.WinPhone, NavigationBehavior.PushModalAsync)]
+
+#if UITEST
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
+#endif
 	public class Issue1028 : TestContentPage
 	{
 		// Issue1028, ViewCell with StackLayout causes exception when nested in a table section. This occurs when the app's root page is a ContentPage with a TableView.

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue11224.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue11224.xaml.cs
@@ -65,7 +65,6 @@ void Button_Clicked(object sender, EventArgs e)
 
 #if UITEST
 		[Test]
-		[Compatibility.UITests.FailsOnMauiAndroid]
 		[Compatibility.UITests.FailsOnMauiIOS]
 		public void CarouselViewPositionFromVisibilityChangeTest()
 		{

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue12193.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue12193.cs
@@ -68,6 +68,7 @@ protected override void Init()
 #if UITEST
 		[Test]
 		[Compatibility.UITests.FailsOnMauiIOS]
+		[Compatibility.UITests.FailsOnMauiAndroid]
 		public async Task RotatingCarouselViewHTMLShouldNotDisappear()
 		{
 			int delay = 3000;

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue12574.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue12574.cs
@@ -123,7 +123,6 @@ public void Issue12574Test()
 
 		[Test]
 		[Compatibility.UITests.FailsOnMauiIOS]
-		[Compatibility.UITests.FailsOnMauiAndroid]
 		public void RemoveItemsQuickly()
 		{
 			RunningApp.WaitForElement("0 item");

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1259.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1259.cs
@@ -11,6 +11,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 {
 #if UITEST
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Github5000)]
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
 #endif
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Github, 1259, "Layout issue with SwitchCell", PlatformAffected.Android)]

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1386.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1386.cs
@@ -6,6 +6,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 {
 #if UITEST
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Github5000)]
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
 #endif
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Github, 1386,

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1598.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1598.cs
@@ -24,6 +24,7 @@ public FlyoutPageToolbarBug()
 	}
 #if UITEST
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Github5000)]
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
 #endif
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Github, 1598, "FlyoutPageContainer does not handle adding of views which are already its children", PlatformAffected.Android)]

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1777.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1777.cs
@@ -17,6 +17,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 {
 #if UITEST
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Github5000)]
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
 #endif
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Github, 1777, "Adding picker items when picker is in a ViewCell breaks", PlatformAffected.WinPhone)]

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1975.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1975.cs
@@ -143,7 +143,6 @@ public SubItem(string text)
 #if UITEST
 		[Test]
 		[Compatibility.UITests.FailsOnMauiIOS]
-		[Compatibility.UITests.FailsOnMauiAndroid]
 		public void UpdatingSourceOfDisposedListViewDoesNotCrash()
 		{
 			RunningApp.Tap(Go);

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue214.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue214.cs
@@ -8,6 +8,9 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 {
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Github, 214, "TextCell DetailColor change not immediate", PlatformAffected.iOS)]
+#if UITEST
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
+#endif
 	public class Issue214 : ContentPage
 	{
 		public Issue214()

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2143.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2143.cs
@@ -10,6 +10,9 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 {
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Github, 2143, "Picker on windows phone", PlatformAffected.WinPhone)]
+	#if UITEST
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
+	#endif
 	public class Issue2143 : ContentPage
 	{
 		public Issue2143()

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue22246_BZ.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue22246_BZ.cs
@@ -11,6 +11,9 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 {
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Bugzilla, 22246, "Entry in Grid nested in ViewCell isn't expanding", PlatformAffected.WinPhone, NavigationBehavior.PushModalAsync)]
+	#if UITEST
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
+	#endif
 	public class Issue22246Bz : ContentPage
 	{
 		public Issue22246Bz()

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2266.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2266.cs
@@ -93,7 +93,6 @@ static FlyoutPageNavigation FlyoutPageHost
 
 
 #if UITEST
-[Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiAndroid]
 [Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiIOS]
 		[Test]
 		public void SwapMainPageWithFlyoutPages()

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2414.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2414.cs
@@ -14,6 +14,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 #if UITEST
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Github5000)]
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.UwpIgnore)]
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
 #endif
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Github, 2414, "NullReferenceException when swiping over Context Actions", PlatformAffected.WinPhone)]

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue260.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue260.cs
@@ -8,6 +8,9 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 {
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Github, 260, "Layout issue for TableView", PlatformAffected.WinPhone)]
+#if UITEST
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
+#endif
 	public class Issue260 : ContentPage
 	{
 		public Issue260()

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2615.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2615.cs
@@ -6,6 +6,9 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 {
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Github, 2615, "iOS Cell Reuse screws up when cells are both ViewCell with different children", PlatformAffected.iOS)]
+	#if UITEST
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
+	#endif
 	public class Issue2615 : ContentPage
 	{
 		public Issue2615()

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2767.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2767.cs
@@ -45,7 +45,6 @@ protected override void Init()
 		}
 
 #if UITEST
-[Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiAndroid]
 [Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiIOS]
 		[Test]
 		public void Issue2767Test()

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2794.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2794.cs
@@ -10,6 +10,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 {
 #if UITEST
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Github5000)]
+	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
 #endif
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Github, 2794, "TableView does not react on underlying collection change", PlatformAffected.Android)]
@@ -69,7 +70,7 @@ protected void Delete(object parameters)
 		}
 
 #if UITEST && __ANDROID__
-[Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiAndroid]
+		[Microsoft.Maui.Controls.Compatibility.UITests.FailsOnMauiAndroid]
 		[Test]
 		public void Issue2794Test()
 		{