Fast fix - Fix tests to be possible pass GitHub checks (#2)

peterM · Apr 21, 2019 · 305a756 · 305a756
1 parent 0a3e62a
commit 305a756
Show file tree

Hide file tree

Showing 28 changed files with 106 additions and 89 deletions.
diff --git a/...ethodAnalyzer/MalikP.Analyzers.AsyncMethodAnalyzer15.Test/AsyncMethodAnalyzerUnitTests.cs b/...ethodAnalyzer/MalikP.Analyzers.AsyncMethodAnalyzer15.Test/AsyncMethodAnalyzerUnitTests.cs
@@ -29,6 +29,7 @@
 using MalikP.Analyzers.AsyncMethodAnalyzer.Analyzers.Specific;
 using MalikP.Analyzers.AsyncMethodAnalyzer.Analyzers.Specific.Naming;
 using MalikP.Analyzers.AsyncMethodAnalyzer.CodeFixes.Specific;
+using MalikP.Analyzers.AsyncMethodAnalyzer.Rules.Naming;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.Diagnostics;
@@ -39,11 +40,11 @@
 namespace MalikP.Analyzers.AsyncMethodAnalyzer.Test
 {
     [TestClass]
-    public class UnitTest : CodeFixVerifier
+    public class AddMissingAsyncSuffix_Declaration_Task_Test : CodeFixVerifier
     {
         //No diagnostics expected to show up
         [TestMethod]
-        public void TestMethod1()
+        public void VeryfyNoDiagnosticWillShowUp_AddMissingAsyncSuffix_Declaration()
         {
             var test = @"";
 
@@ -52,30 +53,37 @@ public void TestMethod1()
 
         //Diagnostic and CodeFix both triggered and checked for
         [TestMethod]
-        public void TestMethod2()
+        public void VerifyTaskMethodAsyncSuffix()
         {
             var test = @"
     using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Text;
+    using System.Threading;
     using System.Threading.Tasks;
     using System.Diagnostics;
 
     namespace ConsoleApplication1
     {
         class TypeName
         {   
+            public Task MyTask()
+            {
+                return Task.Delay(1);
+            }
         }
     }";
+            var rule = MethodMissingAsyncSuffix_Task_Declaration_Rule.Rule;
+
             var expected = new DiagnosticResult
             {
-                Id = "AsyncMethodAnalyzer",
-                Message = String.Format("Type name '{0}' contains lowercase letters", "TypeName"),
-                Severity = DiagnosticSeverity.Warning,
+                Id = "AANA001",
+                Message = String.Format(rule.MessageFormat.ToString(), "MyTask"),
+                Severity = rule.DefaultSeverity,
                 Locations =
                     new[] {
-                            new DiagnosticResultLocation("Test0.cs", 11, 15)
+                            new DiagnosticResultLocation("Test0.cs", 14, 25)
                         }
             };
 
@@ -86,13 +94,18 @@ class TypeName
     using System.Collections.Generic;
     using System.Linq;
     using System.Text;
+    using System.Threading;
     using System.Threading.Tasks;
     using System.Diagnostics;
 
     namespace ConsoleApplication1
     {
-        class TYPENAME
+        class TypeName
         {   
+            public Task MyTaskAsync()
+            {
+                return Task.Delay(1);
+            }
         }
     }";
             VerifyCSharpFix(test, fixtest);
@@ -105,7 +118,7 @@ protected override CodeFixProvider GetCSharpCodeFixProvider()
 
         protected override DiagnosticAnalyzer GetCSharpDiagnosticAnalyzer()
         {
-            return new CancellationTokenNameAnalyzer();
+            return new AsyncMethodNameSuffix_Task_Declaration_Analyzer();
         }
     }
 }
diff --git a/...er16.Test/AsyncMethodAnalyzerUnitTests.cs → ...ssingAsyncSuffix_Declaration_Task_Test.cs b/...er16.Test/AsyncMethodAnalyzerUnitTests.cs → ...ssingAsyncSuffix_Declaration_Task_Test.cs
@@ -29,6 +29,7 @@
 using MalikP.Analyzers.AsyncMethodAnalyzer.Analyzers.Specific;
 using MalikP.Analyzers.AsyncMethodAnalyzer.Analyzers.Specific.Naming;
 using MalikP.Analyzers.AsyncMethodAnalyzer.CodeFixes.Specific;
+using MalikP.Analyzers.AsyncMethodAnalyzer.Rules.Naming;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.Diagnostics;
@@ -39,11 +40,11 @@
 namespace MalikP.Analyzers.AsyncMethodAnalyzer.Test
 {
     [TestClass]
-    public class UnitTest : CodeFixVerifier
+    public class AddMissingAsyncSuffix_Declaration_Task_Test : CodeFixVerifier
     {
         //No diagnostics expected to show up
         [TestMethod]
-        public void TestMethod1()
+        public void VeryfyNoDiagnosticWillShowUp_AddMissingAsyncSuffix_Declaration()
         {
             var test = @"";
 
@@ -52,30 +53,37 @@ public void TestMethod1()
 
         //Diagnostic and CodeFix both triggered and checked for
         [TestMethod]
-        public void TestMethod2()
+        public void VerifyTaskMethodAsyncSuffix()
         {
             var test = @"
     using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Text;
+    using System.Threading;
     using System.Threading.Tasks;
     using System.Diagnostics;
 
     namespace ConsoleApplication1
     {
         class TypeName
         {   
+            public Task MyTask()
+            {
+                return Task.Delay(1);
+            }
         }
     }";
+            var rule = MethodMissingAsyncSuffix_Task_Declaration_Rule.Rule;
+
             var expected = new DiagnosticResult
             {
-                Id = "AsyncMethodAnalyzer",
-                Message = String.Format("Type name '{0}' contains lowercase letters", "TypeName"),
-                Severity = DiagnosticSeverity.Warning,
+                Id = "AANA001",
+                Message = String.Format(rule.MessageFormat.ToString(), "MyTask"),
+                Severity = rule.DefaultSeverity,
                 Locations =
                     new[] {
-                            new DiagnosticResultLocation("Test0.cs", 11, 15)
+                            new DiagnosticResultLocation("Test0.cs", 14, 25)
                         }
             };
 
@@ -86,13 +94,18 @@ class TypeName
     using System.Collections.Generic;
     using System.Linq;
     using System.Text;
+    using System.Threading;
     using System.Threading.Tasks;
     using System.Diagnostics;
 
     namespace ConsoleApplication1
     {
-        class TYPENAME
+        class TypeName
         {   
+            public Task MyTaskAsync()
+            {
+                return Task.Delay(1);
+            }
         }
     }";
             VerifyCSharpFix(test, fixtest);
@@ -105,7 +118,7 @@ protected override CodeFixProvider GetCSharpCodeFixProvider()
 
         protected override DiagnosticAnalyzer GetCSharpDiagnosticAnalyzer()
         {
-            return new CancellationTokenNameAnalyzer();
+            return new AsyncMethodNameSuffix_Task_Declaration_Analyzer();
         }
     }
 }
diff --git a/...odAnalyzer/MalikP.Analyzers.AsyncMethodAnalyzer16/Analyzers/AbstractDiagnosticAnalyzer.cs b/...odAnalyzer/MalikP.Analyzers.AsyncMethodAnalyzer16/Analyzers/AbstractDiagnosticAnalyzer.cs
@@ -26,7 +26,7 @@
 // SOFTWARE.
 
 using System.Collections.Immutable;
-using System.Text;
+
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 

diff --git a/...nalyzers/Specific/Design/CancellationTokenParameterExistence_Task_Declaration_Analyzer.cs b/...nalyzers/Specific/Design/CancellationTokenParameterExistence_Task_Declaration_Analyzer.cs
@@ -25,7 +25,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-using System;
 using System.Linq;
 
 using MalikP.Analyzers.AsyncMethodAnalyzer.Rules.Design;
@@ -36,7 +35,7 @@
 namespace MalikP.Analyzers.AsyncMethodAnalyzer.Analyzers.Specific.Design
 {
     [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class CancellationTokenParameterExistence_Declaration_Analyzer : Abstract_Method_SymbolActionDiagnosticAnalyze
+    public sealed class CancellationTokenParameterExistence_Declaration_Analyzer : Abstract_Method_SymbolActionDiagnosticAnalyze
     {
         private const string _genericTaskType = "System.Threading.Tasks.Task<TResult>";
 

diff --git a/...Analyzers/Specific/Design/CancellationTokenParameterExistence_Task_Invocation_Analyzer.cs b/...Analyzers/Specific/Design/CancellationTokenParameterExistence_Task_Invocation_Analyzer.cs
@@ -25,7 +25,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-using System;
 using System.Linq;
 
 using MalikP.Analyzers.AsyncMethodAnalyzer.Rules.Design;
@@ -36,7 +35,7 @@
 namespace MalikP.Analyzers.AsyncMethodAnalyzer.Analyzers.Specific.Design
 {
     [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class CancellationTokenParameterExistence_Task_Invocation_Analyzer : Abstract_InvocationExpressionSyntax_SyntaxNodeActionDiagnosticAnalyzer
+    public sealed class CancellationTokenParameterExistence_Task_Invocation_Analyzer : Abstract_InvocationExpressionSyntax_SyntaxNodeActionDiagnosticAnalyzer
     {
         private const string _genericTaskType = "System.Threading.Tasks.Task<TResult>";
 

diff --git a/...nalyzers/Specific/Design/CancellationTokenParameterExistence_Void_Declaration_Analyzer.cs b/...nalyzers/Specific/Design/CancellationTokenParameterExistence_Void_Declaration_Analyzer.cs
@@ -35,7 +35,7 @@
 namespace MalikP.Analyzers.AsyncMethodAnalyzer.Analyzers.Specific.Design
 {
     [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class CancellationTokenParameterExistence_Void_Declaration_Analyzer : Abstract_Method_SymbolActionDiagnosticAnalyze
+    public sealed class CancellationTokenParameterExistence_Void_Declaration_Analyzer : Abstract_Method_SymbolActionDiagnosticAnalyze
     {
         protected override DiagnosticDescriptor DiagnosticDescriptor => MissingCancellationTokenParameter_Void_Declaration_Rule.Rule;
 

diff --git a/...Analyzers/Specific/Design/CancellationTokenParameterExistence_Void_Invocation_Analyzer.cs b/...Analyzers/Specific/Design/CancellationTokenParameterExistence_Void_Invocation_Analyzer.cs
@@ -35,7 +35,7 @@
 namespace MalikP.Analyzers.AsyncMethodAnalyzer.Analyzers.Specific.Design
 {
     [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class CancellationTokenParameterExistence_Void_Invocation_Analyzer : Abstract_InvocationExpressionSyntax_SyntaxNodeActionDiagnosticAnalyzer
+    public sealed class CancellationTokenParameterExistence_Void_Invocation_Analyzer : Abstract_InvocationExpressionSyntax_SyntaxNodeActionDiagnosticAnalyzer
     {
         protected override DiagnosticDescriptor DiagnosticDescriptor => MissingCancellationTokenParameter_Void_Invocation_Rule.Rule;
 

diff --git a/...cMethodAnalyzer16/Analyzers/Specific/Design/CancellationTokenParameterPositionAnalyzer.cs b/...cMethodAnalyzer16/Analyzers/Specific/Design/CancellationTokenParameterPositionAnalyzer.cs
@@ -36,7 +36,7 @@
 namespace MalikP.Analyzers.AsyncMethodAnalyzer.Analyzers.Specific.Design
 {
     [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class CancellationTokenParameterPositionAnalyzer : Abstract_Method_SymbolActionDiagnosticAnalyze
+    public sealed class CancellationTokenParameterPositionAnalyzer : Abstract_Method_SymbolActionDiagnosticAnalyze
     {
         protected override DiagnosticDescriptor DiagnosticDescriptor => WrongCancellationTokenMethodParameterPosition_Declaration_Rule.Rule;
 

diff --git a/...rs/Specific/Design/CancellationTokenParameterReusePossibility_Task_Invocation_Analyzer.cs b/...rs/Specific/Design/CancellationTokenParameterReusePossibility_Task_Invocation_Analyzer.cs
@@ -25,7 +25,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-using System;
 using System.Linq;
 
 using MalikP.Analyzers.AsyncMethodAnalyzer.Rules.Design;
@@ -36,7 +35,7 @@
 namespace MalikP.Analyzers.AsyncMethodAnalyzer.Analyzers.Specific.Design
 {
     [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class CancellationTokenParameterReusePossibility_Task_Invocation_Analyzer : Abstract_InvocationExpressionSyntax_SyntaxNodeActionDiagnosticAnalyzer
+    public sealed class CancellationTokenParameterReusePossibility_Task_Invocation_Analyzer : Abstract_InvocationExpressionSyntax_SyntaxNodeActionDiagnosticAnalyzer
     {
         private const string _genericTaskType = "System.Threading.Tasks.Task<TResult>";
 

diff --git a/...rs/Specific/Design/CancellationTokenParameterReusePossibility_Void_Invocation_Analyzer.cs b/...rs/Specific/Design/CancellationTokenParameterReusePossibility_Void_Invocation_Analyzer.cs
@@ -35,7 +35,7 @@
 namespace MalikP.Analyzers.AsyncMethodAnalyzer.Analyzers.Specific.Design
 {
     [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class CancellationTokenParameterReusePossibility_Void_Invocation_Analyzer : Abstract_InvocationExpressionSyntax_SyntaxNodeActionDiagnosticAnalyzer
+    public sealed class CancellationTokenParameterReusePossibility_Void_Invocation_Analyzer : Abstract_InvocationExpressionSyntax_SyntaxNodeActionDiagnosticAnalyzer
     {
         protected override DiagnosticDescriptor DiagnosticDescriptor => CancellationTokenParameterReusePossibility_Void_Invocation_Rule.Rule;
 

diff --git a/...odAnalyzer16/Analyzers/Specific/Naming/AsyncMethodNameSuffix_Task_Declaration_Analyzer.cs b/...odAnalyzer16/Analyzers/Specific/Naming/AsyncMethodNameSuffix_Task_Declaration_Analyzer.cs
@@ -25,7 +25,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-using System;
 
 using MalikP.Analyzers.AsyncMethodAnalyzer.Rules.Naming;
 
@@ -35,7 +34,7 @@
 namespace MalikP.Analyzers.AsyncMethodAnalyzer.Analyzers.Specific.Naming
 {
     [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class AsyncMethodNameSuffix_Task_Declaration_Analyzer : Abstract_Method_SymbolActionDiagnosticAnalyze
+    public sealed class AsyncMethodNameSuffix_Task_Declaration_Analyzer : Abstract_Method_SymbolActionDiagnosticAnalyze
     {
         private const string _genericTaskType = "System.Threading.Tasks.Task<TResult>";
 

diff --git a/...odAnalyzer16/Analyzers/Specific/Naming/AsyncMethodNameSuffix_Void_Declaration_Analyzer.cs b/...odAnalyzer16/Analyzers/Specific/Naming/AsyncMethodNameSuffix_Void_Declaration_Analyzer.cs
@@ -25,8 +25,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-using System;
-
 using MalikP.Analyzers.AsyncMethodAnalyzer.Rules.Naming;
 
 using Microsoft.CodeAnalysis;
@@ -35,7 +33,7 @@
 namespace MalikP.Analyzers.AsyncMethodAnalyzer.Analyzers.Specific.Naming
 {
     [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class AsyncMethodNameSuffix_Void_Declaration_Analyzer : Abstract_Method_SymbolActionDiagnosticAnalyze
+    public sealed class AsyncMethodNameSuffix_Void_Declaration_Analyzer : Abstract_Method_SymbolActionDiagnosticAnalyze
     {
         protected override DiagnosticDescriptor DiagnosticDescriptor => MethodMissingAsyncSuffix_Void_Declaration_Rule.Rule;
 

diff --git a/...hodAnalyzer16/Analyzers/Specific/Naming/AsyncMethodNameSuffix_Void_Invocation_Analyzer.cs b/...hodAnalyzer16/Analyzers/Specific/Naming/AsyncMethodNameSuffix_Void_Invocation_Analyzer.cs
@@ -25,8 +25,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-using System;
-
 using MalikP.Analyzers.AsyncMethodAnalyzer.Rules.Naming;
 
 using Microsoft.CodeAnalysis;

diff --git a/...nalyzers.AsyncMethodAnalyzer16/Analyzers/Specific/Naming/CancellationTokenNameAnalyzer.cs b/...nalyzers.AsyncMethodAnalyzer16/Analyzers/Specific/Naming/CancellationTokenNameAnalyzer.cs
@@ -25,8 +25,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-using System;
-
 using MalikP.Analyzers.AsyncMethodAnalyzer.Rules.Naming;
 
 using Microsoft.CodeAnalysis;
@@ -35,7 +33,7 @@
 namespace MalikP.Analyzers.AsyncMethodAnalyzer.Analyzers.Specific.Naming
 {
     [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class CancellationTokenNameAnalyzer : AbstractSymbolActionDiagnosticAnalyzer
+    public sealed class CancellationTokenNameAnalyzer : AbstractSymbolActionDiagnosticAnalyzer
     {
         protected override DiagnosticDescriptor DiagnosticDescriptor => WrongCancellationTokenMethodParameterName_Declaration_Rule.Rule;
 

diff --git a/...cMethodAnalyzer16/CodeFixes/Specific/AddMissingAsyncSuffix_Declaration_CodeFixProvider.cs b/...cMethodAnalyzer16/CodeFixes/Specific/AddMissingAsyncSuffix_Declaration_CodeFixProvider.cs
@@ -28,6 +28,7 @@
 using System.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+
 using MalikP.Analyzers.AsyncMethodAnalyzer.Rules.Naming;
 
 using Microsoft.CodeAnalysis;

diff --git a/...Analyzer/MalikP.Analyzers.AsyncMethodAnalyzer16/Rules/AbstractDiagnosticRuleDescriptor.cs b/...Analyzer/MalikP.Analyzers.AsyncMethodAnalyzer16/Rules/AbstractDiagnosticRuleDescriptor.cs
@@ -38,7 +38,7 @@ protected AbstractDiagnosticRuleDescriptor()
         {
         }
 
-        protected abstract string InternalDiagnosticId { get; }
+        protected abstract string publicDiagnosticId { get; }
 
         protected abstract string Category { get; }
 
@@ -54,7 +54,7 @@ protected static DiagnosticDescriptor Create<T>(T diagnosticRuleDescriptor)
             where T : AbstractDiagnosticRuleDescriptor
         {
             return new DiagnosticDescriptor(
-            diagnosticRuleDescriptor.InternalDiagnosticId,
+            diagnosticRuleDescriptor.publicDiagnosticId,
             diagnosticRuleDescriptor.Title,
             diagnosticRuleDescriptor.MessageFormat,
             diagnosticRuleDescriptor.Category,

diff --git a/...nalyzer16/Rules/Design/CancellationTokenParameterReusePossibility_Task_Invocation_Rule.cs b/...nalyzer16/Rules/Design/CancellationTokenParameterReusePossibility_Task_Invocation_Rule.cs
@@ -29,9 +29,9 @@
 
 namespace MalikP.Analyzers.AsyncMethodAnalyzer.Rules.Design
 {
-    internal sealed class CancellationTokenParameterReusePossibility_Task_Invocation_Rule : AbstractDiagnosticRuleDescriptor
+    public sealed class CancellationTokenParameterReusePossibility_Task_Invocation_Rule : AbstractDiagnosticRuleDescriptor
     {
-        protected override string InternalDiagnosticId => DiagnosticId;
+        protected override string publicDiagnosticId => DiagnosticId;
 
         protected override string Category => AbstractDiagnosticRuleDescriptor.Design;
 
@@ -53,8 +53,8 @@ private CancellationTokenParameterReusePossibility_Task_Invocation_Rule()
         {
         }
 
-        internal static DiagnosticDescriptor Rule { get; }
+        public static DiagnosticDescriptor Rule { get; }
 
-        internal static string DiagnosticId => "AADE006";
+        public static string DiagnosticId => "AADE006";
     }
 }