Add more tests

Author: captainsafia

src/Components/Components/test/Routing/RouterTest.cs

@@ -10,9 +10,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
-using Moq;
 using Xunit;
-using Microsoft.AspNetCore.Components;
 
 namespace Microsoft.AspNetCore.Components.Test.Routing
 {
@@ -70,6 +68,12 @@ public async Task CanceledFailedOnNavigateAsyncDoesNothing()
                     throw new Exception("This is an uncaught exception.");
                 }
             };
+            var refreshCalled = 0;
+            _renderer.OnUpdateDisplay = (renderBatch) =>
+            {
+                refreshCalled += 1;
+                return;
+            };
             _router.OnNavigateAsync = new EventCallback<NavigationContext>(null, OnNavigateAsync);
 
             // Act
@@ -82,6 +86,7 @@ public async Task CanceledFailedOnNavigateAsyncDoesNothing()
             // Assert that we render the second route component and don't throw an exception
             Assert.Empty(_renderer.HandledExceptions);
             Assert.Equal(2, onNavigateInvoked);
+            Assert.Equal(2, refreshCalled);
         }
 
         [Fact]

src/Components/test/E2ETest/Tests/RoutingTest.cs

@@ -570,14 +570,24 @@ public void OnNavigate_CanRenderUIForExceptions()
         {
             var app = Browser.MountTestComponent<TestRouterWithOnNavigate>();
 
-            // Navigating from one page to another should
-            // cancel the previous OnNavigate Task
             SetUrlViaPushState("/Other");
 
             var errorUiElem = Browser.Exists(By.Id("blazor-error-ui"), TimeSpan.FromSeconds(10));
             Assert.NotNull(errorUiElem);
         }
 
+        [Fact]
+        public void OnNavigate_CanRenderUIForSyncExceptions()
+        {
+            var app = Browser.MountTestComponent<TestRouterWithOnNavigate>();
+
+            // Should capture exception from synchronously thrown
+            SetUrlViaPushState("/WithLazyAssembly");
+
+            var errorUiElem = Browser.Exists(By.Id("blazor-error-ui"), TimeSpan.FromSeconds(10));
+            Assert.NotNull(errorUiElem);
+        }
+
         [Fact]
         public void OnNavigate_DoesNotRenderWhileOnNavigateExecuting()
         {

src/Components/test/testassets/BasicTestApp/RouterTest/TestRouterWithOnNavigate.razor

@@ -26,9 +26,15 @@
         { "LongPage1", new Func<NavigationContext, Task>(TestLoadingPageShows) },
         { "LongPage2", new Func<NavigationContext, Task>(TestOnNavCancel) },
         { "Other", new Func<NavigationContext, Task>(TestOnNavException) },
-        {"WithParameters/name/Abc", new Func<NavigationContext, Task>(TestRefreshHandling)}
+        { "WithLazyAssembly", new Func<NavigationContext, Task>(TestOnNavException) },
+        { "WithParameters/name/Abc", new Func<NavigationContext, Task>(TestRefreshHandling) }
     };
 
+    protected override void OnAfterRender(bool firstRender)
+    {
+        Console.WriteLine("Render triggered...");
+    }
+
     private async Task OnNavigateAsync(NavigationContext args)
     {
         Console.WriteLine($"Running OnNavigate for {args.Path}...");
@@ -56,6 +62,11 @@
         throw new Exception("This is an uncaught exception.");
     }
 
+    public static Task TestOnNavSyncException(NavigationContext args)
+    {
+        throw new Exception("This is an uncaught exception.");
+    }
+
     public static async Task TestRefreshHandling(NavigationContext args)
     {
         await Task.Delay(Timeout.Infinite, args.CancellationToken);