[testing] Enable shell tests back on net9.0

dotnet · Jul 11, 2024 · d32718c · d32718c
1 parent facb5ef
commit d32718c
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 44 deletions.
diff --git a/src/Controls/tests/Core.UnitTests/ShellLifeCycleTests.cs b/src/Controls/tests/Core.UnitTests/ShellLifeCycleTests.cs
@@ -164,35 +164,35 @@ public async Task EnsureOnAppearingFiresForLastPageOnly()
 			Assert.True(page.Appearing);
 		}
 
-		// [Fact]
-		// public async Task EnsureOnAppearingFiresForLastPageOnlyAbsoluteRoute()
-		// {
-		// 	Shell shell = new TestShell();
-		// 	LifeCyclePage shellContentPage = new LifeCyclePage();
-		// 	shell.Items.Add(CreateShellItem());
-		// 	shell.Items.Add(CreateShellItem(page: shellContentPage, shellItemRoute: "ShellItemRoute"));
-		// 	await shell.GoToAsync("///ShellItemRoute/LifeCyclePage/LifeCyclePage");
-
-		// 	var page = (LifeCyclePage)shell.GetVisiblePage();
-		// 	var nonVisiblePage = (LifeCyclePage)shell.Navigation.NavigationStack[1];
-
-		// 	Assert.False(shellContentPage.Appearing);
-		// 	Assert.False(nonVisiblePage.Appearing);
-		// 	await page.AppearingTask.ConfigureAwait(false);
-		// 	Assert.True(page.Appearing);
-		// }
-
-
-		// [Fact]
-		// public async Task EnsureOnAppearingFiresForPushedPage()
-		// {
-		// 	Shell shell = new TestShell();
-		// 	shell.Items.Add(CreateShellItem());
-		// 	await shell.Navigation.PushAsync(new LifeCyclePage());
-		// 	var page = (LifeCyclePage)shell.GetVisiblePage();
-		// 	Assert.True(page.Appearing);
-		// 	Assert.True(page.ParentSet);
-		// }
+		[Fact]
+		public async Task EnsureOnAppearingFiresForLastPageOnlyAbsoluteRoute()
+		{
+			Shell shell = new TestShell();
+			LifeCyclePage shellContentPage = new LifeCyclePage();
+			shell.Items.Add(CreateShellItem());
+			shell.Items.Add(CreateShellItem(page: shellContentPage, shellItemRoute: "ShellItemRoute"));
+			await shell.GoToAsync("///ShellItemRoute/LifeCyclePage/LifeCyclePage");
+
+			var page = (LifeCyclePage)shell.GetVisiblePage();
+			var nonVisiblePage = (LifeCyclePage)shell.Navigation.NavigationStack[1];
+
+			Assert.False(shellContentPage.Appearing);
+			Assert.False(nonVisiblePage.Appearing);
+			await page.AppearingTask.ConfigureAwait(false);
+			Assert.True(page.Appearing);
+		}
+
+
+		[Fact]
+		public async Task EnsureOnAppearingFiresForPushedPage()
+		{
+			Shell shell = new TestShell();
+			shell.Items.Add(CreateShellItem());
+			await shell.Navigation.PushAsync(new LifeCyclePage());
+			var page = (LifeCyclePage)shell.GetVisiblePage();
+			Assert.True(page.Appearing);
+			Assert.True(page.ParentSet);
+		}
 
 		[Fact]
 		public async Task NavigatedFiresAfterContentIsCreatedWhenUsingTemplate()

diff --git a/src/Controls/tests/Core.UnitTests/ShellNavigatedArgsTests.cs b/src/Controls/tests/Core.UnitTests/ShellNavigatedArgsTests.cs
@@ -148,23 +148,23 @@ await shell.TestNavigationArgs(ShellNavigationSource.Insert,
 		}
 
 
-		// [Fact]
-		// public async Task InsertPageFromNavigationSetsCorrectNavigationSource()
-		// {
-		// 	Routing.RegisterRoute("pagemiddle", typeof(ContentPage));
-		// 	Routing.RegisterRoute("page", typeof(ContentPage));
-		// 	var shell = new TestShell(
-		// 		CreateShellItem(shellItemRoute: "item")
-		// 	);
+		[Fact]
+		public async Task InsertPageFromNavigationSetsCorrectNavigationSource()
+		{
+			Routing.RegisterRoute("pagemiddle", typeof(ContentPage));
+			Routing.RegisterRoute("page", typeof(ContentPage));
+			var shell = new TestShell(
+				CreateShellItem(shellItemRoute: "item")
+			);
 
-		// 	await shell.GoToAsync("//item/page");
-		// 	ContentPage contentPage = new ContentPage();
-		// 	Routing.SetRoute(contentPage, "pagemiddle");
-		// 	shell.Navigation.InsertPageBefore(contentPage, shell.Navigation.NavigationStack.Last());
+			await shell.GoToAsync("//item/page");
+			ContentPage contentPage = new ContentPage();
+			Routing.SetRoute(contentPage, "pagemiddle");
+			shell.Navigation.InsertPageBefore(contentPage, shell.Navigation.NavigationStack.Last());
 
-		// 	await shell.TestNavigationArgs(ShellNavigationSource.Insert,
-		// 		"//item/page", "//item/pagemiddle/page");
-		// }
+			await shell.TestNavigationArgs(ShellNavigationSource.Insert,
+				"//item/page", "//item/pagemiddle/page");
+		}
 
 
 		[Fact]