[GH-138] - code cleanup

nsubstitute · Mar 22, 2020 · 0c625e6 · 0c625e6
1 parent 36acc01
commit 0c625e6
Show file tree

Hide file tree

Showing 91 changed files with 233 additions and 237 deletions.
diff --git a/...e.Analyzers.CSharp/CodeRefactoringProviders/IntroduceSubstituteCodeRefactoringProvider.cs b/...e.Analyzers.CSharp/CodeRefactoringProviders/IntroduceSubstituteCodeRefactoringProvider.cs
@@ -13,10 +13,6 @@ namespace NSubstitute.Analyzers.CSharp.CodeRefactoringProviders
     [ExportCodeRefactoringProvider(LanguageNames.CSharp)]
     internal sealed class IntroduceSubstituteCodeRefactoringProvider : AbstractIntroduceSubstituteCodeRefactoringProvider<ObjectCreationExpressionSyntax, ArgumentListSyntax, ArgumentSyntax>
     {
-        protected override int ReadonlySubstituteDeclarationContainerRawKind { get; } = (int)SyntaxKind.ClassDeclaration;
-
-        protected override int LocalSubstituteDeclarationContainerRawKind { get; } = (int)SyntaxKind.Block;
-
         protected override IReadOnlyList<ArgumentSyntax> GetArgumentSyntaxNodes(ArgumentListSyntax argumentListSyntax, TextSpan span)
         {
             return argumentListSyntax.Arguments;
@@ -37,6 +33,23 @@ protected override ObjectCreationExpressionSyntax UpdateObjectCreationExpression
             return objectCreationExpressionSyntax.WithArgumentList(updatedArgumentList);
         }
 
+        protected override SyntaxNode FindSiblingNodeForLocalSubstitute(ObjectCreationExpressionSyntax creationExpression)
+        {
+            var container = creationExpression.Ancestors()
+                .FirstOrDefault(ancestor => ancestor.Kind() == SyntaxKind.Block);
+
+            return container?.ChildNodes().FirstOrDefault();
+        }
+
+        protected override SyntaxNode FindSiblingNodeForReadonlySubstitute(SyntaxNode creationExpression)
+        {
+            var typeDeclarationSyntax = creationExpression.Ancestors()
+                .OfType<TypeDeclarationSyntax>()
+                .FirstOrDefault();
+
+            return typeDeclarationSyntax?.Members.FirstOrDefault();
+        }
+
         private static ArgumentListSyntax UpdateArgumentListTrivia(
             ArgumentListSyntax originalArgumentList,
             ArgumentListSyntax updatedArgumentList)

diff --git a/...ers.Shared/CodeRefactoringProviders/AbstractIntroduceSubstituteCodeRefactoringProvider.cs b/...ers.Shared/CodeRefactoringProviders/AbstractIntroduceSubstituteCodeRefactoringProvider.cs
diff --git a/src/NSubstitute.Analyzers.Shared/Extensions/IListExtensions.cs b/src/NSubstitute.Analyzers.Shared/Extensions/IListExtensions.cs
diff --git a/src/NSubstitute.Analyzers.Shared/Extensions/SyntaxGeneratorExtension.cs b/src/NSubstitute.Analyzers.Shared/Extensions/SyntaxGeneratorExtension.cs
@@ -3,7 +3,7 @@
 
 namespace NSubstitute.Analyzers.Shared.Extensions
 {
-    public static class SyntaxGeneratorExtension
+    internal static class SyntaxGeneratorExtension
     {
         public static SyntaxNode SubstituteForInvocationExpression(
             this SyntaxGenerator syntaxGenerator,

diff --git a/...lyzers.VisualBasic/CodeRefactoringProviders/IntroduceSubstituteCodeRefactoringProvider.cs b/...lyzers.VisualBasic/CodeRefactoringProviders/IntroduceSubstituteCodeRefactoringProvider.cs
@@ -13,10 +13,6 @@ namespace NSubstitute.Analyzers.VisualBasic.CodeRefactoringProviders
     [ExportCodeRefactoringProvider(LanguageNames.VisualBasic)]
     internal sealed class IntroduceSubstituteCodeRefactoringProvider : AbstractIntroduceSubstituteCodeRefactoringProvider<ObjectCreationExpressionSyntax, ArgumentListSyntax, ArgumentSyntax>
     {
-        protected override int ReadonlySubstituteDeclarationContainerRawKind { get; } = (int)SyntaxKind.ClassBlock;
-
-        protected override int LocalSubstituteDeclarationContainerRawKind { get; } = (int)SyntaxKind.SubBlock;
-
         protected override IReadOnlyList<ArgumentSyntax> GetArgumentSyntaxNodes(ArgumentListSyntax argumentListSyntax, TextSpan span)
         {
             return argumentListSyntax.Arguments;
@@ -35,7 +31,7 @@ protected override bool IsMissing(ArgumentSyntax argumentSyntax)
             return base.IsMissing(argumentSyntax) || argumentSyntax.IsOmitted;
         }
 
-        protected override SyntaxNode FindContainerForLocalSubstitute(ObjectCreationExpressionSyntax creationExpression)
+        protected override SyntaxNode FindSiblingNodeForLocalSubstitute(ObjectCreationExpressionSyntax creationExpression)
         {
             var container = creationExpression.Ancestors()
                 .FirstOrDefault(ancestor => ancestor.Kind() == SyntaxKind.SubBlock);
@@ -48,7 +44,7 @@ protected override SyntaxNode FindContainerForLocalSubstitute(ObjectCreationExpr
             return null;
         }
 
-        protected override SyntaxNode FindContainerForReadonlySubstitute(SyntaxNode creationExpression)
+        protected override SyntaxNode FindSiblingNodeForReadonlySubstitute(SyntaxNode creationExpression)
         {
             var typeBlockSyntax = creationExpression.Ancestors()
                 .OfType<TypeBlockSyntax>()

diff --git a/...dersTests/CSharpCodeFixActionsVerifier.cs → ...iderTests/CSharpCodeFixActionsVerifier.cs b/...dersTests/CSharpCodeFixActionsVerifier.cs → ...iderTests/CSharpCodeFixActionsVerifier.cs
@@ -1,6 +1,6 @@
 using NSubstitute.Analyzers.Tests.Shared.CodeFixProviders;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests
 {
     public abstract class CSharpCodeFixActionsVerifier : CodeFixCodeActionsVerifier
     {

diff --git a/...ixProvidersTests/CSharpCodeFixVerifier.cs → ...FixProviderTests/CSharpCodeFixVerifier.cs b/...ixProvidersTests/CSharpCodeFixVerifier.cs → ...FixProviderTests/CSharpCodeFixVerifier.cs
@@ -1,6 +1,6 @@
 using NSubstitute.Analyzers.Tests.Shared.CodeFixProviders;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests
 {
     public abstract class CSharpCodeFixVerifier : CodeFixVerifier
     {

diff --git a/...harpSuppressDiagnosticSettingsVerifier.cs → ...harpSuppressDiagnosticSettingsVerifier.cs b/...harpSuppressDiagnosticSettingsVerifier.cs → ...harpSuppressDiagnosticSettingsVerifier.cs
@@ -1,6 +1,6 @@
 using NSubstitute.Analyzers.Tests.Shared.CodeFixProviders;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests
 {
     public abstract class CSharpSuppressDiagnosticSettingsVerifier : SuppressDiagnosticSettingsVerifier
     {

diff --git a/...umentsForInterfaceCodeFixProviderTests.cs → ...umentsForInterfaceCodeFixProviderTests.cs b/...umentsForInterfaceCodeFixProviderTests.cs → ...umentsForInterfaceCodeFixProviderTests.cs
@@ -6,7 +6,7 @@
 using NSubstitute.Analyzers.Tests.Shared.CodeFixProviders;
 using Xunit;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.ConstructorArgumentsForInterfaceCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.ConstructorArgumentsForInterfaceCodeFixProviderTests
 {
     public class ConstructorArgumentsForInterfaceCodeFixProviderTests : CSharpCodeFixVerifier, IConstructorArgumentsForInterfaceCodeFixVerifier
     {

diff --git a/...lSetupSpecificationCodeFixActionsTests.cs → ...lSetupSpecificationCodeFixActionsTests.cs b/...lSetupSpecificationCodeFixActionsTests.cs → ...lSetupSpecificationCodeFixActionsTests.cs
@@ -11,7 +11,7 @@
 using NSubstitute.Analyzers.Tests.Shared.CodeFixProviders;
 using Xunit;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.InternalSetupSpecificationCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.InternalSetupSpecificationCodeFixProviderTests
 {
     public class InternalSetupSpecificationCodeFixActionsTests : CSharpCodeFixActionsVerifier, IInternalSetupSpecificationCodeFixActionsVerifier
     {

diff --git a/...upSpecificationCodeFixProviderVerifier.cs → ...upSpecificationCodeFixProviderVerifier.cs b/...upSpecificationCodeFixProviderVerifier.cs → ...upSpecificationCodeFixProviderVerifier.cs
@@ -7,7 +7,7 @@
 using NSubstitute.Analyzers.Tests.Shared.Extensibility;
 using Xunit;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.InternalSetupSpecificationCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.InternalSetupSpecificationCodeFixProviderTests
 {
     public abstract class InternalSetupSpecificationCodeFixProviderVerifier : CSharpSuppressDiagnosticSettingsVerifier, IInternalSetupSpecificationCodeFixProviderVerifier
     {

diff --git a/...erTests/ReceivedAsExtensionMethodTests.cs → ...erTests/ReceivedAsExtensionMethodTests.cs b/...erTests/ReceivedAsExtensionMethodTests.cs → ...erTests/ReceivedAsExtensionMethodTests.cs
@@ -3,7 +3,7 @@
 using NSubstitute.Analyzers.CSharp.DiagnosticAnalyzers;
 using NSubstitute.Analyzers.Tests.Shared.Extensibility;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.InternalSetupSpecificationCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.InternalSetupSpecificationCodeFixProviderTests
 {
     [CombinatoryData("Received")]
     public class ReceivedAsExtensionMethodTests : InternalSetupSpecificationCodeFixProviderVerifier

diff --git a/...derTests/ReceivedAsOrdinaryMethodTests.cs → ...derTests/ReceivedAsOrdinaryMethodTests.cs b/...derTests/ReceivedAsOrdinaryMethodTests.cs → ...derTests/ReceivedAsOrdinaryMethodTests.cs
@@ -3,7 +3,7 @@
 using NSubstitute.Analyzers.CSharp.DiagnosticAnalyzers;
 using NSubstitute.Analyzers.Tests.Shared.Extensibility;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.InternalSetupSpecificationCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.InternalSetupSpecificationCodeFixProviderTests
 {
     [CombinatoryData("SubstituteExtensions.Received")]
     public class ReceivedAsOrdinaryMethodTests : InternalSetupSpecificationCodeFixProviderVerifier

diff --git a/...derTests/ReturnsAsExtensionMethodTests.cs → ...derTests/ReturnsAsExtensionMethodTests.cs b/...derTests/ReturnsAsExtensionMethodTests.cs → ...derTests/ReturnsAsExtensionMethodTests.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using NSubstitute.Analyzers.Tests.Shared.Extensibility;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.InternalSetupSpecificationCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.InternalSetupSpecificationCodeFixProviderTests
 {
     [CombinatoryData("Returns")]
     public class ReturnsAsExtensionMethodTests : InternalSetupSpecificationCodeFixProviderVerifier

diff --git a/...iderTests/ReturnsAsOrdinaryMethodTests.cs → ...iderTests/ReturnsAsOrdinaryMethodTests.cs b/...iderTests/ReturnsAsOrdinaryMethodTests.cs → ...iderTests/ReturnsAsOrdinaryMethodTests.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using NSubstitute.Analyzers.Tests.Shared.Extensibility;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.InternalSetupSpecificationCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.InternalSetupSpecificationCodeFixProviderTests
 {
     [CombinatoryData("SubstituteExtensions.Returns")]
     public class ReturnsAsOrdinaryMethodTests : InternalSetupSpecificationCodeFixProviderVerifier

diff --git a/...oviderTests/WhenAsExtensionMethodTests.cs → ...oviderTests/WhenAsExtensionMethodTests.cs b/...oviderTests/WhenAsExtensionMethodTests.cs → ...oviderTests/WhenAsExtensionMethodTests.cs
@@ -3,7 +3,7 @@
 using NSubstitute.Analyzers.CSharp.DiagnosticAnalyzers;
 using NSubstitute.Analyzers.Tests.Shared.Extensibility;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.InternalSetupSpecificationCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.InternalSetupSpecificationCodeFixProviderTests
 {
     [CombinatoryData("When")]
     public class WhenAsExtensionMethodTests : InternalSetupSpecificationCodeFixProviderVerifier

diff --git a/...roviderTests/WhenAsOrdinaryMethodTests.cs → ...roviderTests/WhenAsOrdinaryMethodTests.cs b/...roviderTests/WhenAsOrdinaryMethodTests.cs → ...roviderTests/WhenAsOrdinaryMethodTests.cs
@@ -3,7 +3,7 @@
 using NSubstitute.Analyzers.CSharp.DiagnosticAnalyzers;
 using NSubstitute.Analyzers.Tests.Shared.Extensibility;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.InternalSetupSpecificationCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.InternalSetupSpecificationCodeFixProviderTests
 {
     [CombinatoryData("SubstituteExtensions.When")]
     public class WhenAsOrdinaryMethodTests : InternalSetupSpecificationCodeFixProviderVerifier

diff --git a/...SuppressDiagnosticsCodeFixActionsTests.cs → ...SuppressDiagnosticsCodeFixActionsTests.cs b/...SuppressDiagnosticsCodeFixActionsTests.cs → ...SuppressDiagnosticsCodeFixActionsTests.cs
@@ -8,7 +8,7 @@
 using NSubstitute.Analyzers.Tests.Shared.CodeFixProviders;
 using Xunit;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.NonSubstitutableMemberArgumentMatcherSuppressDiagnosticsCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.NonSubstitutableMemberArgumentMatcherSuppressDiagnosticsCodeFixProviderTests
 {
     public class NonSubstitutableMemberArgumentMatcherSuppressDiagnosticsCodeFixActionsTests : CSharpCodeFixActionsVerifier, INonSubstitutableMemberArgumentMatcherSuppressDiagnosticsCodeFixActionsVerifier
     {

diff --git a/...MatcherSuppressDiagnosticsCodeFixTests.cs → ...MatcherSuppressDiagnosticsCodeFixTests.cs b/...MatcherSuppressDiagnosticsCodeFixTests.cs → ...MatcherSuppressDiagnosticsCodeFixTests.cs
@@ -7,7 +7,7 @@
 using NSubstitute.Analyzers.Tests.Shared.CodeFixProviders;
 using Xunit;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.NonSubstitutableMemberArgumentMatcherSuppressDiagnosticsCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.NonSubstitutableMemberArgumentMatcherSuppressDiagnosticsCodeFixProviderTests
 {
     public class NonSubstitutableMemberArgumentMatcherSuppressDiagnosticsCodeFixTests
         : CSharpSuppressDiagnosticSettingsVerifier, INonSubstitutableMemberArgumentMatcherSuppressDiagnosticsCodeFixVerifier

diff --git a/...SuppressDiagnosticsCodeFixActionsTests.cs → ...SuppressDiagnosticsCodeFixActionsTests.cs b/...SuppressDiagnosticsCodeFixActionsTests.cs → ...SuppressDiagnosticsCodeFixActionsTests.cs
@@ -7,7 +7,7 @@
 using NSubstitute.Analyzers.Tests.Shared.CodeFixProviders;
 using Xunit;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.NonSubstitutableMemberSuppressDiagnosticsCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.NonSubstitutableMemberSuppressDiagnosticsCodeFixProviderTests
 {
     public class NonSubstitutableMemberSuppressDiagnosticsCodeFixActionsTests : CSharpCodeFixActionsVerifier, INonSubstitutableMemberSuppressDiagnosticsCodeFixActionsVerifier
     {

diff --git a/...mberSuppressDiagnosticsCodeFixVerifier.cs → ...mberSuppressDiagnosticsCodeFixVerifier.cs b/...mberSuppressDiagnosticsCodeFixVerifier.cs → ...mberSuppressDiagnosticsCodeFixVerifier.cs
@@ -6,7 +6,7 @@
 using NSubstitute.Analyzers.Tests.Shared.CodeFixProviders;
 using Xunit;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.NonSubstitutableMemberSuppressDiagnosticsCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.NonSubstitutableMemberSuppressDiagnosticsCodeFixProviderTests
 {
     public abstract class NonSubstitutableMemberSuppressDiagnosticsCodeFixVerifier : CSharpSuppressDiagnosticSettingsVerifier, INonSubstitutableMemberSuppressDiagnosticsCodeFixVerifier
     {

diff --git a/...derTests/ReturnsAsExtensionMethodTests.cs → ...derTests/ReturnsAsExtensionMethodTests.cs b/...derTests/ReturnsAsExtensionMethodTests.cs → ...derTests/ReturnsAsExtensionMethodTests.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using NSubstitute.Analyzers.Shared;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.NonSubstitutableMemberSuppressDiagnosticsCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.NonSubstitutableMemberSuppressDiagnosticsCodeFixProviderTests
 {
     public class ReturnsAsExtensionMethodTests : NonSubstitutableMemberSuppressDiagnosticsCodeFixVerifier
     {

diff --git a/...ionMethodWithGenericTypeSpecifiedTests.cs → ...ionMethodWithGenericTypeSpecifiedTests.cs b/...ionMethodWithGenericTypeSpecifiedTests.cs → ...ionMethodWithGenericTypeSpecifiedTests.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using NSubstitute.Analyzers.Shared;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.NonSubstitutableMemberSuppressDiagnosticsCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.NonSubstitutableMemberSuppressDiagnosticsCodeFixProviderTests
 {
     public class ReturnsAsExtensionMethodWithGenericTypeSpecifiedTests : NonSubstitutableMemberSuppressDiagnosticsCodeFixVerifier
     {

diff --git a/...iderTests/ReturnsAsOrdinaryMethodTests.cs → ...iderTests/ReturnsAsOrdinaryMethodTests.cs b/...iderTests/ReturnsAsOrdinaryMethodTests.cs → ...iderTests/ReturnsAsOrdinaryMethodTests.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using NSubstitute.Analyzers.Shared;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.NonSubstitutableMemberSuppressDiagnosticsCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.NonSubstitutableMemberSuppressDiagnosticsCodeFixProviderTests
 {
     public class ReturnsAsOrdinaryMethodTests : NonSubstitutableMemberSuppressDiagnosticsCodeFixVerifier
     {

diff --git a/...aryMethodWithGenericTypeSpecifiedTests.cs → ...aryMethodWithGenericTypeSpecifiedTests.cs b/...aryMethodWithGenericTypeSpecifiedTests.cs → ...aryMethodWithGenericTypeSpecifiedTests.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using NSubstitute.Analyzers.Shared;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.NonSubstitutableMemberSuppressDiagnosticsCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.NonSubstitutableMemberSuppressDiagnosticsCodeFixProviderTests
 {
     public class ReturnsAsOrdinaryMethodWithGenericTypeSpecifiedTests : NonSubstitutableMemberSuppressDiagnosticsCodeFixVerifier
     {

diff --git a/...eturnsForAnyArgsAsExtensionMethodTests.cs → ...eturnsForAnyArgsAsExtensionMethodTests.cs b/...eturnsForAnyArgsAsExtensionMethodTests.cs → ...eturnsForAnyArgsAsExtensionMethodTests.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using NSubstitute.Analyzers.Shared;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.NonSubstitutableMemberSuppressDiagnosticsCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.NonSubstitutableMemberSuppressDiagnosticsCodeFixProviderTests
 {
     public class ReturnsForAnyArgsAsExtensionMethodTests : NonSubstitutableMemberSuppressDiagnosticsCodeFixVerifier
     {

diff --git a/...ionMethodWithGenericTypeSpecifiedTests.cs → ...ionMethodWithGenericTypeSpecifiedTests.cs b/...ionMethodWithGenericTypeSpecifiedTests.cs → ...ionMethodWithGenericTypeSpecifiedTests.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using NSubstitute.Analyzers.Shared;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.NonSubstitutableMemberSuppressDiagnosticsCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.NonSubstitutableMemberSuppressDiagnosticsCodeFixProviderTests
 {
     public class ReturnsForAnyArgsAsExtensionMethodWithGenericTypeSpecifiedTests : NonSubstitutableMemberSuppressDiagnosticsCodeFixVerifier
     {

diff --git a/...ReturnsForAnyArgsAsOrdinaryMethodTests.cs → ...ReturnsForAnyArgsAsOrdinaryMethodTests.cs b/...ReturnsForAnyArgsAsOrdinaryMethodTests.cs → ...ReturnsForAnyArgsAsOrdinaryMethodTests.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using NSubstitute.Analyzers.Shared;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.NonSubstitutableMemberSuppressDiagnosticsCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.NonSubstitutableMemberSuppressDiagnosticsCodeFixProviderTests
 {
     public class ReturnsForAnyArgsAsOrdinaryMethodTests : NonSubstitutableMemberSuppressDiagnosticsCodeFixVerifier
     {

diff --git a/...OrdinaryMethodWithGenericTypeSpecified.cs → ...OrdinaryMethodWithGenericTypeSpecified.cs b/...OrdinaryMethodWithGenericTypeSpecified.cs → ...OrdinaryMethodWithGenericTypeSpecified.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using NSubstitute.Analyzers.Shared;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.NonSubstitutableMemberSuppressDiagnosticsCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.NonSubstitutableMemberSuppressDiagnosticsCodeFixProviderTests
 {
     public class ReturnsForAnyArgsAsOrdinaryMethodWithGenericTypeSpecified : NonSubstitutableMemberSuppressDiagnosticsCodeFixVerifier
     {

diff --git a/...dForUnsupportedTypeCodeFixActionsTests.cs → ...dForUnsupportedTypeCodeFixActionsTests.cs b/...dForUnsupportedTypeCodeFixActionsTests.cs → ...dForUnsupportedTypeCodeFixActionsTests.cs
@@ -6,7 +6,7 @@
 using NSubstitute.Analyzers.Tests.Shared.CodeFixProviders;
 using Xunit;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.PartialSubstituteUsedForUnsupportedTypeCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.PartialSubstituteUsedForUnsupportedTypeCodeFixProviderTests
 {
     public class PartialSubstituteUsedForUnsupportedTypeCodeFixActionsTests : CSharpCodeFixActionsVerifier, IPartialSubstituteUsedForUnsupportedTypeCodeFixActionsVerifier
     {

diff --git a/...ForUnsupportedTypeCodeFixProviderTests.cs → ...ForUnsupportedTypeCodeFixProviderTests.cs b/...ForUnsupportedTypeCodeFixProviderTests.cs → ...ForUnsupportedTypeCodeFixProviderTests.cs
@@ -6,7 +6,7 @@
 using NSubstitute.Analyzers.Tests.Shared.CodeFixProviders;
 using Xunit;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.PartialSubstituteUsedForUnsupportedTypeCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.PartialSubstituteUsedForUnsupportedTypeCodeFixProviderTests
 {
     public class PartialSubstituteUsedForUnsupportedTypeCodeFixProviderTests : CSharpCodeFixVerifier, IForPartsOfUsedForUnsupportedTypeCodeFixVerifier
     {

diff --git a/...ests/ReEntrantSetupCodeFixActionsTests.cs → ...ests/ReEntrantSetupCodeFixActionsTests.cs b/...ests/ReEntrantSetupCodeFixActionsTests.cs → ...ests/ReEntrantSetupCodeFixActionsTests.cs
@@ -7,7 +7,7 @@
 using NSubstitute.Analyzers.Tests.Shared.CodeFixProviders;
 using Xunit;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.ReEntrantSetupCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.ReEntrantSetupCodeFixProviderTests
 {
     public class ReEntrantSetupCodeFixActionsTests : CSharpCodeFixActionsVerifier, IReEntrantSetupCodeFixActionsVerifier
     {

diff --git a/...derTests/ReEntrantSetupCodeFixVerifier.cs → ...derTests/ReEntrantSetupCodeFixVerifier.cs b/...derTests/ReEntrantSetupCodeFixVerifier.cs → ...derTests/ReEntrantSetupCodeFixVerifier.cs
@@ -6,7 +6,7 @@
 using NSubstitute.Analyzers.Tests.Shared.CodeFixProviders;
 using Xunit;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.ReEntrantSetupCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.ReEntrantSetupCodeFixProviderTests
 {
     public abstract class ReEntrantSetupCodeFixVerifier : CSharpCodeFixVerifier, IReEntrantSetupCodeFixProviderVerifier
     {

diff --git a/...derTests/ReturnsAsExtensionMethodTests.cs → ...derTests/ReturnsAsExtensionMethodTests.cs b/...derTests/ReturnsAsExtensionMethodTests.cs → ...derTests/ReturnsAsExtensionMethodTests.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.ReEntrantSetupCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.ReEntrantSetupCodeFixProviderTests
 {
     public class ReturnsAsExtensionMethodTests : ReEntrantSetupCodeFixVerifier
     {

diff --git a/...iderTests/ReturnsAsOrdinaryMethodTests.cs → ...iderTests/ReturnsAsOrdinaryMethodTests.cs b/...iderTests/ReturnsAsOrdinaryMethodTests.cs → ...iderTests/ReturnsAsOrdinaryMethodTests.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.ReEntrantSetupCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.ReEntrantSetupCodeFixProviderTests
 {
     public class ReturnsAsOrdinaryMethodTests : ReEntrantSetupCodeFixVerifier
     {

diff --git a/...xProviderTests/ForAsGenericMethodTests.cs → ...xProviderTests/ForAsGenericMethodTests.cs b/...xProviderTests/ForAsGenericMethodTests.cs → ...xProviderTests/ForAsGenericMethodTests.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Xunit;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.SubstituteForInternalMemberCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.SubstituteForInternalMemberCodeFixProviderTests
 {
     public class ForAsGenericMethodTests : SubstituteForInternalMemberCodeFixVerifier
     {

diff --git a/...oviderTests/ForAsNonGenericMethodTests.cs → ...oviderTests/ForAsNonGenericMethodTests.cs b/...oviderTests/ForAsNonGenericMethodTests.cs → ...oviderTests/ForAsNonGenericMethodTests.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Xunit;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.SubstituteForInternalMemberCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.SubstituteForInternalMemberCodeFixProviderTests
 {
     public class ForAsNonGenericMethodTests : SubstituteForInternalMemberCodeFixVerifier
     {

diff --git a/...FixProviderTests/ForPartsOfMethodTests.cs → ...FixProviderTests/ForPartsOfMethodTests.cs b/...FixProviderTests/ForPartsOfMethodTests.cs → ...FixProviderTests/ForPartsOfMethodTests.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Xunit;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.SubstituteForInternalMemberCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.SubstituteForInternalMemberCodeFixProviderTests
 {
     public class ForPartsOfMethodTests : SubstituteForInternalMemberCodeFixVerifier
     {

diff --git a/...sts/SubstituteFactoryCreateMethodTests.cs → ...sts/SubstituteFactoryCreateMethodTests.cs b/...sts/SubstituteFactoryCreateMethodTests.cs → ...sts/SubstituteFactoryCreateMethodTests.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Xunit;
 
-namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProvidersTests.SubstituteForInternalMemberCodeFixProviderTests
+namespace NSubstitute.Analyzers.Tests.CSharp.CodeFixProviderTests.SubstituteForInternalMemberCodeFixProviderTests
 {
     public class SubstituteFactoryCreateMethodTests : SubstituteForInternalMemberCodeFixVerifier
     {