fix: clean up tests

Author: egil

tests/bunit.testassets/XunitExtensions/RepeatAttribute.cs

@@ -0,0 +1,29 @@
+using System.Reflection;
+using Xunit.Sdk;
+
+namespace Xunit;
+
+public sealed class RepeatAttribute : DataAttribute
+{
+	public int Count { get; }
+
+	public RepeatAttribute(int count)
+	{
+		if (count < 1)
+		{
+			throw new ArgumentOutOfRangeException(
+				paramName: nameof(count),
+				message: "Repeat count must be greater than 0.");
+		}
+
+		Count = count;
+	}
+
+	public override IEnumerable<object[]> GetData(MethodInfo testMethod)
+	{
+		for (int count = 1; count <= Count; count++)
+		{
+			yield return new object[] { count };
+		}
+	}
+}

tests/bunit.web.tests/BlazorE2E/ComponentRenderingTest.cs

@@ -674,7 +674,7 @@ public void CanHandleRemovedParentObjects_Sync()
 
 		cut.Find("button").Click();
 
-		cut.WaitForStateAsync(() => !cut.FindAll("div").Any());
+		cut.WaitForState(() => !cut.FindAll("div").Any());
 		cut.FindAll("div").Count.ShouldBe(0);
 	}
 

tests/bunit.web.tests/EventDispatchExtensions/GeneralEventDispatchExtensionsTest.cs

@@ -1,13 +1,19 @@
 using AngleSharp;
 using AngleSharp.Dom;
 using Bunit.Rendering;
+using Xunit.Abstractions;
 
 namespace Bunit;
 
 public class GeneralEventDispatchExtensionsTest : EventDispatchExtensionsTest<EventArgs>
 {
 	protected override string ElementName => "p";
 
+	public GeneralEventDispatchExtensionsTest(ITestOutputHelper outputHelper)
+	{
+		Services.AddXunitLogger(outputHelper);
+	}
+
 	[Theory(DisplayName = "General events are raised correctly through helpers")]
 	[MemberData(nameof(GetEventHelperMethods), typeof(GeneralEventDispatchExtensions))]
 	public void CanRaiseEvents(MethodInfo helper)
@@ -314,16 +320,13 @@ public void Test309(string submitElementSelector)
 		cut.Instance.Clicked.ShouldBeTrue();
 	}
 
-	public static IEnumerable<object[]> GetTenNumbers() => Enumerable.Range(0, 10)
-		.Select(i => new object[] { i });
-
 	// Runs the test multiple times to trigger the race condition
 	// reliably.
 	[SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Needed to trigger multiple reruns of test.")]
 	[Theory(DisplayName = "TriggerEventAsync avoids race condition with DOM tree updates")]
-	[MemberData(nameof(GetTenNumbers))]
+	[Repeat(10)]
 	[Trait("Category", "async")]
-	public async Task Test400(int i)
+	public async Task Test400(int repeatCount)
 	{
 		var cut = RenderComponent<CounterComponentDynamic>();
 
@@ -338,9 +341,9 @@ public async Task Test400(int i)
 	// reliably.
 	[SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Needed to trigger multiple reruns of test.")]
 	[Theory(DisplayName = "TriggerEventAsync avoids race condition with DOM tree updates")]
-	[MemberData(nameof(GetTenNumbers))]
-	[Trait("Category", "sync")]
-	public async Task Test400_Sync(int i)
+    [Repeat(10)]
+    [Trait("Category", "sync")]
+	public async Task Test400_Sync(int repeatCount)
 	{
 		var cut = RenderComponent<CounterComponentDynamic>();
 

tests/bunit.web.tests/Extensions/WaitForHelpers/RenderedFragmentWaitForElementsHelperExtensions.Async.Test.cs

@@ -5,7 +5,9 @@ namespace Bunit.Extensions.WaitForHelpers;
 
 public class RenderedFragmentWaitForElementsHelperExtensionsAsyncTest : TestContext
 {
-	public RenderedFragmentWaitForElementsHelperExtensionsAsyncTest(ITestOutputHelper testOutput)
+    private readonly static TimeSpan WaitForTestTimeout = TimeSpan.FromMilliseconds(5);
+
+    public RenderedFragmentWaitForElementsHelperExtensionsAsyncTest(ITestOutputHelper testOutput)
 	{
 		Services.AddXunitLogger(testOutput);
 	}
@@ -29,7 +31,7 @@ public async Task Test002()
 		var cut = RenderComponent<DelayRenderFragment>();
 
 		var expected = await Should.ThrowAsync<WaitForFailedException>(async () =>
-			await cut.WaitForElementAsync("#notHereElm", TimeSpan.FromMilliseconds(10)));
+			await cut.WaitForElementAsync("#notHereElm", WaitForTestTimeout));
 
 		expected.Message.ShouldStartWith(WaitForElementHelper.TimeoutBeforeFoundMessage);
 	}
@@ -53,7 +55,7 @@ public async Task Test022()
 		var cut = RenderComponent<DelayRenderFragment>();
 
 		var expected = await Should.ThrowAsync<WaitForFailedException>(async () =>
-			await cut.WaitForElementsAsync("#notHereElm", TimeSpan.FromMilliseconds(30)));
+			await cut.WaitForElementsAsync("#notHereElm", WaitForTestTimeout));
 
 		expected.Message.ShouldStartWith(WaitForElementsHelper.TimeoutBeforeFoundMessage);
 		expected.InnerException.ShouldBeNull();
@@ -66,7 +68,7 @@ public async Task Test023()
 		var cut = RenderComponent<DelayRenderFragment>();
 
 		var expected = await Should.ThrowAsync<WaitForFailedException>(async () =>
-			await cut.WaitForElementsAsync("#notHereElm", 2, TimeSpan.FromMilliseconds(30)));
+			await cut.WaitForElementsAsync("#notHereElm", 2, WaitForTestTimeout));
 
 		expected.Message.ShouldStartWith(string.Format(CultureInfo.InvariantCulture, WaitForElementsHelper.TimeoutBeforeFoundWithCountMessage, 2));
 		expected.InnerException.ShouldBeNull();

tests/bunit.web.tests/Extensions/WaitForHelpers/RenderedFragmentWaitForElementsHelperExtensionsTest.cs

@@ -5,6 +5,8 @@ namespace Bunit.Extensions.WaitForHelpers;
 
 public class RenderedFragmentWaitForElementsHelperExtensionsTest : TestContext
 {
+	private readonly static TimeSpan WaitForTestTimeout = TimeSpan.FromMilliseconds(5);
+
 	public RenderedFragmentWaitForElementsHelperExtensionsTest(ITestOutputHelper testOutput)
 	{
 		Services.AddXunitLogger(testOutput);
@@ -29,7 +31,7 @@ public void Test002()
 		var cut = RenderComponent<DelayRenderFragment>();
 
 		var expected = Should.Throw<WaitForFailedException>(() =>
-			cut.WaitForElement("#notHereElm", TimeSpan.FromMilliseconds(10)));
+			cut.WaitForElement("#notHereElm", WaitForTestTimeout));
 
 		expected.Message.ShouldStartWith(WaitForElementHelper.TimeoutBeforeFoundMessage);
 	}
@@ -53,7 +55,7 @@ public void Test022()
 		var cut = RenderComponent<DelayRenderFragment>();
 
 		var expected = Should.Throw<WaitForFailedException>(() =>
-			cut.WaitForElements("#notHereElm", TimeSpan.FromMilliseconds(30)));
+			cut.WaitForElements("#notHereElm", WaitForTestTimeout));
 
 		expected.Message.ShouldStartWith(WaitForElementsHelper.TimeoutBeforeFoundMessage);
 		expected.InnerException.ShouldBeNull();
@@ -66,7 +68,7 @@ public void Test023()
 		var cut = RenderComponent<DelayRenderFragment>();
 
 		var expected = Should.Throw<WaitForFailedException>(() =>
-			cut.WaitForElements("#notHereElm", 2, TimeSpan.FromMilliseconds(30)));
+			cut.WaitForElements("#notHereElm", 2, WaitForTestTimeout));
 
 		expected.Message.ShouldStartWith(string.Format(CultureInfo.InvariantCulture, WaitForElementsHelper.TimeoutBeforeFoundWithCountMessage, 2));
 		expected.InnerException.ShouldBeNull();