Even more deterministic.

Author: ilonatommy

src/Components/Components/test/NavigationManagerTest.cs

@@ -896,10 +896,10 @@ public async Task OnNavigateToCallback_WhenThrows_ShouldBeHandledGracefully()
         var uri = "scheme://host/test";
         var testNavManager = new TestNavigationManagerWithExceptionHandling(baseUri);
         var expectedException = new InvalidOperationException("Test exception from OnNavigateTo");
-        var tcs = new TaskCompletionSource();
+        var exceptionHandledTcs = new TaskCompletionSource();
 
         // First test: Initialize with a callback that throws exceptions
-        testNavManager.Initialize(baseUri, uri, uri => testNavManager.GetErrorHandledTask(ThrowingMethod(uri)));
+        testNavManager.Initialize(baseUri, uri, uri => testNavManager.GetErrorHandledTask(ThrowingMethod(uri), exceptionHandledTcs));
 
         // Act & Assert
         // Verify that the wrapped callback handles the exception gracefully
@@ -908,23 +908,16 @@ public async Task OnNavigateToCallback_WhenThrows_ShouldBeHandledGracefully()
          // Should be null because the exception was handled gracefully
         Assert.Null(wrappedException);
 
-        await tcs.Task.WaitAsync(Timeout);
+        await exceptionHandledTcs.Task;
 
         // Verify that the exception was logged
         Assert.Single(testNavManager.HandledExceptions);
         Assert.Same(expectedException, testNavManager.HandledExceptions[0]);
 
         async Task ThrowingMethod(string param)
         {
-            try
-            {
-                await Task.Yield();
-                throw expectedException;
-            }
-            finally
-            {
-                tcs.SetResult();
-            }
+            await Task.Yield();
+            throw expectedException;
         }
 #nullable restore
     }
@@ -1017,7 +1010,7 @@ protected override void NavigateToCore(string uri, bool forceLoad)
             }
         }
 
-        public async Task GetErrorHandledTask(Task taskToHandle)
+        public async Task GetErrorHandledTask(Task taskToHandle, TaskCompletionSource completionSource = null)
         {
             try
             {
@@ -1027,6 +1020,10 @@ public async Task GetErrorHandledTask(Task taskToHandle)
             {
                 HandledExceptions.Add(ex);
             }
+            finally
+            {
+                completionSource?.SetResult();
+            }
         }
     }
 }