Revert PR #31653 : [Testing] Enable UITest Issue18193 on MacCatalyst (#33393)

This pull request updates UI test cases by reverting Shell navigation
test changes that continue to fail in Mac CI.

- ShellNavigationShouldWorkInMoreTab test case was previously failing in
CI on the Mac platform but was passing locally. Therefore, this PR
#31653 was created to resolve the
issue. However, the ShellNavigationShouldWorkInMoreTab test still fails
in CI on the Mac platform even after the changes. So, the changes from
#31653 were reverted.

Author: TamilarasanSF4853

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

@@ -15,13 +15,13 @@ public Issue18193()
 			tabBar.Items.Add(CreateShellContent("Page 6", typeof(Issue18193Page6), nameof(Issue18193Page6)));
 			//Added the TabBar Items ,this will show overflow menu in Windows
 			//to access the extra pages, keeping the interface clean and easy to navigate.
-			tabBar.Items.Add(CreateShellContent("Page 7", typeof(Issue18193Page7), nameof(Issue18193Page7)));
-			tabBar.Items.Add(CreateShellContent("Page 8", typeof(Issue18193Page8), nameof(Issue18193Page8)));
-			tabBar.Items.Add(CreateShellContent("Page 9", typeof(Issue18193Page9), nameof(Issue18193Page9)));
-			tabBar.Items.Add(CreateShellContent("Page 10", typeof(Issue18193Page10), nameof(Issue18193Page10)));
-			tabBar.Items.Add(CreateShellContent("Page 11", typeof(Issue18193Page11), nameof(Issue18193Page11)));
-			tabBar.Items.Add(CreateShellContent("Page 12", typeof(Issue18193Page12), nameof(Issue18193Page12)));
-			tabBar.Items.Add(CreateShellContent("Page 13", typeof(Issue18193Page13), nameof(Issue18193Page13)));
+			tabBar.Items.Add(CreateShellContent("Page 7", typeof(Issue18193Page2), nameof(Issue18193Page7)));
+			tabBar.Items.Add(CreateShellContent("Page 8", typeof(Issue18193Page3), nameof(Issue18193Page8)));
+			tabBar.Items.Add(CreateShellContent("Page 9", typeof(Issue18193Page4), nameof(Issue18193Page9)));
+			tabBar.Items.Add(CreateShellContent("Page 10", typeof(Issue18193Page5), nameof(Issue18193Page10)));
+			tabBar.Items.Add(CreateShellContent("Page 11", typeof(Issue18193Page6), nameof(Issue18193Page11)));
+			tabBar.Items.Add(CreateShellContent("Page 12", typeof(Issue18193Page2), nameof(Issue18193Page12)));
+			tabBar.Items.Add(CreateShellContent("Page 13", typeof(Issue18193Page3), nameof(Issue18193Page13)));
 			Items.Add(tabBar);
 			Routing.RegisterRoute(nameof(Issue18193DetailPage), typeof(Issue18193DetailPage));
 		}
@@ -38,9 +38,9 @@ class Issue18193MainPage : ContentPage
 	{
 		public Issue18193MainPage()
 		{
-			Button sixthPageButton = new Button() { AutomationId = "NavigationToPageSixthButton", Text = "Navigate to page 6" };
-			sixthPageButton.Clicked += (s, e) => Issue18193.Current.GoToAsync("//" + nameof(Issue18193Page6));
-			Content = sixthPageButton;
+			var button = new Button() { AutomationId = "NavigationToPage6Button", Text = "Navigate to page 6" };
+			button.Clicked += (s, e) => Issue18193.Current.GoToAsync("//" + nameof(Issue18193Page6));
+			Content = button;
 		}
 	}
 
@@ -49,9 +49,9 @@ class Issue18193DetailPage : ContentPage
 		public Issue18193DetailPage()
 		{
 			Title = "Detail Page";
-			Button backButton = new Button() { AutomationId = "NavigateBackButton", Text = "Navigate back" };
-			backButton.Clicked += (s, e) => Issue18193.Current.GoToAsync("..");
-			Content = backButton;
+			var button = new Button() { AutomationId = "NavigateBackButton", Text = "Navigate back" };
+			button.Clicked += (s, e) => Issue18193.Current.GoToAsync("..");
+			Content = button;
 		}
 	}
 
@@ -63,7 +63,7 @@ public Issue18193Page2()
 			{
 				Text = "Navigate to page 5",
 				Command = new Command(async () => await Issue18193.Current.GoToAsync("//" + nameof(Issue18193Page5))),
-				AutomationId = "NavigateToPageFiveButton"
+				AutomationId = "NavigateToPage5Button"
 			};
 		}
 	}
@@ -91,17 +91,17 @@ public class Issue18193Page6 : ContentPage
 	{
 		public Issue18193Page6()
 		{
-			Button detailPageButton = new Button() { AutomationId = "NavigateToDetailButton", Text = "Navigate to detail page" };
-			detailPageButton.Clicked += (s, e) => Issue18193.Current.GoToAsync(nameof(Issue18193DetailPage));
+			var button = new Button() { AutomationId = "NavigateToDetailButton", Text = "Navigate to detail page" };
+			button.Clicked += (s, e) => Issue18193.Current.GoToAsync(nameof(Issue18193DetailPage));
 
-			Button secondPageButton = new Button() { AutomationId = "NavigateToPageTwoButton", Text = "Navigate to Page 2" };
-			secondPageButton.Clicked += (s, e) => Issue18193.Current.GoToAsync("//" + nameof(Issue18193Page2));
+			var button2 = new Button() { AutomationId = "NavigateToPage2Button", Text = "Navigate to Page 2" };
+			button2.Clicked += (s, e) => Issue18193.Current.GoToAsync("//" + nameof(Issue18193Page2));
 			Content = new StackLayout
 			{
 				Children =
 				{
-					detailPageButton,
-					secondPageButton
+					button,
+					button2
 				}
 			};
 		}

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

@@ -1,4 +1,5 @@
-using NUnit.Framework;
+#if TEST_FAILS_ON_CATALYST //related issue: https://github.com/dotnet/maui/issues/27206
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -16,31 +17,19 @@ public Issue18193(TestDevice testDevice) : base(testDevice)
 		[Category(UITestCategories.Shell)]
 		public void ShellNavigationShouldWorkInMoreTab()
 		{
-			App.WaitForElementTillPageNavigationSettled("NavigationToPageSixthButton");
-			App.Tap("NavigationToPageSixthButton");
-			App.WaitForElementTillPageNavigationSettled("NavigateToDetailButton");
-			bool navigationSucceeded = false;
-			for (int i = 0; i < 3 && !navigationSucceeded; i++)
-			{
-				try
-				{
-					App.Tap("NavigateToDetailButton");
-					App.WaitForElementTillPageNavigationSettled("NavigateBackButton");
-					navigationSucceeded = true;
-				}
-				catch (Exception)
-				{
-					TestContext.WriteLine($"Timeout waiting for NavigateBackButton after tapping NavigateToDetailButton");
-				}
-			}
-			Assert.That(navigationSucceeded, Is.True, "Navigation to Detail Page did not succeed after multiple attempts");
-			App.Tap("NavigateBackButton");
-			App.WaitForElementTillPageNavigationSettled("NavigateToPageTwoButton");
-			App.Tap("NavigateToPageTwoButton");
-			App.WaitForElementTillPageNavigationSettled("NavigateToPageFiveButton");
-			App.Tap("NavigateToPageFiveButton");
+			App.WaitForElementTillPageNavigationSettled("Navigate to page 6");
+			App.Tap("Navigate to page 6");
+			App.WaitForElementTillPageNavigationSettled("Navigate to detail page");
+			App.Tap("Navigate to detail page");
+			App.WaitForElementTillPageNavigationSettled("Navigate back");
+			App.Tap("Navigate back");
+			App.WaitForElementTillPageNavigationSettled("Navigate to Page 2");
+			App.Tap("Navigate to Page 2");
+			App.WaitForElementTillPageNavigationSettled("Navigate to page 5");
+			App.Tap("Navigate to page 5");
 			App.WaitForElementTillPageNavigationSettled("More");
 			App.Tap("More");
 		}
 	}
-}
+}
+#endif