Moved xunit specific TestComponentBase to xunit project

egil · egil · commit 1f6e9bc4d1d8 · 2020-04-21T23:11:02.000Z
diff --git a/src/bunit.core/RazorTesting/RazorTest.cs b/src/bunit.core/RazorTesting/RazorTest.cs
@@ -24,6 +24,11 @@ public abstract class RazorTest : TestContextBase, ITestContext, IComponent
 		/// </summary>
 		[Parameter] public string? Skip { get; set; }
 
+		/// <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 int Timeout { get; set; } = 0;
+
 		/// <summary>
 		/// Run the test logic of the <see cref="RazorTest"/>.
 		/// </summary>
diff --git a/src/bunit.core/TestContextBase.cs b/src/bunit.core/TestContextBase.cs
@@ -26,8 +26,7 @@ public ITestRenderer Renderer
 		}
 
 		/// <inheritdoc/>
-		public virtual TestServiceProvider Services { get; } = new TestServiceProvider();
-
+		public virtual TestServiceProvider Services { get; }
 		/// <inheritdoc/>
 		public IObservable<RenderEvent> RenderEvents => Renderer.RenderEvents;
 
@@ -36,6 +35,7 @@ public ITestRenderer Renderer
 		/// </summary>
 		public TestContextBase()
 		{
+			Services = new TestServiceProvider();
 			Services.AddSingleton<ITestRenderer>(srv => new TestRenderer(srv, srv.GetService<ILoggerFactory>() ?? NullLoggerFactory.Instance));
 		}
 
diff --git a/src/bunit.web.tests/Components/TestComponentBaseTest/CorrectImplicitRazorTestContextAvailable.razor b/src/bunit.web.tests/Components/TestComponentBaseTest/CorrectImplicitRazorTestContextAvailable.razor
@@ -75,17 +75,6 @@
     }
 }
 
-@code {
-    [Fact(DisplayName = "When running c# only test in razor file, all razor test context specific methods throws")]
-    public void MyTestMethod()
-    {
-        Should.Throw<InvalidOperationException>(() => GetComponentUnderTest());
-        Should.Throw<InvalidOperationException>(() => GetComponentUnderTest<IComponent>());
-        Should.Throw<InvalidOperationException>(() => GetFragment());
-        Should.Throw<InvalidOperationException>(() => GetFragment<IComponent>());
-    }
-}
-
 <SnapshotTest Description="Snapshot tests should have own context" Setup="s => s.Services.AddSingleton<ITestDep>(new Dep3())">
     <TestInput><SimpleWithDeps /></TestInput>
     <ExpectedOutput><p>@nameof(Dep3)</p></ExpectedOutput>
diff --git a/src/bunit.web.tests/Components/TestComponentBaseTest/GettingCutAndFragmentFromRazorTestContextTest.razor b/src/bunit.web.tests/Components/TestComponentBaseTest/GettingCutAndFragmentFromRazorTestContextTest.razor
@@ -12,23 +12,23 @@
 @code{
 	void CallingGetMultipleTimesReturnsSameInstance(Fixture f)
 	{
-		var cut1 = GetComponentUnderTest<Wrapper>();
-		var cut2 = GetComponentUnderTest<Wrapper>();
+		var cut1 = f.GetComponentUnderTest<Wrapper>();
+		var cut2 = f.GetComponentUnderTest<Wrapper>();
 
 		Assert.True(ReferenceEquals(cut1, cut2), "Getting CUT multiple times should return the same instance");
 		Assert.Equal("CUT", cut1.Markup);
 
-		var firstFragmentNoId1 = GetFragment();
-		var firstFragmentId1 = GetFragment("first");
-		var firstFragmentNoId2 = GetFragment();
-		var firstFragmentId2 = GetFragment("first");
+		var firstFragmentNoId1 = f.GetFragment();
+		var firstFragmentId1 = f.GetFragment("first");
+		var firstFragmentNoId2 = f.GetFragment();
+		var firstFragmentId2 = f.GetFragment("first");
 		Assert.True(ReferenceEquals(firstFragmentNoId1, firstFragmentId1), "Getting first fragment with and without id should return the same instance");
 		Assert.True(ReferenceEquals(firstFragmentNoId1, firstFragmentNoId2), "Getting first fragment multiple times should return the same instance");
 		Assert.True(ReferenceEquals(firstFragmentId1, firstFragmentId2), "Getting first fragment multiple times should return the same instance");
 		Assert.Equal("first", firstFragmentNoId1.Markup);
 
-		var secondFragmentId1 = GetFragment<Wrapper>("second");
-		var secondFragmentId2 = GetFragment<Wrapper>("second");
+		var secondFragmentId1 = f.GetFragment<Wrapper>("second");
+		var secondFragmentId2 = f.GetFragment<Wrapper>("second");
 
 		Assert.True(ReferenceEquals(secondFragmentId1, secondFragmentId2), "Getting fragment multiple times should return the same instance");
 		Assert.Equal("second", secondFragmentId2.Markup);
@@ -46,15 +46,15 @@
 @code{
 	void CallingGenericGetAfterNonGenericGetThrows(Fixture f)
 	{
-		GetComponentUnderTest();
+		f.GetComponentUnderTest();
 
 		// It should not be possible to call the generic GetComponentUnderTest after the non-generic has been called
-		Assert.Throws<InvalidOperationException>(() => GetComponentUnderTest<Wrapper>());
+		Assert.Throws<InvalidOperationException>(() => f.GetComponentUnderTest<Wrapper>());
 
-		GetFragment();
+		f.GetFragment();
 
 		// It should not be possible to call the generic GetFragment after the non-generic has been called
-		Assert.Throws<InvalidOperationException>(() => GetFragment<Wrapper>());
+		Assert.Throws<InvalidOperationException>(() => f.GetFragment<Wrapper>());
 	}
 }
 
@@ -69,8 +69,8 @@
 @code{
 	void CallingGetCutOrGetFragmentWithWrongGenericTypeThrows(Fixture f)
 	{
-		Assert.Throws<ComponentNotFoundException>(() => GetComponentUnderTest<Simple1>());
-		Assert.Throws<ComponentNotFoundException>(() => GetFragment<Simple1>());
+		Assert.Throws<ComponentNotFoundException>(() => f.GetComponentUnderTest<Simple1>());
+		Assert.Throws<ComponentNotFoundException>(() => f.GetFragment<Simple1>());
 	}
 }
 
@@ -85,9 +85,9 @@
 @code{
 	void CallingGetCutOrGetFragmentWithIncompatibleGenericTypeThrows(Fixture f)
 	{
-		GetComponentUnderTest<Wrapper>();
-		GetFragment<Wrapper>();
-		Assert.Throws<InvalidOperationException>(() => GetComponentUnderTest<Simple1>());
-		Assert.Throws<InvalidOperationException>(() => GetFragment<Simple1>());
+		f.GetComponentUnderTest<Wrapper>();
+		f.GetFragment<Wrapper>();
+		Assert.Throws<InvalidOperationException>(() => f.GetComponentUnderTest<Simple1>());
+		Assert.Throws<InvalidOperationException>(() => f.GetFragment<Simple1>());
 	}
 }
diff --git a/src/bunit.web.tests/Components/TestComponentBaseTest/LifeCycleTrackerTest.razor b/src/bunit.web.tests/Components/TestComponentBaseTest/LifeCycleTrackerTest.razor
@@ -5,20 +5,19 @@
 		<Wrapper>
 			@if (shouldRenderTracker)
 			{
-				<LifeCycleTracker Number="renderTrigger" /> @*@ref="tracker" />*@
+				<LifeCycleTracker Number="renderTrigger" />
 			}
 		</Wrapper>
 	</ComponentUnderTest> 
 </Fixture>
 @code {
 	bool shouldRenderTracker = true;
 	int renderTrigger = 0;
-	//LifeCycleTracker tracker = default!; // set during initial render by framework - should not be null!
 
 	void Test(Fixture fixture)
 	{
-		var cut = GetComponentUnderTest<Wrapper>();
-		var callLog = cut.FindComponent<LifeCycleTracker>().Instance.CallLog;// tracker.CallLog;
+		var cut = fixture.GetComponentUnderTest<Wrapper>();
+		var callLog = cut.FindComponent<LifeCycleTracker>().Instance.CallLog;
 
 		// assert first render called expected methods
 		callLog["SetParametersAsync"].ShouldBe(1);
diff --git a/src/bunit.web.tests/Components/XunitBlazor/Simple.razor b/src/bunit.web.tests/Components/XunitBlazor/Simple.razor
@@ -1,30 +1,29 @@
-@inherits XunitTestComponentBase<Simple>
+@inherits TestComponentBase
 
-<Fixture Test="x => { }" Description="My First Test">
+<Fixture Test="x => { }" Description="My First Fixture Test">
 	<ComponentUnderTest>
 		<Simple1>ASDF</Simple1>
 	</ComponentUnderTest>
 </Fixture>
 
-<Fixture Test="x => { }" Description="My second Test">
+<Fixture Test="x => { }" Description="My Second Fixture Test">
 	<ComponentUnderTest>
 		<Simple1>ASDF</Simple1>
 	</ComponentUnderTest>
 </Fixture>
 
 <SnapshotTest>
-	<TestInput><Simple1></Simple1></TestInput>
-	<ExpectedOutput><h1>asdf</h1></ExpectedOutput>
+	<TestInput><Simple1/></TestInput>
+	<ExpectedOutput><Simple1 /></ExpectedOutput>
 </SnapshotTest>
 
-<Fixture Test="x => { }" Description="My Second Test" Skip="NOT NOW">
+<Fixture Test="x => { }" Description="My Third Fixture Test" Skip="NOT NOW">
 	<ComponentUnderTest>
 		<Simple1>ASDF</Simple1>
 	</ComponentUnderTest>
 </Fixture>
 
-
-<SnapshotTest Description="ASDF" Skip="wwwbb">
+<SnapshotTest Description="Second snapshot test" Skip="wwwbb">
 	<TestInput><Simple1></Simple1></TestInput>
-	<ExpectedOutput><h1>asdf</h1></ExpectedOutput>
+	<ExpectedOutput><h1>a</h1></ExpectedOutput>
 </SnapshotTest>
diff --git a/src/bunit.web.tests/TestComponentBase.cs b/src/bunit.web.tests/TestComponentBase.cs
diff --git a/src/bunit.web.tests/XunitTestComponentBase.cs b/src/bunit.web.tests/XunitTestComponentBase.cs
diff --git a/src/bunit.web/RazorTesting/SnapshotTest.cs b/src/bunit.web/RazorTesting/SnapshotTest.cs
@@ -62,7 +62,7 @@ protected override async Task Run()
 			var diffs = inputNodes.CompareTo(expectedNodes);
 
 			if (diffs.Count > 0)
-				throw new HtmlEqualException(diffs, expectedNodes, inputNodes, Description);
+				throw new HtmlEqualException(diffs, expectedNodes, inputNodes, Description ?? "Snapshot test failed.");
 		}
 
 		/// <inheritdoc/>
diff --git a/src/bunit.xunit/RazorTheoryDiscoverer.cs b/src/bunit.xunit/RazorTheoryDiscoverer.cs
diff --git a/src/bunit.xunit/TestComponentBase.cs b/src/bunit.xunit/TestComponentBase.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Bunit.RazorTesting;
+using Bunit.Rendering;
+using Bunit.Rendering.RenderEvents;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Xunit;
+
+namespace Bunit
+{
+	/// <summary>
+	/// Base test class/test runner, that runs Fixtures defined in razor files.
+	/// </summary>
+	public abstract class TestComponentBase
+	{
+		private static readonly ServiceProvider ServiceProvider = new ServiceCollection().BuildServiceProvider();
+		private readonly TestComponentRenderer RazorRenderer = new TestComponentRenderer(ServiceProvider, NullLoggerFactory.Instance);
+
+		/// <summary>
+		/// Renders the component to the supplied <see cref="RenderTreeBuilder"/>.
+		/// </summary>
+		/// <param name="builder">The builder to use for rendering.</param>
+		protected virtual void BuildRenderTree(RenderTreeBuilder builder) { }
+
+		/// <summary>
+		/// Called by the XUnit test runner. Finds all Fixture components
+		/// in the file and runs their associated tests.
+		/// </summary>
+		[Fact(DisplayName = "Razor test runner")]
+		public async Task RazorTest()
+		{
+			var tests = await RazorRenderer
+				.RenderAndGetTestComponents<RazorTest>(BuildRenderTree)
+				.ConfigureAwait(false);
+
+			foreach (var test in tests.Where(x => x.Skip is null))
+			{
+				await test.RunTest().ConfigureAwait(false);
+			}
+		}
+	}
+}
diff --git a/src/bunit.xunit/bunit.xunit.csproj b/src/bunit.xunit/bunit.xunit.csproj

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@ public ITestRenderer Renderer`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/// <inheritdoc/>`
`29`		`- public virtual TestServiceProvider Services { get; } = new TestServiceProvider();`
`30`		`-`
	`29`	`+ public virtual TestServiceProvider Services { get; }`
`31`	`30`	`/// <inheritdoc/>`
`32`	`31`	`public IObservable<RenderEvent> RenderEvents => Renderer.RenderEvents;`
`33`	`32`
`@@ -36,6 +35,7 @@ public ITestRenderer Renderer`
`36`	`35`	`/// </summary>`
`37`	`36`	`public TestContextBase()`
`38`	`37`	`{`
	`38`	`+ Services = new TestServiceProvider();`
`39`	`39`	`Services.AddSingleton<ITestRenderer>(srv => new TestRenderer(srv, srv.GetService<ILoggerFactory>() ?? NullLoggerFactory.Instance));`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ protected override async Task Run()`
`62`	`62`	`var diffs = inputNodes.CompareTo(expectedNodes);`
`63`	`63`
`64`	`64`	`if (diffs.Count > 0)`
`65`		`- throw new HtmlEqualException(diffs, expectedNodes, inputNodes, Description);`
	`65`	`+ throw new HtmlEqualException(diffs, expectedNodes, inputNodes, Description ?? "Snapshot test failed.");`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`/// <inheritdoc/>`