Maybe a solution to #118 - Attemting to add more waiting to the Dispa…

…tchEventAsync method
bUnit-dev · May 3, 2020 · 0413ecf · 0413ecf
1 parent f4ac386
commit 0413ecf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/src/bunit.core/Rendering/TestRenderer.cs b/src/bunit.core/Rendering/TestRenderer.cs
@@ -84,17 +84,17 @@ public Task<int> RenderFragment(RenderFragment renderFragment)
 		}
 
 		/// <inheritdoc/>
-		public new Task DispatchEventAsync(ulong eventHandlerId, EventFieldInfo fieldInfo, EventArgs eventArgs)
+		public new async Task DispatchEventAsync(ulong eventHandlerId, EventFieldInfo fieldInfo, EventArgs eventArgs)
 		{
 			if (fieldInfo is null)
 				throw new ArgumentNullException(nameof(fieldInfo));
 			_logger.LogDebug(new EventId(1, nameof(DispatchEventAsync)), $"Starting trigger of '{fieldInfo.FieldValue}'");
 
-			var task = Dispatcher.InvokeAsync(() =>
+			await Dispatcher.InvokeAsync(async () =>
 			{
 				try
 				{
-					return base.DispatchEventAsync(eventHandlerId, fieldInfo, eventArgs);
+					await base.DispatchEventAsync(eventHandlerId, fieldInfo, eventArgs);
 				}
 				catch (Exception e)
 				{
@@ -106,7 +106,6 @@ public Task<int> RenderFragment(RenderFragment renderFragment)
 			AssertNoUnhandledExceptions();
 
 			_logger.LogDebug(new EventId(1, nameof(DispatchEventAsync)), $"Finished trigger of '{fieldInfo.FieldValue}'");
-			return task;
 		}
 
 		/// <inheritdoc/>

diff --git a/src/bunit.web.tests/Rendering/RenderWaitingHelperExtensionsTest.cs b/src/bunit.web.tests/Rendering/RenderWaitingHelperExtensionsTest.cs
@@ -152,11 +152,12 @@ public void Test013()
 			expected.InnerException.ShouldBeOfType<InvalidOperationException>()
 				.Message.ShouldBe(expectedInnerMessage);
 		}
-
+		
 		[Fact(DisplayName = "WaitForState can wait for multiple renders and changes to occur")]
 		public void Test100()
 		{
 			_testOutput.WriteLine($"INIT TEST100: {Thread.GetCurrentProcessorId()} - {Thread.CurrentThread.ManagedThreadId}");
+
 			// Initial state is stopped
 			var cut = RenderComponent<TwoRendersTwoChanges>();
 			var stateElement = cut.Find("#state");
@@ -170,8 +171,10 @@ public void Test100()
 			// This click causes two renders, thus something is needed to await here.
 			cut.Find("#tock").Click();
 			_testOutput.WriteLine($"BEFORE WAIT FOR STATE TEST100: {Thread.GetCurrentProcessorId()} - {Thread.CurrentThread.ManagedThreadId}");
+
 			cut.WaitForState(() => cut.Find("#state").TextContent == "Stopped");
 			_testOutput.WriteLine($"AFTER WAIT FOR STATE TEST100: {Thread.GetCurrentProcessorId()} - {Thread.CurrentThread.ManagedThreadId}");
+
 			cut.Find("#state").TextContent.ShouldBe("Stopped");
 			_testOutput.WriteLine($"END TEST100: {Thread.GetCurrentProcessorId()} - {Thread.CurrentThread.ManagedThreadId}");
 		}

diff --git a/src/bunit.web/Rendering/Internal/Htmlizer.cs b/src/bunit.web/Rendering/Internal/Htmlizer.cs
@@ -10,6 +10,10 @@
 
 namespace Bunit
 {
+	/// <summary>
+	/// This file is based on
+	/// https://source.dot.net/#Microsoft.AspNetCore.Mvc.ViewFeatures/RazorComponents/HtmlRenderer.cs
+	/// </summary>
 	[SuppressMessage("Usage", "BL0006:Do not use RenderTree types", Justification = "<Pending>")]
     internal class Htmlizer
     {

diff --git a/src/bunit.web/Rendering/RenderedFragment.cs b/src/bunit.web/Rendering/RenderedFragment.cs
@@ -45,7 +45,10 @@ public string Markup
 			get
 			{
 				if (_latestRenderMarkup is null)
+				{
+					// TODO: Htmlizer can throw... should we handle that here?
 					_latestRenderMarkup = Htmlizer.GetHtml(Renderer, ComponentId);
+				}
 				return _latestRenderMarkup;
 			}
 		}