NET-878 Rename Helper classes

SonarSource · Dec 18, 2024 · 831d94f · 831d94f
1 parent af3f528
commit 831d94f
Show file tree

Hide file tree

Showing 81 changed files with 341 additions and 297 deletions.
diff --git a/...rs/tests/SonarAnalyzer.CSharp.Core.Test/Extensions/TypeDeclarationSyntaxExtensionsTest.cs b/...rs/tests/SonarAnalyzer.CSharp.Core.Test/Extensions/TypeDeclarationSyntaxExtensionsTest.cs
@@ -96,7 +96,7 @@ void Function3() {}
 #endif
     public void ParameterList_ReturnsList(string type)
     {
-        var tree = TestHelper.CompileCS($$"""{{type}} Test(int i) { }""").Tree;
+        var tree = TestCompiler.CompileCS($$"""{{type}} Test(int i) { }""").Tree;
         var typeDeclaration = tree.GetCompilationUnitRoot().DescendantNodesAndSelf().OfType<TypeDeclarationSyntax>().Single();
         var parameterList = typeDeclaration.ParameterList();
         parameterList.Should().NotBeNull();
@@ -108,7 +108,7 @@ public void ParameterList_ReturnsList(string type)
     [TestMethod]
     public void ParameterList_Interface()
     {
-        var tree = TestHelper.CompileCS("interface Test { }").Tree;
+        var tree = TestCompiler.CompileCS("interface Test { }").Tree;
         var typeDeclaration = tree.GetCompilationUnitRoot().DescendantNodesAndSelf().OfType<TypeDeclarationSyntax>().Single();
         var parameterList = typeDeclaration.ParameterList();
         parameterList.Should().BeNull();
@@ -167,7 +167,7 @@ public void PrimaryConstructor_PrimaryConstructorRecord(LanguageVersion language
 #endif
     public void PrimaryConstructor_PrimaryConstructorOnClass(string type)
     {
-        var (tree, model) = TestHelper.CompileCS($$"""{{type}} Test(int i) { }""");
+        var (tree, model) = TestCompiler.CompileCS($$"""{{type}} Test(int i) { }""");
         var typeDeclaration = tree.GetCompilationUnitRoot().DescendantNodesAndSelf().OfType<TypeDeclarationSyntax>().Single();
         var methodSymbol = typeDeclaration.PrimaryConstructor(model);
         methodSymbol.Should().NotBeNull();
@@ -180,7 +180,7 @@ public void PrimaryConstructor_PrimaryConstructorOnClass(string type)
     [TestMethod]
     public void PrimaryConstructor_EmptyPrimaryConstructor()
     {
-        var (tree, model) = TestHelper.CompileCS("public class Test() { }");
+        var (tree, model) = TestCompiler.CompileCS("public class Test() { }");
         var typeDeclaration = tree.GetCompilationUnitRoot().DescendantNodesAndSelf().OfType<TypeDeclarationSyntax>().Single();
         var methodSymbol = typeDeclaration.PrimaryConstructor(model);
         methodSymbol.Should().NotBeNull();
@@ -191,7 +191,7 @@ public void PrimaryConstructor_EmptyPrimaryConstructor()
     [TestMethod]
     public void PrimaryConstructor_EmptyPrimaryConstructor_SecondConstructor()
     {
-        var (tree, model) = TestHelper.CompileCS("""
+        var (tree, model) = TestCompiler.CompileCS("""
             public class Test()
             {
                 public Test(int i) : this() { }
@@ -207,7 +207,7 @@ public Test(int i) : this() { }
     [TestMethod]
     public void PrimaryConstructor_EmptyPrimaryConstructorAndStaticConstructor()
     {
-        var (tree, model) = TestHelper.CompileCS("""
+        var (tree, model) = TestCompiler.CompileCS("""
             public class Test()
             {
                 static Test() { }
@@ -227,7 +227,7 @@ static Test() { }
     [DataRow("int i, int j, __arglist", 2)]
     public void PrimaryConstructor_ArglistPrimaryConstructor(string parameterList, int expectedNumberOfParameters)
     {
-        var (tree, model) = TestHelper.CompileCS($$"""public class Test({{parameterList}}) { }""");
+        var (tree, model) = TestCompiler.CompileCS($$"""public class Test({{parameterList}}) { }""");
         var typeDeclaration = tree.GetCompilationUnitRoot().DescendantNodesAndSelf().OfType<TypeDeclarationSyntax>().Single();
         var methodSymbol = typeDeclaration.PrimaryConstructor(model);
         methodSymbol.Should().NotBeNull();

diff --git a/analyzers/tests/SonarAnalyzer.CSharp.Core.Test/Facade/CSharpFacadeTest.cs b/analyzers/tests/SonarAnalyzer.CSharp.Core.Test/Facade/CSharpFacadeTest.cs
@@ -30,7 +30,7 @@ public int M(int arg) =>
                     M(1);
             }
             """;
-        var (tree, model) = TestHelper.CompileCS(code);
+        var (tree, model) = TestCompiler.CompileCS(code);
         var root = tree.GetRoot();
         var invocation = root.DescendantNodes().OfType<InvocationExpressionSyntax>().First();
         var method = model.GetDeclaredSymbol(root.DescendantNodes().OfType<MethodDeclarationSyntax>().First());
@@ -48,7 +48,7 @@ public int M(int arg) =>
                     M(1);
             }
             """;
-        var (tree, model) = TestHelper.CompileCS(code);
+        var (tree, model) = TestCompiler.CompileCS(code);
         var lookup = CSharpFacade.Instance.MethodParameterLookup(tree.GetRoot().DescendantNodes().OfType<InvocationExpressionSyntax>().First(), model);
         lookup.Should().NotBeNull().And.BeOfType<CSharpMethodParameterLookup>();
     }
@@ -66,7 +66,7 @@ public C M() =>
                     new C(1);
             }
             """;
-        var (tree, model) = TestHelper.CompileCS(code);
+        var (tree, model) = TestCompiler.CompileCS(code);
         var root = tree.GetRoot();
         var creation = root.DescendantNodes().OfType<ObjectCreationExpressionSyntax>().First();
         var constructor = model.GetDeclaredSymbol(root.DescendantNodes().OfType<ConstructorDeclarationSyntax>().First());
@@ -87,7 +87,7 @@ public C M() =>
                     new(1);
             }
             """;
-        var (tree, model) = TestHelper.CompileCS(code);
+        var (tree, model) = TestCompiler.CompileCS(code);
         var root = tree.GetRoot();
         var creation = root.DescendantNodes().First(x => x.IsKind(SyntaxKindEx.ImplicitObjectCreationExpression));
         var constructor = model.GetDeclaredSymbol(root.DescendantNodes().OfType<ConstructorDeclarationSyntax>().First());
@@ -106,7 +106,7 @@ public int M(int arg) =>
                     M(1);
             }
             """;
-        var (tree, model) = TestHelper.CompileCS(code);
+        var (tree, model) = TestCompiler.CompileCS(code);
         var root = tree.GetRoot();
         var argumentList = root.DescendantNodes().OfType<ArgumentListSyntax>().First();
         var method = model.GetDeclaredSymbol(root.DescendantNodes().OfType<MethodDeclarationSyntax>().First());
@@ -125,7 +125,7 @@ public int M(int arg) =>
                     M(1);
             }
             """;
-        var (tree, model) = TestHelper.CompileCS(code);
+        var (tree, model) = TestCompiler.CompileCS(code);
         var root = tree.GetRoot();
         var methodDeclaration = root.DescendantNodes().OfType<MethodDeclarationSyntax>().First();
         var method = model.GetDeclaredSymbol(methodDeclaration);
@@ -144,7 +144,7 @@ public int M(int arg) =>
                     M(1);
             }
             """;
-        var (tree, model) = TestHelper.CompileCS(code);
+        var (tree, model) = TestCompiler.CompileCS(code);
         var root = tree.GetRoot();
         var method = model.GetDeclaredSymbol(root.DescendantNodes().OfType<MethodDeclarationSyntax>().First());
         var actual = sut.MethodParameterLookup(null, method);
@@ -162,7 +162,7 @@ public int M(int arg) =>
                     M(1);
             }
             """;
-        var (_, model) = TestHelper.CompileCS(code);
+        var (_, model) = TestCompiler.CompileCS(code);
         var actual = sut.MethodParameterLookup(null, model);
         actual.Should().BeNull();
     }

diff --git a/...arAnalyzer.CSharp.Core.Test/Syntax/Extensions/InvocationExpressionSyntaxExtensionsTest.cs b/...arAnalyzer.CSharp.Core.Test/Syntax/Extensions/InvocationExpressionSyntaxExtensionsTest.cs
@@ -86,6 +86,6 @@ private static SyntaxNode NodeBetweenMarkers(string code, string language)
         var lastPosition = code.LastIndexOf("$$");
         var length = lastPosition == position ? 0 : lastPosition - position - "$$".Length;
         code = code.Replace("$$", string.Empty);
-        return TestHelper.CompileCS(code).Tree.GetRoot().FindNode(new TextSpan(position, length));
+        return TestCompiler.CompileCS(code).Tree.GetRoot().FindNode(new TextSpan(position, length));
     }
 }
diff --git a/...ers/tests/SonarAnalyzer.Core.Test/AnalysisContext/SonarCompilationReportingContextTest.cs b/...ers/tests/SonarAnalyzer.Core.Test/AnalysisContext/SonarCompilationReportingContextTest.cs
@@ -25,7 +25,7 @@ public class SonarCompilationReportingContextTest
     public void Properties_ArePropagated()
     {
         var cancel = new CancellationToken(true);
-        var compilation = TestHelper.CompileCS("// Nothing to see here").Model.Compilation;
+        var compilation = TestCompiler.CompileCS("// Nothing to see here").Model.Compilation;
         var options = AnalysisScaffolding.CreateOptions();
         var context = new CompilationAnalysisContext(compilation, options, _ => { }, _ => true, cancel);
         var sut = new SonarCompilationReportingContext(AnalysisScaffolding.CreateSonarAnalysisContext(), context);

diff --git a/...tests/SonarAnalyzer.Core.Test/AnalysisContext/SonarCompilationStartAnalysisContextTest.cs b/...tests/SonarAnalyzer.Core.Test/AnalysisContext/SonarCompilationStartAnalysisContextTest.cs
@@ -26,7 +26,7 @@ public class SonarCompilationStartAnalysisContextTest
     public void Properties_ArePropagated()
     {
         var cancel = new CancellationToken(true);
-        var compilation = TestHelper.CompileCS("// Nothing to see here").Model.Compilation;
+        var compilation = TestCompiler.CompileCS("// Nothing to see here").Model.Compilation;
         var options = AnalysisScaffolding.CreateOptions();
         var context = Substitute.For<CompilationStartAnalysisContext>(compilation, options, cancel);
         var sut = new SonarCompilationStartAnalysisContext(AnalysisScaffolding.CreateSonarAnalysisContext(), context);

diff --git a/...s/tests/SonarAnalyzer.Core.Test/AnalysisContext/SonarSemanticModelReportingContextTest.cs b/...s/tests/SonarAnalyzer.Core.Test/AnalysisContext/SonarSemanticModelReportingContextTest.cs
@@ -27,7 +27,7 @@ public class SonarSemanticModelReportingContextTest
     public void Properties_ArePropagated()
     {
         var cancel = new CancellationToken(true);
-        var (tree, model) = TestHelper.CompileCS("// Nothing to see here");
+        var (tree, model) = TestCompiler.CompileCS("// Nothing to see here");
         var options = AnalysisScaffolding.CreateOptions();
         var context = new SemanticModelAnalysisContext(model, options, _ => { }, _ => true, cancel);
         var sut = new SonarSemanticModelReportingContext(AnalysisScaffolding.CreateSonarAnalysisContext(), context);

diff --git a/analyzers/tests/SonarAnalyzer.Core.Test/AnalysisContext/SonarSymbolReportingContextTest.cs b/analyzers/tests/SonarAnalyzer.Core.Test/AnalysisContext/SonarSymbolReportingContextTest.cs
@@ -27,7 +27,7 @@ public class SonarSymbolReportingContextTest
     public void Properties_ArePropagated()
     {
         var cancel = new CancellationToken(true);
-        var (tree, model) = TestHelper.CompileCS("public class Sample { }");
+        var (tree, model) = TestCompiler.CompileCS("public class Sample { }");
         var options = AnalysisScaffolding.CreateOptions();
         var symbol = model.GetDeclaredSymbol(tree.Single<ClassDeclarationSyntax>());
         var context = new SymbolAnalysisContext(symbol, model.Compilation, options, _ => { }, _ => true, cancel);

diff --git a/...zers/tests/SonarAnalyzer.Core.Test/AnalysisContext/SonarSyntaxNodeReportingContextTest.cs b/...zers/tests/SonarAnalyzer.Core.Test/AnalysisContext/SonarSyntaxNodeReportingContextTest.cs
@@ -27,7 +27,7 @@ public class SonarSyntaxNodeReportingContextTest
     public void Properties_ArePropagated()
     {
         var cancel = new CancellationToken(true);
-        var (tree, model) = TestHelper.CompileCS("// Nothing to see here");
+        var (tree, model) = TestCompiler.CompileCS("// Nothing to see here");
         var node = tree.GetRoot();
         var options = AnalysisScaffolding.CreateOptions();
         var containingSymbol = Substitute.For<ISymbol>();
@@ -51,9 +51,9 @@ public void Properties_ArePropagated()
     public void ReportIssue_TreeNotInCompilation_DoNotReport(bool reportOnCorrectTree)
     {
         var analysisContext = AnalysisScaffolding.CreateSonarAnalysisContext();
-        var (tree, model) = TestHelper.CompileCS("// Nothing to see here");
+        var (tree, model) = TestCompiler.CompileCS("// Nothing to see here");
         var nodeFromCorrectCompilation = tree.GetRoot();
-        var nodeFromAnotherCompilation = TestHelper.CompileCS("// This is another Compilation with another Tree").Tree.GetRoot();
+        var nodeFromAnotherCompilation = TestCompiler.CompileCS("// This is another Compilation with another Tree").Tree.GetRoot();
         var rule = AnalysisScaffolding.CreateDescriptorMain();
         var node = tree.GetRoot();
         var wasReported = false;

diff --git a/...zers/tests/SonarAnalyzer.Core.Test/AnalysisContext/SonarSyntaxTreeReportingContextTest.cs b/...zers/tests/SonarAnalyzer.Core.Test/AnalysisContext/SonarSyntaxTreeReportingContextTest.cs
@@ -25,7 +25,7 @@ public class SonarSyntaxTreeReportingContextTest
     public void Properties_ArePropagated()
     {
         var cancel = new CancellationToken(true);
-        var (tree, model) = TestHelper.CompileCS("// Nothing to see here");
+        var (tree, model) = TestCompiler.CompileCS("// Nothing to see here");
         var options = AnalysisScaffolding.CreateOptions();
         var context = new SyntaxTreeAnalysisContext(tree, options, _ => { }, _ => true, cancel);
         var sut = new SonarSyntaxTreeReportingContext(AnalysisScaffolding.CreateSonarAnalysisContext(), context, model.Compilation);
@@ -40,8 +40,8 @@ public void Properties_ArePropagated()
     public void ReportIssue_IgnoreSecondaryLocationOutsideCompilation()
     {
         Diagnostic lastDiagnostic = null;
-        var (tree, model) = TestHelper.CompileCS("using System;");
-        var secondaryTree = TestHelper.CompileCS("namespace Nothing;").Tree; // This tree is not in the analyzed compilation
+        var (tree, model) = TestCompiler.CompileCS("using System;");
+        var secondaryTree = TestCompiler.CompileCS("namespace Nothing;").Tree; // This tree is not in the analyzed compilation
         var context = new SyntaxTreeAnalysisContext(tree, AnalysisScaffolding.CreateOptions(), x => lastDiagnostic = x, _ => true, default);
         var sut = new SonarSyntaxTreeReportingContext(AnalysisScaffolding.CreateSonarAnalysisContext(), context, model.Compilation);
         var rule = AnalysisScaffolding.CreateDescriptor("Sxxxx", DiagnosticDescriptorFactory.MainSourceScopeTag);
@@ -60,7 +60,7 @@ public void ReportIssue_IgnoreSecondaryLocationOutsideCompilation()
     [TestMethod]
     public void ReportIssue_NullArguments_Throws()
     {
-        var compilation = TestHelper.CompileCS("// Nothing to see here").Model.Compilation;
+        var compilation = TestCompiler.CompileCS("// Nothing to see here").Model.Compilation;
         var context = new SyntaxTreeAnalysisContext(compilation.SyntaxTrees.First(), new AnalyzerOptions([]), _ => { }, _ => true, CancellationToken.None);
         var sut = new SonarSyntaxTreeReportingContext(AnalysisScaffolding.CreateSonarAnalysisContext(), context, compilation);
         var rule = AnalysisScaffolding.CreateDescriptor("Sxxxx", DiagnosticDescriptorFactory.MainSourceScopeTag);
@@ -74,7 +74,7 @@ public void ReportIssue_NullArguments_Throws()
     public void ReportIssue_PropertiesAndSecondaryLocations_Combine()
     {
         Diagnostic lastDiagnostic = null;
-        var (tree, model) = TestHelper.CompileCS("using System;");
+        var (tree, model) = TestCompiler.CompileCS("using System;");
         var context = new SyntaxTreeAnalysisContext(tree, AnalysisScaffolding.CreateOptions(), x => lastDiagnostic = x, _ => true, default);
         var sut = new SonarSyntaxTreeReportingContext(AnalysisScaffolding.CreateSonarAnalysisContext(), context, model.Compilation);
         var rule = AnalysisScaffolding.CreateDescriptor("Sxxxx", DiagnosticDescriptorFactory.MainSourceScopeTag);

diff --git a/analyzers/tests/SonarAnalyzer.Core.Test/Common/AnalyzerAdditionalFileTest.cs b/analyzers/tests/SonarAnalyzer.Core.Test/Common/AnalyzerAdditionalFileTest.cs
@@ -24,7 +24,7 @@ public class AnalyzerAdditionalFileTest
     [TestMethod]
     public void AnalyzerAdditionalFile_GetText()
     {
-        var path = TestHelper.WriteFile(TestContext, "AdditionalFile.txt", "some sample content");
+        var path = TestFiles.WriteFile(TestContext, "AdditionalFile.txt", "some sample content");
         var additionalFile = new AnalyzerAdditionalFile(path);
         var content = additionalFile.GetText();
         content.ToString().Should().Be("some sample content");

diff --git a/analyzers/tests/SonarAnalyzer.Core.Test/Extensions/BasicBlockExtensionsTest.cs b/analyzers/tests/SonarAnalyzer.Core.Test/Extensions/BasicBlockExtensionsTest.cs
@@ -33,7 +33,7 @@ public void Method()
         var t = true || true;
     }
 }";
-        var cfg = TestHelper.CompileCfgCS(code);
+        var cfg = TestCompiler.CompileCfgCS(code);
         var localLifetimeRegion = cfg.Root.NestedRegions.Single();
         var block = cfg.Blocks[localLifetimeRegion.FirstBlockOrdinal];
 
@@ -60,7 +60,7 @@ public void Method()
 
     public void DoSomething() { }
 }";
-        var cfg = TestHelper.CompileCfgCS(code);
+        var cfg = TestCompiler.CompileCfgCS(code);
         var block = cfg.Blocks[2];
 
         block.EnclosingRegion.Kind.Should().Be(ControlFlowRegionKind.LocalLifetime);

diff --git a/analyzers/tests/SonarAnalyzer.Core.Test/Extensions/CompilationExtensionsTest.cs b/analyzers/tests/SonarAnalyzer.Core.Test/Extensions/CompilationExtensionsTest.cs
@@ -39,15 +39,15 @@ void MethodWithParameters(int arg1, string arg2) { }
     [DataRow("Sample", "MethodWithParameters", true)]
     public void IsMemberAvailable_WithoutTypeCheck(string typeName, string memberName, bool expectedResult)
     {
-        var (_, semanticModel) = TestHelper.Compile(Snippet, false, AnalyzerLanguage.CSharp);
+        var (_, semanticModel) = TestCompiler.Compile(Snippet, false, AnalyzerLanguage.CSharp);
         semanticModel.Compilation.IsMemberAvailable<ISymbol>(new(typeName), memberName)
             .Should().Be(expectedResult);
     }
 
     [TestMethod]
     public void IsMemberAvailable_WithPredicate()
     {
-        var (_, semanticModel) = TestHelper.Compile(Snippet, false, AnalyzerLanguage.CSharp);
+        var (_, semanticModel) = TestCompiler.Compile(Snippet, false, AnalyzerLanguage.CSharp);
         semanticModel.Compilation.IsMemberAvailable<IFieldSymbol>(new("Sample"), "_field", x => KnownType.System_Int32.Matches(x.Type))
             .Should().BeTrue();
         semanticModel.Compilation.IsMemberAvailable<IPropertySymbol>(new("Sample"), "Property", x => x is { IsReadOnly: true })
@@ -80,7 +80,7 @@ static void Check(IEnumerable<MetadataReference> compilationReferences, params K
     [TestMethod]
     public void ReferencesAny_ShouldThrow()
     {
-        var (_, model) = TestHelper.Compile(string.Empty, false, AnalyzerLanguage.CSharp);
+        var (_, model) = TestCompiler.Compile(string.Empty, false, AnalyzerLanguage.CSharp);
 
         ((Func<bool>)(() => model.Compilation.ReferencesAny()))
             .Should()
@@ -90,7 +90,7 @@ public void ReferencesAny_ShouldThrow()
 
     private static void ReferencesAny_ShouldBe(bool expected, IEnumerable<MetadataReference> compilationReferences, params KnownAssembly[] checkedAssemblies)
     {
-        var (_, model) = TestHelper.Compile(string.Empty, false, AnalyzerLanguage.CSharp, compilationReferences.ToArray());
+        var (_, model) = TestCompiler.Compile(string.Empty, false, AnalyzerLanguage.CSharp, compilationReferences.ToArray());
         model.Compilation.ReferencesAny(checkedAssemblies).Should().Be(expected);
     }
 }
diff --git a/analyzers/tests/SonarAnalyzer.Core.Test/Extensions/ControlFlowGraphExtensionsTest.cs b/analyzers/tests/SonarAnalyzer.Core.Test/Extensions/ControlFlowGraphExtensionsTest.cs
@@ -31,7 +31,7 @@ public class Sample
 {
     public void Method() { }
 }";
-        var (tree, semanticModel) = TestHelper.CompileCS(code);
+        var (tree, semanticModel) = TestCompiler.CompileCS(code);
         var method = tree.Single<MethodDeclarationSyntax>();
         var symbol = semanticModel.GetDeclaredSymbol(method) as IMethodSymbol;
         var cfg = ControlFlowGraph.Create(method, semanticModel, default);
@@ -48,7 +48,7 @@ public class Sample
 {
     public void Method() { }
 }";
-        var cfg = TestHelper.CompileCfgCS(code);
+        var cfg = TestCompiler.CompileCfgCS(code);
         Action a = () => cfg.FindLocalFunctionCfgInScope(null, default);
         a.Should().Throw<ArgumentOutOfRangeException>().WithMessage("Specified argument was out of the range of valid values.*Parameter*localFunction*");
     }