refactor: move to file scoped namespaces

Author: egil

.editorconfig

@@ -229,6 +229,7 @@ csharp_space_between_square_brackets = false
 # https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#wrap-options
 csharp_preserve_single_line_statements = false
 csharp_preserve_single_line_blocks = true
+csharp_style_namespace_declarations = file_scoped:warning
 
 ##########################################
 # .NET Naming Conventions

Directory.Build.props

@@ -18,7 +18,7 @@
 	<PropertyGroup Label="Compile settings">
 		<Nullable>enable</Nullable>
 		<LangVersion>10.0</LangVersion>
-		<ImplicitUsings>disable</ImplicitUsings>
+		<ImplicitUsings>enable</ImplicitUsings>
 		<NoWarn>CA1014,NU5104</NoWarn>
 
 		<!-- Used by code coverage -->
@@ -47,7 +47,7 @@
 	<!-- Shared code analyzers used for all projects in the solution -->
 	<ItemGroup Label="Code Analyzers">
 		<PackageReference Include="AsyncFixer" Version="1.5.1" PrivateAssets="All" />
-		<PackageReference Include="Meziantou.Analyzer" Version="1.0.676" PrivateAssets="All" />
+		<PackageReference Include="Meziantou.Analyzer" Version="1.0.678" PrivateAssets="All" />
 		<PackageReference Include="SonarAnalyzer.CSharp" Version="8.32.0.39516" PrivateAssets="All" />
 	</ItemGroup>
 

src/bunit.core/Asserting/ActualExpectedAssertException.cs

@@ -1,36 +1,35 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Bunit.Asserting
+namespace Bunit.Asserting;
+
+/// <summary>
+/// Represents a generic assert exception used when an actual result does not match an expected result.
+/// </summary>
+[Serializable]
+public class ActualExpectedAssertException : Exception
 {
 	/// <summary>
-	/// Represents a generic assert exception used when an actual result does not match an expected result.
+	/// Initializes a new instance of the <see cref="ActualExpectedAssertException"/> class.
 	/// </summary>
-	[Serializable]
-	public class ActualExpectedAssertException : Exception
+	/// <param name="actual">The actual result.</param>
+	/// <param name="expected">The expected result.</param>
+	/// <param name="actualText">A text explaining the actual result.</param>
+	/// <param name="expectedText">A text explaining the expected result.</param>
+	/// <param name="message">An error message explaining the context of the assertion.</param>
+	public ActualExpectedAssertException(string actual, string expected, string actualText, string expectedText, string message)
+		: base(CreateMessage(actual, expected, actualText, expectedText, message))
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ActualExpectedAssertException"/> class.
-		/// </summary>
-		/// <param name="actual">The actual result.</param>
-		/// <param name="expected">The expected result.</param>
-		/// <param name="actualText">A text explaining the actual result.</param>
-		/// <param name="expectedText">A text explaining the expected result.</param>
-		/// <param name="message">An error message explaining the context of the assertion.</param>
-		public ActualExpectedAssertException(string actual, string expected, string actualText, string expectedText, string message)
-			: base(CreateMessage(actual, expected, actualText, expectedText, message))
-		{
-		}
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ActualExpectedAssertException"/> class.
-		/// </summary>
-		protected ActualExpectedAssertException(SerializationInfo info, StreamingContext context)
-			: base(info, context) { }
+	/// <summary>
+	/// Initializes a new instance of the <see cref="ActualExpectedAssertException"/> class.
+	/// </summary>
+	protected ActualExpectedAssertException(SerializationInfo info, StreamingContext context)
+		: base(info, context) { }
 
-		private static string CreateMessage(string actual, string expected, string actualText, string expectedText, string message)
-		{
-			return $"{message}{Environment.NewLine}{actualText}: {actual}{Environment.NewLine}{expectedText}: {expected}";
-		}
+	private static string CreateMessage(string actual, string expected, string actualText, string expectedText, string message)
+	{
+		return $"{message}{Environment.NewLine}{actualText}: {actual}{Environment.NewLine}{expectedText}: {expected}";
 	}
 }

src/bunit.core/Asserting/AssertionMethodAttribute.cs

@@ -1,12 +1,11 @@
 using System;
 
-namespace Bunit.Asserting
-{
-	/// <summary>
-	/// Add this attribute to assertion methods to indicate to
-	/// 3rd party analyzers that the method is an assertion method.
-	/// See more here: https://rules.sonarsource.com/csharp/RSPEC-2699.
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Method)]
-	public sealed class AssertionMethodAttribute : Attribute { }
-}
+namespace Bunit.Asserting;
+
+/// <summary>
+/// Add this attribute to assertion methods to indicate to
+/// 3rd party analyzers that the method is an assertion method.
+/// See more here: https://rules.sonarsource.com/csharp/RSPEC-2699.
+/// </summary>
+[AttributeUsage(AttributeTargets.Method)]
+public sealed class AssertionMethodAttribute : Attribute { }

src/bunit.core/ComponentFactories/GenericComponentFactory{TComponent,TReplacementComponent}.cs

@@ -2,14 +2,13 @@
 using System;
 using Microsoft.AspNetCore.Components;
 
-namespace Bunit.ComponentFactories
+namespace Bunit.ComponentFactories;
+
+internal sealed class GenericComponentFactory<TComponent, TReplacementComponent> : IComponentFactory
+	where TComponent : IComponent
+	where TReplacementComponent : IComponent
 {
-	internal sealed class GenericComponentFactory<TComponent, TReplacementComponent> : IComponentFactory
-		where TComponent : IComponent
-		where TReplacementComponent : IComponent
-	{
-		public bool CanCreate(Type componentType) => componentType == typeof(TComponent);
-		public IComponent Create(Type componentType) => Activator.CreateInstance<TReplacementComponent>()!;
-	}
+	public bool CanCreate(Type componentType) => componentType == typeof(TComponent);
+	public IComponent Create(Type componentType) => Activator.CreateInstance<TReplacementComponent>()!;
 }
 #endif

src/bunit.core/ComponentFactories/InstanceComponentFactory.cs

@@ -2,34 +2,33 @@
 using System;
 using Microsoft.AspNetCore.Components;
 
-namespace Bunit.ComponentFactories
+namespace Bunit.ComponentFactories;
+
+internal sealed class InstanceComponentFactory<TComponent> : IComponentFactory
+	where TComponent : IComponent
 {
-	internal sealed class InstanceComponentFactory<TComponent> : IComponentFactory
-		where TComponent : IComponent
-	{
-		private readonly TComponent instance;
-		private int createCount;
+	private readonly TComponent instance;
+	private int createCount;
 
-		public InstanceComponentFactory(TComponent instance)
-			=> this.instance = instance;
+	public InstanceComponentFactory(TComponent instance)
+		=> this.instance = instance;
 
-		public bool CanCreate(Type componentType)
-			=> componentType == typeof(TComponent);
+	public bool CanCreate(Type componentType)
+		=> componentType == typeof(TComponent);
 
-		public IComponent Create(Type componentType)
+	public IComponent Create(Type componentType)
+	{
+		if (createCount == 1)
 		{
-			if(createCount == 1)
-			{
-				throw new InvalidOperationException(
-					$"The instance object passed to the" +
-					$"{nameof(TestContextBase.ComponentFactories)}.{nameof(ComponentFactoryCollectionExtensions.Add)}<{typeof(TComponent).Name}>(instance) method can only be used to replace " +
-					$"one {typeof(TComponent)} component in the render tree.");
-			}
+			throw new InvalidOperationException(
+				$"The instance object passed to the" +
+				$"{nameof(TestContextBase.ComponentFactories)}.{nameof(ComponentFactoryCollectionExtensions.Add)}<{typeof(TComponent).Name}>(instance) method can only be used to replace " +
+				$"one {typeof(TComponent)} component in the render tree.");
+		}
 
-			createCount++;
+		createCount++;
 
-			return instance;
-		}
+		return instance;
 	}
 }
 #endif

src/bunit.core/ComponentFactoryCollection.cs

@@ -2,95 +2,94 @@
 using System.Collections;
 using System.Collections.Generic;
 
-namespace Bunit
+namespace Bunit;
+
+/// <summary>
+/// Represents a collection of <see cref="IComponentFactory"/>.
+/// </summary>
+public sealed class ComponentFactoryCollection : IList<IComponentFactory>
 {
+	private readonly IList<IComponentFactory> factories = new List<IComponentFactory>();
+
 	/// <summary>
-	/// Represents a collection of <see cref="IComponentFactory"/>.
+	/// Gets or sets a <see cref="IComponentFactory"/> at the specified index.
 	/// </summary>
-	public sealed class ComponentFactoryCollection : IList<IComponentFactory>
-	{
-		private readonly IList<IComponentFactory> factories = new List<IComponentFactory>();
+	/// <param name="index">The zero-based index of the element to get or set.</param>
+	/// <returns>The <see cref="IComponentFactory"/> at the specified index.</returns>
+	public IComponentFactory this[int index] { get => factories[index]; set => factories[index] = value; }
 
-		/// <summary>
-		/// Gets or sets a <see cref="IComponentFactory"/> at the specified index.
-		/// </summary>
-		/// <param name="index">The zero-based index of the element to get or set.</param>
-		/// <returns>The <see cref="IComponentFactory"/> at the specified index.</returns>
-		public IComponentFactory this[int index] { get => factories[index]; set => factories[index] = value; }
-
-		/// <summary>
-		/// Gets the number of <see cref="IComponentFactory"/> contained in the <see cref="ComponentFactoryCollection"/>.
-		/// </summary>
-		public int Count => factories.Count;
+	/// <summary>
+	/// Gets the number of <see cref="IComponentFactory"/> contained in the <see cref="ComponentFactoryCollection"/>.
+	/// </summary>
+	public int Count => factories.Count;
 
-		/// <summary>
-		/// Gets a value indicating whether the <see cref="ComponentFactoryCollection"/> is read-only.
-		/// </summary>
-		public bool IsReadOnly => factories.IsReadOnly;
+	/// <summary>
+	/// Gets a value indicating whether the <see cref="ComponentFactoryCollection"/> is read-only.
+	/// </summary>
+	public bool IsReadOnly => factories.IsReadOnly;
 
-		/// <summary>
-		/// Adds an <see cref="IComponentFactory"/> to the <see cref="ComponentFactoryCollection"/>.
-		/// </summary>
-		/// <param name="item">The <see cref="IComponentFactory"/> to add to the collection.</param>
-		public void Add(IComponentFactory item) => factories.Add(item);
+	/// <summary>
+	/// Adds an <see cref="IComponentFactory"/> to the <see cref="ComponentFactoryCollection"/>.
+	/// </summary>
+	/// <param name="item">The <see cref="IComponentFactory"/> to add to the collection.</param>
+	public void Add(IComponentFactory item) => factories.Add(item);
 
-		/// <summary>
-		/// Removes all <see cref="IComponentFactory"/>s from the <see cref="ComponentFactoryCollection"/>.
-		/// </summary>
-		public void Clear() => factories.Clear();
+	/// <summary>
+	/// Removes all <see cref="IComponentFactory"/>s from the <see cref="ComponentFactoryCollection"/>.
+	/// </summary>
+	public void Clear() => factories.Clear();
 
-		/// <summary>
-		/// Determines whether the <see cref="ComponentFactoryCollection"/> contains a specific <see cref="IComponentFactory"/>.
-		/// </summary>
-		/// <param name="item">The object to locate in the <see cref="ComponentFactoryCollection"/>..</param>
-		/// <returns>true if item is found in the <see cref="ComponentFactoryCollection"/>; otherwise, false.</returns>
-		public bool Contains(IComponentFactory item) => factories.Contains(item);
+	/// <summary>
+	/// Determines whether the <see cref="ComponentFactoryCollection"/> contains a specific <see cref="IComponentFactory"/>.
+	/// </summary>
+	/// <param name="item">The object to locate in the <see cref="ComponentFactoryCollection"/>..</param>
+	/// <returns>true if item is found in the <see cref="ComponentFactoryCollection"/>; otherwise, false.</returns>
+	public bool Contains(IComponentFactory item) => factories.Contains(item);
 
-		/// <summary>
-		/// Copies the <see cref="IComponentFactory"/>s of the <see cref="ComponentFactoryCollection"/> to an <see cref="System.Array"/>, starting at a particular <see cref="System.Array"/> index.
-		/// </summary>
-		/// <param name="array">The one-dimensional <see cref="System.Array"/> that is the destination of the elements copied from <see cref="ComponentFactoryCollection"/>. The <see cref="System.Array"/> must have zero-based indexing.</param>
-		/// <param name="arrayIndex">The zero-based index in array at which copying begins.</param>
-		public void CopyTo(IComponentFactory[] array, int arrayIndex) => factories.CopyTo(array, arrayIndex);
+	/// <summary>
+	/// Copies the <see cref="IComponentFactory"/>s of the <see cref="ComponentFactoryCollection"/> to an <see cref="System.Array"/>, starting at a particular <see cref="System.Array"/> index.
+	/// </summary>
+	/// <param name="array">The one-dimensional <see cref="System.Array"/> that is the destination of the elements copied from <see cref="ComponentFactoryCollection"/>. The <see cref="System.Array"/> must have zero-based indexing.</param>
+	/// <param name="arrayIndex">The zero-based index in array at which copying begins.</param>
+	public void CopyTo(IComponentFactory[] array, int arrayIndex) => factories.CopyTo(array, arrayIndex);
 
-		/// <summary>
-		/// Returns an enumerator that iterates through the collection of <see cref="IComponentFactory"/>.
-		/// </summary>
-		/// <returns>An enumerator that can be used to iterate through the collection of <see cref="IComponentFactory"/>.</returns>
-		public IEnumerator<IComponentFactory> GetEnumerator() => factories.GetEnumerator();
+	/// <summary>
+	/// Returns an enumerator that iterates through the collection of <see cref="IComponentFactory"/>.
+	/// </summary>
+	/// <returns>An enumerator that can be used to iterate through the collection of <see cref="IComponentFactory"/>.</returns>
+	public IEnumerator<IComponentFactory> GetEnumerator() => factories.GetEnumerator();
 
-		/// <summary>
-		/// Determines the index of a specific <see cref="IComponentFactory"/> in the <see cref="ComponentFactoryCollection"/>.
-		/// </summary>
-		/// <param name="item">The <see cref="IComponentFactory"/> to locate in the <see cref="ComponentFactoryCollection"/>..</param>
-		/// <returns>The index of <see cref="IComponentFactory"/> if found in the list; otherwise, -1.</returns>
-		public int IndexOf(IComponentFactory item) => factories.IndexOf(item);
+	/// <summary>
+	/// Determines the index of a specific <see cref="IComponentFactory"/> in the <see cref="ComponentFactoryCollection"/>.
+	/// </summary>
+	/// <param name="item">The <see cref="IComponentFactory"/> to locate in the <see cref="ComponentFactoryCollection"/>..</param>
+	/// <returns>The index of <see cref="IComponentFactory"/> if found in the list; otherwise, -1.</returns>
+	public int IndexOf(IComponentFactory item) => factories.IndexOf(item);
 
-		/// <summary>
-		/// Inserts an <see cref="IComponentFactory"/> to the <see cref="ComponentFactoryCollection"/> at the specified index.
-		/// </summary>
-		/// <param name="index">The zero-based index at which <see cref="IComponentFactory"/> should be inserted.</param>
-		/// <param name="item">The <see cref="IComponentFactory"/> to insert into the <see cref="ComponentFactoryCollection"/>.</param>
-		public void Insert(int index, IComponentFactory item) => factories.Insert(index, item);
+	/// <summary>
+	/// Inserts an <see cref="IComponentFactory"/> to the <see cref="ComponentFactoryCollection"/> at the specified index.
+	/// </summary>
+	/// <param name="index">The zero-based index at which <see cref="IComponentFactory"/> should be inserted.</param>
+	/// <param name="item">The <see cref="IComponentFactory"/> to insert into the <see cref="ComponentFactoryCollection"/>.</param>
+	public void Insert(int index, IComponentFactory item) => factories.Insert(index, item);
 
-		/// <summary>
-		/// Removes the first occurrence of a specific <see cref="IComponentFactory"/> from the <see cref="ComponentFactoryCollection"/>.
-		/// </summary>
-		/// <param name="item">The <see cref="IComponentFactory"/> to remove from the <see cref="ComponentFactoryCollection"/>.</param>
-		/// <returns>true if <see cref="IComponentFactory"/> was successfully removed from the <see cref="ComponentFactoryCollection"/>; otherwise, false. This method also returns false if <see cref="IComponentFactory"/> is not found in the original <see cref="ComponentFactoryCollection"/>.</returns>
-		public bool Remove(IComponentFactory item) => factories.Remove(item);
+	/// <summary>
+	/// Removes the first occurrence of a specific <see cref="IComponentFactory"/> from the <see cref="ComponentFactoryCollection"/>.
+	/// </summary>
+	/// <param name="item">The <see cref="IComponentFactory"/> to remove from the <see cref="ComponentFactoryCollection"/>.</param>
+	/// <returns>true if <see cref="IComponentFactory"/> was successfully removed from the <see cref="ComponentFactoryCollection"/>; otherwise, false. This method also returns false if <see cref="IComponentFactory"/> is not found in the original <see cref="ComponentFactoryCollection"/>.</returns>
+	public bool Remove(IComponentFactory item) => factories.Remove(item);
 
-		/// <summary>
-		/// Removes the <see cref="ComponentFactoryCollection"/> <see cref="IComponentFactory"/> at the specified index.
-		/// </summary>
-		/// <param name="index">The zero-based index of the <see cref="IComponentFactory"/> to remove.</param>
-		public void RemoveAt(int index) => factories.RemoveAt(index);
+	/// <summary>
+	/// Removes the <see cref="ComponentFactoryCollection"/> <see cref="IComponentFactory"/> at the specified index.
+	/// </summary>
+	/// <param name="index">The zero-based index of the <see cref="IComponentFactory"/> to remove.</param>
+	public void RemoveAt(int index) => factories.RemoveAt(index);
 
-		/// <summary>
-		/// Returns an enumerator that iterates through a <see cref="ComponentFactoryCollection"/>.
-		/// </summary>
-		/// <returns>An <see cref="IEnumerator"/> object that can be used to iterate through the <see cref="ComponentFactoryCollection"/>.</returns>
-		IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable)factories).GetEnumerator();
-	}
+	/// <summary>
+	/// Returns an enumerator that iterates through a <see cref="ComponentFactoryCollection"/>.
+	/// </summary>
+	/// <returns>An <see cref="IEnumerator"/> object that can be used to iterate through the <see cref="ComponentFactoryCollection"/>.</returns>
+	IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable)factories).GetEnumerator();
 }
 #endif