Code clean up

src/bunit.core.tests/ComponentParameterBuilderTests.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Threading.Tasks;
-
-using Bunit.Rendering;
 using Bunit.TestAssets.SampleComponents;
 
 using Microsoft.AspNetCore.Components;

src/bunit.core/Rendering/ComponentParameterBuilder.cs → src/bunit.core/ComponentParameterBuilder.cs

@@ -5,12 +5,12 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Threading.Tasks;
-
+using Bunit.Rendering;
 using Microsoft.AspNetCore.Components;
 
 using EC = Microsoft.AspNetCore.Components.EventCallback;
 
-namespace Bunit.Rendering
+namespace Bunit
 {
 	/// <summary>
 	/// A builder to set a value for strongly typed ComponentParameters.

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

@@ -24,11 +24,6 @@ namespace Bunit.BlazorE2E
 	/// </summary>
 	public class ComponentRenderingTest : ComponentTestFixture
 	{
-		public ComponentRenderingTest(ITestOutputHelper output)
-		{
-			Services.AddXunitLogger(output);
-		}
-
 		[Fact]
 		public void CanRenderTextOnlyComponent()
 		{
@@ -605,7 +600,19 @@ public void CanDispatchAsyncWorkToSyncContext()
 
 			cut.Find("#run-async-with-dispatch").Click();
 
-			cut.WaitForAssertion(() => Assert.Equal("First Second Third Fourth Fifth", result.TextContent.Trim()), timeout: TimeSpan.FromSeconds(2));
+			cut.WaitForAssertion(() =>
+			{
+				// In some cases, the original assert wont work, since the sync context might not be idle,
+				// which results in this order: First Third Second Fourth Fifth
+				// Assert.Equal("First Second Third Fourth Fifth", result.TextContent.Trim())
+
+				Assert.Contains("First", result.TextContent);
+				Assert.Contains("Second", result.TextContent);
+				Assert.Contains("Third", result.TextContent);
+				Assert.Contains("Fourth", result.TextContent);
+				Assert.Contains("Fifth", result.TextContent);
+
+			}, timeout: TimeSpan.FromSeconds(2));
 		}
 
 		// Test removed since it does not have any value in this context.

src/bunit.web.tests/ComponentTestFixtureTest.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics.CodeAnalysis;
 
 using Bunit.Mocking.JSInterop;
+using Bunit.Rendering;
 using Bunit.TestAssets.SampleComponents;
 
 using Shouldly;

src/bunit.web/Extensions/Internal/ElementFactory.cs

@@ -4,8 +4,7 @@
 
 namespace Bunit
 {
-	internal sealed class ElementFactory<TElement> : IElementFactory<TElement>
-		where TElement : class, IElement
+	internal sealed class ElementFactory<TElement> : IElementFactory<TElement> where TElement : class, IElement
 	{
 		private readonly IRenderedFragment _testTarget;
 		private readonly string _cssSelector;

src/bunit.web/RazorTesting/Fixture.cs

@@ -5,7 +5,7 @@
 
 using Bunit.Extensions;
 using Bunit.RazorTesting;
-
+using Bunit.Rendering;
 using Microsoft.AspNetCore.Components;
 
 namespace Bunit

src/bunit.web/Rendering/RenderedComponent.cs

@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
 
-using Bunit.Rendering;
-
 using Microsoft.AspNetCore.Components;
 
-namespace Bunit
+namespace Bunit.Rendering
 {
 	/// <inheritdoc/>
 	internal class RenderedComponent<TComponent> : RenderedFragment, IRenderedComponent<TComponent> where TComponent : IComponent

src/bunit.web/Rendering/RenderedFragment.cs

@@ -8,12 +8,11 @@
 
 using Bunit.Diffing;
 using Bunit.Extensions;
-using Bunit.Rendering;
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace Bunit
+namespace Bunit.Rendering
 {
 	/// <summary>
 	/// Represents an abstract <see cref="IRenderedFragment"/> with base functionality.
@@ -154,9 +153,8 @@ private void HandleComponentRender(RenderEvent renderEvent)
 				// that the markup has changed and they should rerun their queries.
 				HandleChangesToMarkup(renderEvent);
 
-
-				//// Then it is safe to tell anybody waiting on updates or changes to the rendered fragment
-				//// that they can redo their assertions or continue processing.
+				// Then it is safe to tell anybody waiting on updates or changes to the rendered fragment
+				// that they can redo their assertions or continue processing.
 				OnAfterRender?.Invoke();
 			}
 		}