Make methods on IRenderedComponentBase`1 awaitable

JeroenBos · Aug 5, 2020 · d596806 · d596806
1 parent 7b1da56
commit d596806
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 22 deletions.
diff --git a/src/bunit.core.tests/ComponentParameterFactoryTest.cs b/src/bunit.core.tests/ComponentParameterFactoryTest.cs
@@ -65,7 +65,7 @@ public void Test002()
 			instance.ItemTemplate.ShouldBeNull();
 
 			// act - set components params and render
-			cut.SetParametersAndRender(
+			cut.SetParametersAndRenderAsync(
 				("some-unmatched-attribute", "unmatched value"),
 				(nameof(AllTypesOfParams<string>.RegularParam), "some value"),
 				EventCallback(nameof(AllTypesOfParams<string>.NonGenericCallback), () => throw new Exception("NonGenericCallback")),

diff --git a/src/bunit.core/IRenderedComponentBase.cs b/src/bunit.core/IRenderedComponentBase.cs
@@ -34,24 +34,24 @@ public interface IRenderedComponentBase<TComponent> : IRenderedFragmentBase wher
 		/// <summary>
 		/// Render the component under test again.
 		/// </summary>
-		void Render();
+		Task Render();
 
 		/// <summary>
 		/// Render the component under test again with the provided <paramref name="parameters"/>.
 		/// </summary>
 		/// <param name="parameters">Parameters to pass to the component upon rendered</param>
-		void SetParametersAndRender(ParameterView parameters);
+		Task SetParametersAndRenderAsync(ParameterView parameters);
 
 		/// <summary>
 		/// Render the component under test again with the provided <paramref name="parameters"/>.
 		/// </summary>
 		/// <param name="parameters">Parameters to pass to the component upon rendered</param>
-		void SetParametersAndRender(params ComponentParameter[] parameters);
+		Task SetParametersAndRenderAsync(params ComponentParameter[] parameters);
 
 		/// <summary>
 		/// Render the component under test again with the provided parameters from the <paramref name="parameterBuilder"/>.
 		/// </summary>
 		/// <param name="parameterBuilder">An action that receives a <see cref="ComponentParameterBuilder{TComponent}"/>.</param>
-		void SetParametersAndRender(Action<ComponentParameterBuilder<TComponent>> parameterBuilder);
+		Task SetParametersAndRenderAsync(Action<ComponentParameterBuilder<TComponent>> parameterBuilder);
 	}
 }
diff --git a/src/bunit.web.tests/Rendering/Internal/HtmlizerTests.cs b/src/bunit.web.tests/Rendering/Internal/HtmlizerTests.cs
@@ -47,7 +47,7 @@ public void Test003()
 			var cut = RenderComponent<Htmlizer01Component>();
 			cut.Find("button").HasAttribute("blazor:elementreference").ShouldBeTrue();
 
-			cut.SetParametersAndRender(parameters => parameters.Add(p => p.OnClick, (MouseEventArgs e) => { }));
+			cut.SetParametersAndRenderAsync(parameters => parameters.Add(p => p.OnClick, (MouseEventArgs e) => { }));
 
 			cut.Find("button").HasAttribute("blazor:elementreference").ShouldBeTrue();
 		}

diff --git a/src/bunit.web.tests/Rendering/RenderedComponentTest.cs b/src/bunit.web.tests/Rendering/RenderedComponentTest.cs
@@ -25,7 +25,7 @@ public void Test004()
 		{
 			var cut = RenderComponent<Wrapper>(parameters => parameters.AddChildContent("<div>"));
 
-			cut.SetParametersAndRender(parameters => parameters.AddChildContent("<p>"));
+			cut.SetParametersAndRenderAsync(parameters => parameters.AddChildContent("<p>"));
 
 			cut.Find("p").ShouldNotBeNull();
 		}
@@ -36,7 +36,7 @@ public void Test0041()
 		{
 			var cut = RenderComponent<Wrapper>(parameters => parameters.AddChildContent("<div>"));
 
-			cut.SetParametersAndRender(parameters => parameters.AddChildContent("<p>"));
+			cut.SetParametersAndRenderAsync(parameters => parameters.AddChildContent("<p>"));
 
 			cut.Find("p").ShouldNotBeNull();
 		}
@@ -50,8 +50,8 @@ public void Test003()
 			var cut = RenderComponent<AllTypesOfParams<string>>();
 
 			// assert
-			Should.Throw<InvalidOperationException>(() => cut.SetParametersAndRender(ps => ps.Add(p => p.UnnamedCascadingValue, 42)));
-			Should.Throw<InvalidOperationException>(() => cut.SetParametersAndRender(ps => ps.Add(p => p.NamedCascadingValue, 1337)));
+			Should.Throw<InvalidOperationException>(() => cut.SetParametersAndRenderAsync(ps => ps.Add(p => p.UnnamedCascadingValue, 42)));
+			Should.Throw<InvalidOperationException>(() => cut.SetParametersAndRenderAsync(ps => ps.Add(p => p.NamedCascadingValue, 1337)));
 		}
 	}
 }
diff --git a/src/bunit.web.tests/Rendering/RenderedFragmentTest.cs b/src/bunit.web.tests/Rendering/RenderedFragmentTest.cs
@@ -83,7 +83,7 @@ public void Test009()
 
 			cut.Instance.Counter.ShouldBe(1);
 
-			cut.SetParametersAndRender((nameof(ToggleClickHandler.HandleClicks), false));
+			cut.SetParametersAndRenderAsync((nameof(ToggleClickHandler.HandleClicks), false));
 
 			cut.Find("#btn").Click();
 

diff --git a/src/bunit.web/Rendering/RenderedComponent.cs b/src/bunit.web/Rendering/RenderedComponent.cs
@@ -24,33 +24,30 @@ public RenderedComponent(IServiceProvider services, int componentId, TComponent
 		public Task InvokeAsync(Func<Task> callback) => Renderer.Dispatcher.InvokeAsync(callback);
 
 		/// <inheritdoc/>
-		public void Render() => SetParametersAndRender(ParameterView.Empty);
+		public Task Render() => SetParametersAndRenderAsync(ParameterView.Empty);
 
 		/// <inheritdoc/>
-		public void SetParametersAndRender(ParameterView parameters)
+		public Task SetParametersAndRenderAsync(ParameterView parameters)
 		{
-			InvokeAsync(() =>
-			{
-				Instance.SetParametersAsync(parameters);
-			});
+			return InvokeAsync(() => Instance.SetParametersAsync(parameters));
 		}
 
 		/// <inheritdoc/>
-		public void SetParametersAndRender(params ComponentParameter[] parameters)
+		public Task SetParametersAndRenderAsync(params ComponentParameter[] parameters)
 		{
-			SetParametersAndRender(ToParameterView(parameters));
+			return SetParametersAndRenderAsync(ToParameterView(parameters));
 		}
 
 		/// <inheritdoc/>
-		public void SetParametersAndRender(Action<ComponentParameterBuilder<TComponent>> parameterBuilder)
+		public Task SetParametersAndRenderAsync(Action<ComponentParameterBuilder<TComponent>> parameterBuilder)
 		{
 			if (parameterBuilder is null)
 				throw new ArgumentNullException(nameof(parameterBuilder));
 
 			var builder = new ComponentParameterBuilder<TComponent>();
 			parameterBuilder(builder);
 
-			SetParametersAndRender(ToParameterView(builder.Build()));
+			return SetParametersAndRenderAsync(ToParameterView(builder.Build()));
 		}
 
 		private static ParameterView ToParameterView(IReadOnlyList<ComponentParameter> parameters)
@@ -62,7 +59,7 @@ private static ParameterView ToParameterView(IReadOnlyList<ComponentParameter> p
 				foreach (var param in parameters)
 				{
 					if (param.IsCascadingValue)
-						throw new InvalidOperationException($"You cannot provide a new cascading value through the {nameof(SetParametersAndRender)} method.");
+						throw new InvalidOperationException($"You cannot provide a new cascading value through the {nameof(SetParametersAndRenderAsync)} method.");
 					paramDict.Add(param.Name!, param.Value);
 				}
 				parameterView = ParameterView.FromDictionary(paramDict);