[Testing] Rework Appium Runner so that it goes directly to tests instead of navigates

src/Controls/samples/Controls.Sample.UITests/CoreViews/CoreRootPage.cs

@@ -1,18 +1,38 @@
 using System;
+using System.Threading.Tasks;
+using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Internals;
 
 namespace Maui.Controls.Sample
 {
 	[Preserve(AllMembers = true)]
-	internal class CoreRootPage : Microsoft.Maui.Controls.ContentPage
+	internal class CoreRootPage : ContentPage
 	{
-		public CoreRootPage(Microsoft.Maui.Controls.Page rootPage)
+		public CoreRootPage(Page rootPage)
 		{
 			Title = "Core Gallery";
 
 			var corePageView = new CorePageView(rootPage);
 
-			var searchBar = new Microsoft.Maui.Controls.Entry()
+			var resetCheckBox = new CheckBox
+			{
+				AutomationId = "ResetMainPage",
+				VerticalOptions = LayoutOptions.Center,
+			};
+			var resetLabel = new Label
+			{
+				Text = "Reset MainPage",
+				VerticalOptions = LayoutOptions.Center,
+			};
+			var resetLayout = new HorizontalStackLayout
+			{
+				resetCheckBox,
+				resetLabel
+			};
+			resetLayout.HorizontalOptions = LayoutOptions.End;
+			resetLayout.Margin = new Microsoft.Maui.Thickness(12);
+
+			var searchBar = new Entry()
 			{
 				AutomationId = "SearchBar"
 			};
@@ -22,31 +42,57 @@ public CoreRootPage(Microsoft.Maui.Controls.Page rootPage)
 				corePageView.FilterPages(e.NewTextValue);
 			};
 
-			var testCasesButton = new Microsoft.Maui.Controls.Button
+			var testCasesButton = new Button
 			{
 				Text = "Go to Test Cases",
 				AutomationId = "GoToTestButton",
-				Command = new Microsoft.Maui.Controls.Command(async () =>
+				Command = new Command(async () =>
 				{
+					bool resetMainPage = resetCheckBox.IsChecked;
+
 					if (!string.IsNullOrEmpty(searchBar.Text))
 					{
-						await corePageView.PushPage(searchBar.Text);
+						try
+						{
+							bool navigated = await corePageView.PushPage(searchBar.Text);
+
+							if (!navigated)
+							{
+								var testCaseScreen = new TestCases.TestCaseScreen(resetMainPage);
+								await Task.Delay(50); // Load all the issues before try to navigate.
+
+								if (TestCases.TestCaseScreen.PageToAction.ContainsKey(searchBar.Text?.Trim()))
+								{
+									TestCases.TestCaseScreen.PageToAction[searchBar.Text?.Trim()]();
+								}
+								else if (!testCaseScreen.TryToNavigateTo(searchBar.Text?.Trim()))
+								{
+									throw new Exception($"Unable to Navigate to {searchBar.Text}");
+								}
+							}
+						}
+						catch (Exception e)
+						{
+							System.Diagnostics.Debug.WriteLine(e.Message);
+							Console.WriteLine(e.Message);
+						}
 					}
 					else
 					{
-						await Navigation.PushModalAsync(TestCases.GetTestCases());
+						await Navigation.PushModalAsync(TestCases.GetTestCases(resetMainPage));
 					}
 				})
 			};
 
-			var stackLayout = new Microsoft.Maui.Controls.StackLayout()
+			var stackLayout = new StackLayout()
 			{
 				Children = {
+					resetLayout,
 					testCasesButton,
 					searchBar,
-					new Microsoft.Maui.Controls.Button {
+					new Button {
 						Text = "Click to Force GC",
-						Command = new Microsoft.Maui.Controls.Command(() => {
+						Command = new Command(() => {
 							GC.Collect ();
 							GC.WaitForPendingFinalizers ();
 							GC.Collect ();

src/Controls/samples/Controls.Sample.UITests/Issues/Issues16094.xaml

@@ -2,7 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.Controls.Sample.Issues.Issue16094">
-    <ScrollView>
+    <ScrollView
+      AutomationId="TestScrollView">
         <VerticalStackLayout
             Spacing="25"
             Padding="30,0"

src/Controls/samples/Controls.Sample.UITests/TestCases.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -30,59 +30,79 @@ static TextCell MakeIssueCell(string text, string detail, Action tapped)
 				return cell;
 			}
 
-			Action ActivatePageAndNavigate(IssueAttribute issueAttribute, Type type)
+			Action ActivatePageAndNavigate(IssueAttribute issueAttribute, Type type, bool reset = false)
 			{
 				Action navigationAction = null;
 
-				if (issueAttribute.NavigationBehavior == NavigationBehavior.PushAsync)
+				if (reset)
 				{
-					return async () =>
-					{
-						var page = ActivatePage(type);
-						TrackOnInsights(page);
-						await Navigation.PushAsync(page);
-					};
-				}
-
-				if (issueAttribute.NavigationBehavior == NavigationBehavior.PushModalAsync)
-				{
-					return async () =>
+					return () =>
 					{
 						var page = ActivatePage(type);
 						TrackOnInsights(page);
-						await Navigation.PushModalAsync(page);
+						Application.Current.MainPage = page;
 					};
 				}
-
-				if (issueAttribute.NavigationBehavior == NavigationBehavior.Default)
+				else
 				{
-					return async () =>
+					if (issueAttribute.NavigationBehavior == NavigationBehavior.PushAsync)
 					{
-						var page = ActivatePage(type);
-						TrackOnInsights(page);
-						if (page is ContentPage /*|| page is CarouselPage*/)
+						return async () =>
 						{
+							var page = ActivatePage(type);
+							TrackOnInsights(page);
 							await Navigation.PushAsync(page);
-						}
-						else if (page is Shell)
-						{
-							Application.Current.MainPage = page;
-						}
-						else
+						};
+					}
+
+					if (issueAttribute.NavigationBehavior == NavigationBehavior.PushModalAsync)
+					{
+						return async () =>
 						{
+							var page = ActivatePage(type);
+							TrackOnInsights(page);
 							await Navigation.PushModalAsync(page);
-						}
-					};
-				}
+						};
+					}
 
-				if (issueAttribute.NavigationBehavior == NavigationBehavior.SetApplicationRoot)
-				{
-					return () =>
+					if (issueAttribute.NavigationBehavior == NavigationBehavior.Default)
 					{
-						var page = ActivatePage(type);
-						TrackOnInsights(page);
-						Application.Current.MainPage = page;
-					};
+						return async () =>
+						{
+							var page = ActivatePage(type);
+							TrackOnInsights(page);
+
+							var navigation = Navigation;
+
+							if (page.NavigationProxy.Inner is null)
+							{
+								navigation = Application.Current.MainPage.Navigation;
+							}
+
+							if (page is ContentPage)
+							{
+								await navigation.PushAsync(page);
+							}
+							else if (page is Shell)
+							{
+								Application.Current.MainPage = page;
+							}
+							else
+							{
+								await navigation.PushModalAsync(page);
+							}	
+						};
+					}
+
+					if (issueAttribute.NavigationBehavior == NavigationBehavior.SetApplicationRoot)
+					{
+						return () =>
+						{
+							var page = ActivatePage(type);
+							TrackOnInsights(page);
+							Application.Current.MainPage = page;
+						};
+					}
 				}
 
 				return navigationAction;
@@ -140,7 +160,7 @@ public bool Matches(string filter)
 				}
 			}
 
-			readonly List<IssueModel> _issues;
+			List<IssueModel> _issues;
 			TableSection _section;
 
 			void VerifyNoDuplicates()
@@ -159,14 +179,26 @@ void VerifyNoDuplicates()
 				});
 			}
 
-			public TestCaseScreen()
+			public TestCaseScreen(bool resetMainPage = false)
 			{
+				ResetMainPage = resetMainPage;
+
 				AutomationId = "TestCasesIssueList";
 
 				Intent = TableIntent.Settings;
 
+				UpdateIssues();
+			}
+
+			internal bool ResetMainPage { get; set; }
+
+			public void UpdateIssues()
+			{
 				var assembly = typeof(TestCases).Assembly;
 
+				if (_issues is not null)
+					_issues.Clear();
+
 				_issues =
 					(from type in assembly.GetTypes()
 					 let attribute = type.GetCustomAttribute<IssueAttribute>()
@@ -178,7 +210,7 @@ public TestCaseScreen()
 						 IssueTestNumber = attribute.IssueTestNumber,
 						 Name = attribute.DisplayName,
 						 Description = attribute.Description,
-						 Action = ActivatePageAndNavigate(attribute, type)
+						 Action = ActivatePageAndNavigate(attribute, type, ResetMainPage)
 					 }).ToList();
 
 				VerifyNoDuplicates();
@@ -300,7 +332,7 @@ from issueModel in _issues
 			bool IsExempt(string name) => _exemptNames.Contains(name);
 		}
 
-		public static NavigationPage GetTestCases()
+		public static NavigationPage GetTestCases(bool resetMainPage = false)
 		{
 			TestCaseScreen testCaseScreen = null;
 			var rootLayout = new StackLayout();
@@ -339,7 +371,6 @@ public static NavigationPage GetTestCases()
 						System.Diagnostics.Debug.WriteLine(e.Message);
 						Console.WriteLine(e.Message);
 					}
-
 				})
 			};
 
@@ -354,7 +385,7 @@ public static NavigationPage GetTestCases()
 			rootLayout.Children.Add(searchBar);
 			rootLayout.Children.Add(searchButton);
 
-			testCaseScreen = new TestCaseScreen();
+			testCaseScreen = new TestCaseScreen(resetMainPage);
 
 			rootLayout.Children.Add(CreateTrackerFilter(testCaseScreen));
 
@@ -421,5 +452,4 @@ static void SearchBarOnTextChanged(object sender, TextChangedEventArgs textChang
 			cases.FilterIssues(filter);
 		}
 	}
-
 }