Moved InvokeAsync to IRenderedFragmentBase. Changed Timeout in RazorTestBase to a TimeSpan.

Author: egil

src/bunit.core.tests/ComponentParameterBuilderTests.cs

@@ -386,13 +386,9 @@ public void Test104()
 		}
 
 		private static ComponentParameterBuilder<AllTypesOfParams<string>> CreateSut()
-		{
-			return CreateSut<AllTypesOfParams<string>>();
-		}
+			=> CreateSut<AllTypesOfParams<string>>();
 
-		private static ComponentParameterBuilder<TComponent> CreateSut<TComponent>() where TComponent : class, IComponent
-		{
-			return new ComponentParameterBuilder<TComponent>();
-		}
+		private static ComponentParameterBuilder<TComponent> CreateSut<TComponent>() where TComponent : IComponent
+			=> new ComponentParameterBuilder<TComponent>();
 	}
 }

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

@@ -33,7 +33,7 @@ public async Task Test001()
 			handler.ReceivedEvents.Count.ShouldBe(1);
 
 			// Act #2
-			await sut.InvokeAsync(() => cut.Component.SetParametersAsync(ParameterView.Empty));
+			await sut.Dispatcher.InvokeAsync(() => cut.Component.SetParametersAsync(ParameterView.Empty));
 
 			// Assert #2
 			handler.ReceivedEvents.Count.ShouldBe(2);

src/bunit.core/IRenderedFragmentBase.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Threading.Tasks;
+using Bunit.Rendering;
 
 namespace Bunit
 {
@@ -26,5 +28,12 @@ public interface IRenderedFragmentBase
 		/// Gets the <see cref="IServiceProvider"/> used when rendering the component.
 		/// </summary>
 		IServiceProvider Services { get; }
+		
+		/// <summary>
+		/// Invokes the given <paramref name="callback"/> in the context of the associated <see cref="ITestRenderer"/>.
+		/// </summary>
+		/// <param name="callback"></param>
+		/// <returns>A <see cref="Task"/> that will be completed when the action has finished executing.</returns>
+		Task InvokeAsync(Action callback);
 	}
 }

src/bunit.core/RazorTesting/RazorTestBase.cs

@@ -33,7 +33,7 @@ public abstract class RazorTestBase : TestContextBase, ITestContext, IComponent
 		/// <summary>
 		/// Gets or sets the timeout of the test, in milliseconds; if zero or negative, means the test case has no timeout.
 		/// </summary>
-		[Parameter] public virtual int Timeout { get; set; } = 0;
+		[Parameter] public virtual TimeSpan? Timeout { get; set; }
 
 		/// <summary>
 		/// Run the test logic of the <see cref="RazorTestBase"/>.
@@ -62,7 +62,7 @@ public virtual Task SetParametersAsync(ParameterView parameters)
 		{
 			Skip = parameters.GetValueOrDefault<string>(nameof(Skip));
 			Description = parameters.GetValueOrDefault<string>(nameof(Description));
-			Timeout = parameters.GetValueOrDefault<int>(nameof(Timeout));
+			Timeout = parameters.GetValueOrDefault<TimeSpan>(nameof(Timeout));
 			return Task.CompletedTask;
 		}
 

src/bunit.core/Rendering/ITestRenderer.cs

@@ -18,13 +18,12 @@ public interface ITestRenderer : IRenderEventProducer
 		/// </summary>
 		Dispatcher Dispatcher { get; }
 
-		/// <summary>
-		/// Dispatches an callback in the context of the renderer synchronously and 
-		/// asserts no errors happened during dispatch
-		/// </summary>
-		/// <param name="callback"></param>
-		/// <returns>A task that completes when the action finishes its invocation.</returns>
-		Task InvokeAsync(Action callback);
+		///// <summary>
+		///// Invokes the given <paramref name="callback"/> in the context of this <see cref="ITestRenderer"/>.
+		///// </summary>
+		///// <param name="callback"></param>
+		///// <returns>A <see cref="Task"/> that will be completed when the action has finished executing.</returns>
+		//Task InvokeAsync(Action callback);
 
 		/// <summary>
 		/// Instantiates and renders the component of type <typeparamref name="TComponent"/>.

src/bunit.core/Rendering/TestRenderer.cs

@@ -114,12 +114,6 @@ public int RenderFragment(RenderFragment renderFragment)
 			return result;
 		}
 
-		/// <inheritdoc/>
-		public Task InvokeAsync(Action callback)
-		{
-			return Dispatcher.InvokeAsync(callback);
-		}
-
 		private int RenderFragmentInsideWrapper(RenderFragment renderFragment)
 		{
 			var wrapper = new WrapperComponent(renderFragment);

src/bunit.web/Rendering/RenderedComponent.cs

@@ -22,7 +22,7 @@ public RenderedComponent(IServiceProvider services, int componentId, TComponent
 		/// <inheritdoc/>
 		public void SetParametersAndRender(ParameterView parameters)
 		{
-			Renderer.InvokeAsync(() =>
+			InvokeAsync(() =>
 			{
 				Instance.SetParametersAsync(parameters);
 			});

src/bunit.web/Rendering/RenderedFragment.cs

@@ -129,6 +129,9 @@ public IReadOnlyList<IDiff> GetChangesSinceFirstRender()
 			return Nodes.CompareTo(_firstRenderNodes);
 		}
 
+		/// <inheritdoc/>
+		public Task InvokeAsync(Action callback) => Renderer.Dispatcher.InvokeAsync(callback);
+
 		private string RetrieveLatestMarkupFromRenderer() => Htmlizer.GetHtml(Renderer, ComponentId);
 
 		Task IRenderEventHandler.Handle(RenderEvent renderEvent)

src/bunit.web/TestContext.cs

@@ -38,7 +38,7 @@ public IRenderedComponent<TComponent> RenderComponent<TComponent>(params Compone
 		/// <typeparam name="TComponent">Type of the component to render</typeparam>
 		/// <param name="parameterBuilder">The ComponentParameterBuilder action to add type safe parameters to pass to the component when it is rendered</param>
 		/// <returns>The rendered <typeparamref name="TComponent"/></returns>
-		public virtual IRenderedComponent<TComponent> RenderComponent<TComponent>(Action<ComponentParameterBuilder<TComponent>> parameterBuilder) where TComponent : class, IComponent
+		public virtual IRenderedComponent<TComponent> RenderComponent<TComponent>(Action<ComponentParameterBuilder<TComponent>> parameterBuilder) where TComponent : IComponent
 		{
 			if (parameterBuilder is null)
 				throw new ArgumentNullException(nameof(parameterBuilder));

src/bunit.xunit.tests/RazorTesting/RazorTestDiscovererTest.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Threading;
 
 using Bunit.SampleComponents;
@@ -77,5 +78,18 @@ public void Test004()
 				x => x.DisplayName.ShouldBe(nameof(FixturesWithoutDescription.AsyncTest))
 			);
 		}
+
+		[Fact(DisplayName = "Timeout is set correctly in test case")]
+		public void Test005()
+		{
+			var discoverer = new RazorTestDiscoverer(_messageBus);
+			var testMethod = Mocks.TestMethod(typeof(TimeoutRazorComponent), nameof(TestComponentBase.RazorTests));
+
+			var testCases = discoverer.Discover(_options, testMethod, _attribute);
+
+			var actualTimeout = testCases.Single().Timeout;
+
+			TimeSpan.FromMilliseconds(actualTimeout).ShouldBe(TimeoutRazorComponent.TIMEOUT);
+		}
 	}
 }