fix: TestRenderer resets UnhandledException together with capturedUnhandledException

Author: egil

src/bunit.core/Rendering/TestRenderer.cs

@@ -76,6 +76,8 @@ public Task DispatchEventAsync(
 
 		var result = Dispatcher.InvokeAsync(() =>
 		{
+			ResetUnhandledException();
+
 			try
 			{
 				return base.DispatchEventAsync(eventHandlerId, fieldInfo, eventArgs);
@@ -127,6 +129,8 @@ public void DisposeComponents()
 		// will only work on IDisposable
 		var disposeTask = Dispatcher.InvokeAsync(() =>
 		{
+			ResetUnhandledException();
+
 			foreach (var root in rootComponents)
 			{
 				root.Detach();
@@ -142,20 +146,6 @@ public void DisposeComponents()
 		AssertNoUnhandledExceptions();
 	}
 
-	/// <inheritdoc/>
-	protected override void HandleException(Exception exception)
-	{
-		capturedUnhandledException = exception;
-
-		logger.LogUnhandledException(capturedUnhandledException);
-
-		if (!unhandledExceptionTsc.TrySetResult(capturedUnhandledException))
-		{
-			unhandledExceptionTsc = new TaskCompletionSource<Exception>();
-			unhandledExceptionTsc.SetResult(capturedUnhandledException);
-		}
-	}
-
 	/// <inheritdoc/>
 	protected override Task UpdateDisplayAsync(in RenderBatch renderBatch)
 	{
@@ -219,10 +209,10 @@ protected override void Dispose(bool disposing)
 	private TResult Render<TResult>(RenderFragment renderFragment, Func<int, TResult> activator)
 		where TResult : IRenderedFragmentBase
 	{
-		ResetUnhandledException();
-
 		var renderTask = Dispatcher.InvokeAsync(() =>
 		{
+			ResetUnhandledException();
+
 			var root = new RootComponent(renderFragment);
 			var rootComponentId = AssignRootComponentId(root);
 			var result = activator(rootComponentId);
@@ -350,7 +340,30 @@ private ArrayRange<RenderTreeFrame> GetOrLoadRenderTreeFrame(RenderTreeFrameDict
 		return framesCollection[componentId];
 	}
 
-	private void ResetUnhandledException() => capturedUnhandledException = null;
+	/// <inheritdoc/>
+	protected override void HandleException(Exception exception)
+	{
+		if (exception is null)
+			return;
+
+		logger.LogUnhandledException(exception);
+
+		capturedUnhandledException = exception;
+
+		if (!unhandledExceptionTsc.TrySetResult(capturedUnhandledException))
+		{
+			unhandledExceptionTsc = new TaskCompletionSource<Exception>();
+			unhandledExceptionTsc.SetResult(capturedUnhandledException);
+		}
+	}
+
+	private void ResetUnhandledException()
+	{
+		capturedUnhandledException = null;
+
+		if (unhandledExceptionTsc.Task.IsCompleted)
+			unhandledExceptionTsc = new TaskCompletionSource<Exception>();
+	}
 
 	private void AssertNoUnhandledExceptions()
 	{

tests/bunit.core.tests/Rendering/TestRendererTest.cs

@@ -391,8 +391,6 @@ public async Task Test202()
 		RenderComponent<AsyncOperationThrows>(ps => ps.Add(p => p.Awaitable, tsc2.Task));
 		tsc2.SetException(secondException);
 
-		await Task.Delay(50);
-
 		var secondExceptionReported = await Renderer.UnhandledException;
 		secondExceptionReported.ShouldBe(secondException);
 		firstExceptionReported.ShouldNotBe(secondException);