Fix and clean-up.

SonarSource · Apr 19, 2023 · f63801f · f63801f
1 parent 133ff1e
commit f63801f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 23 deletions.
diff --git a/analyzers/src/SonarAnalyzer.CSharp/Rules/TestsShouldNotUseThreadSleep.cs b/analyzers/src/SonarAnalyzer.CSharp/Rules/TestsShouldNotUseThreadSleep.cs
@@ -18,21 +18,14 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-using System.Linq;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-using SonarAnalyzer.Helpers;
-
 namespace SonarAnalyzer.Rules.CSharp;
 
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
 public sealed class TestsShouldNotUseThreadSleep : TestsShouldNotUseThreadSleepBase<SyntaxKind>
 {
     protected override ILanguageFacade<SyntaxKind> Language => CSharpFacade.Instance;
 
-    protected override bool IsWithinTest(SyntaxNode node, SemanticModel model) =>
+    protected override bool IsInTestMethod(SyntaxNode node, SemanticModel model) =>
         node.Ancestors().OfType<MethodDeclarationSyntax>().FirstOrDefault() is { } method
         && model.GetDeclaredSymbol(method) is IMethodSymbol symbol
         && symbol.IsTestMethod();

diff --git a/analyzers/src/SonarAnalyzer.Common/Rules/TestsShouldNotUseThreadSleepBase.cs b/analyzers/src/SonarAnalyzer.Common/Rules/TestsShouldNotUseThreadSleepBase.cs
@@ -18,11 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-using System.Threading;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using SonarAnalyzer.Helpers;
-
 namespace SonarAnalyzer.Rules;
 
 public abstract class TestsShouldNotUseThreadSleepBase<TSyntaxKind> : SonarDiagnosticAnalyzer<TSyntaxKind>
@@ -37,12 +32,12 @@ public abstract class TestsShouldNotUseThreadSleepBase<TSyntaxKind> : SonarDiagn
     protected TestsShouldNotUseThreadSleepBase() : base(DiagnosticId) { }
 
     protected sealed override void Initialize(SonarAnalysisContext context) =>
-        context.RegisterSyntaxNodeActionInNonGenerated(Language.GeneratedCodeRecognizer, c =>
+        context.RegisterNodeAction(Language.GeneratedCodeRecognizer, c =>
         {
             if (IsThreadSleepMethod(Language.Syntax.NodeIdentifier(c.Node)?.Text)
                 && c.SemanticModel.GetSymbolInfo(c.Node).Symbol is IMethodSymbol method
                 && method.Is(KnownType.System_Threading_Thread, nameof(Thread.Sleep))
-                && IsWithinTest(c.Node, c.SemanticModel))
+                && IsInTestMethod(c.Node, c.SemanticModel))
             {
                 c.ReportIssue(Diagnostic.Create(Rule, c.Node.Parent.Parent.GetLocation()));
             }

diff --git a/analyzers/src/SonarAnalyzer.VisualBasic/Rules/TestsShouldNotUseThreadSleep.cs b/analyzers/src/SonarAnalyzer.VisualBasic/Rules/TestsShouldNotUseThreadSleep.cs
@@ -18,21 +18,14 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-using System.Linq;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.VisualBasic;
-using Microsoft.CodeAnalysis.VisualBasic.Syntax;
-using SonarAnalyzer.Helpers;
-
 namespace SonarAnalyzer.Rules.VisualBasic;
 
 [DiagnosticAnalyzer(LanguageNames.VisualBasic)]
 public sealed class TestsShouldNotUseThreadSleep : TestsShouldNotUseThreadSleepBase<SyntaxKind>
 {
     protected override ILanguageFacade<SyntaxKind> Language => VisualBasicFacade.Instance;
 
-    protected override bool IsWithinTest(SyntaxNode node, SemanticModel model) =>
+    protected override bool IsInTestMethod(SyntaxNode node, SemanticModel model) =>
         node.Ancestors().OfType<MethodBlockSyntax>().FirstOrDefault() is { } block
         && model.GetDeclaredSymbol(block.SubOrFunctionStatement) is IMethodSymbol symbol
         && symbol.IsTestMethod();