Update after code review

Author: bjornhellander

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp12/ReadabilityRules/SA1130CSharp12UnitTests.cs

@@ -6,55 +6,18 @@ namespace StyleCop.Analyzers.Test.CSharp12.ReadabilityRules
     using Microsoft.CodeAnalysis.Testing;
     using StyleCop.Analyzers.Test.CSharp11.ReadabilityRules;
 
-    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
-        StyleCop.Analyzers.ReadabilityRules.SA1130UseLambdaSyntax,
-        StyleCop.Analyzers.ReadabilityRules.SA1130CodeFixProvider>;
-
     public partial class SA1130CSharp12UnitTests : SA1130CSharp11UnitTests
     {
-        protected override DiagnosticResult[] GetExpectedResultCodeFixSpecialCases()
+        protected override DiagnosticResult[] GetCompilerExpectedResultCodeFixSpecialCases()
         {
             return new[]
             {
-                Diagnostic().WithLocation(8, 20),
-                Diagnostic().WithLocation(9, 20),
-                Diagnostic().WithLocation(10, 25),
-                Diagnostic().WithLocation(11, 30),
-                Diagnostic().WithLocation(12, 30),
                 DiagnosticResult.CompilerError("CS1065").WithLocation(12, 53),
-                Diagnostic().WithLocation(13, 30),
                 DiagnosticResult.CompilerError("CS7014").WithLocation(13, 47),
-                Diagnostic().WithLocation(14, 30),
                 DiagnosticResult.CompilerError("CS1670").WithLocation(14, 47),
-                Diagnostic().WithLocation(15, 25),
                 DiagnosticResult.CompilerError("CS1669").WithLocation(15, 42),
                 DiagnosticResult.CompilerError("CS0225").WithLocation(14, 47),
             };
         }
-
-        protected override DiagnosticResult[] GetExpectedResultAfterFixCodeFixSpecialCases()
-        {
-            return new DiagnosticResult[]
-            {
-                Diagnostic().WithLocation(12, 30),
-                DiagnosticResult.CompilerError("CS1065").WithLocation(12, 53),
-                Diagnostic().WithLocation(13, 30),
-                DiagnosticResult.CompilerError("CS7014").WithLocation(13, 47),
-                Diagnostic().WithLocation(14, 30),
-                DiagnosticResult.CompilerError("CS1670").WithLocation(14, 47),
-                Diagnostic().WithLocation(15, 25),
-                DiagnosticResult.CompilerError("CS1669").WithLocation(15, 42),
-                DiagnosticResult.CompilerError("CS0225").WithLocation(14, 47),
-            };
-        }
-
-        protected override DiagnosticResult[] GetExpectedResultVerifyInvalidCodeConstructions()
-        {
-            return new[]
-            {
-                Diagnostic().WithSpan(4, 50, 4, 58),
-                DiagnosticResult.CompilerError("CS1660").WithLocation(4, 50),
-            };
-        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1130UnitTests.cs

@@ -6,6 +6,7 @@
 namespace StyleCop.Analyzers.Test.ReadabilityRules
 {
     using System.Diagnostics.CodeAnalysis;
+    using System.Linq;
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis;
@@ -190,14 +191,14 @@ internal class TypeName
 {
     private void Method(object o)
     {
-        Action a = delegate() { Console.WriteLine(); };
-        Action b = delegate() { Console.WriteLine(); };
-        Action<int> c = delegate(int x) { Console.WriteLine(); };
-        Action<int, int> d = delegate(int x, int y) { Console.WriteLine(); };
-        Action<int, int> e = delegate (int x, int y = 0) { Console.WriteLine(); };
-        Action<int, int> f = delegate (int x, [Obsolete]int y) { Console.WriteLine(); };
-        Action<int, int> g = delegate (int x, params int y) { Console.WriteLine(); };
-        Action<int> h = delegate (int x, __arglist) { Console.WriteLine(); };
+        Action a = [|delegate|]() { Console.WriteLine(); };
+        Action b = [|delegate|]() { Console.WriteLine(); };
+        Action<int> c = [|delegate|](int x) { Console.WriteLine(); };
+        Action<int, int> d = [|delegate|](int x, int y) { Console.WriteLine(); };
+        Action<int, int> e = [|delegate|] (int x, int y = 0) { Console.WriteLine(); };
+        Action<int, int> f = [|delegate|] (int x, [Obsolete]int y) { Console.WriteLine(); };
+        Action<int, int> g = [|delegate|] (int x, params int y) { Console.WriteLine(); };
+        Action<int> h = [|delegate|] (int x, __arglist) { Console.WriteLine(); };
     }
 }";
 
@@ -219,9 +220,16 @@ private void Method(object o)
     }
 }";
 
-            var expected = this.GetExpectedResultCodeFixSpecialCases();
+            var expected = this.GetCompilerExpectedResultCodeFixSpecialCases();
 
-            var expectedAfterFix = this.GetExpectedResultAfterFixCodeFixSpecialCases();
+            var expectedAfterFix = this.GetCompilerExpectedResultCodeFixSpecialCases()
+                .Concat(new[]
+                {
+                    Diagnostic().WithLocation(12, 30),
+                    Diagnostic().WithLocation(13, 30),
+                    Diagnostic().WithLocation(14, 30),
+                    Diagnostic().WithLocation(15, 25),
+                });
 
             var test = new CSharpTest
             {
@@ -801,11 +809,14 @@ public async Task VerifyInvalidCodeConstructionsAsync()
             var testCode = @"using System;
 public class TestClass
 {
-    public static EventHandler[] TestMethod() => delegate { };
+    public static EventHandler[] TestMethod() => [|delegate|] { };
 }
 ";
 
-            var expected = this.GetExpectedResultVerifyInvalidCodeConstructions();
+            var expected = new[]
+            {
+                DiagnosticResult.CompilerError("CS1660").WithLocation(4, 50),
+            };
 
             var test = new CSharpTest
             {
@@ -984,47 +995,15 @@ public void Test()
             await VerifyCSharpFixAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, fixedCode, CancellationToken.None).ConfigureAwait(false);
         }
 
-        protected virtual DiagnosticResult[] GetExpectedResultCodeFixSpecialCases()
+        protected virtual DiagnosticResult[] GetCompilerExpectedResultCodeFixSpecialCases()
         {
             return new[]
             {
-                Diagnostic().WithLocation(8, 20),
-                Diagnostic().WithLocation(9, 20),
-                Diagnostic().WithLocation(10, 25),
-                Diagnostic().WithLocation(11, 30),
-                Diagnostic().WithLocation(12, 30),
                 Diagnostic(CS1065).WithLocation(12, 53),
-                Diagnostic().WithLocation(13, 30),
                 Diagnostic(CS7014).WithLocation(13, 47),
-                Diagnostic().WithLocation(14, 30),
                 Diagnostic(CS1670).WithLocation(14, 47),
-                Diagnostic().WithLocation(15, 25),
                 Diagnostic(CS1669).WithLocation(15, 42),
             };
         }
-
-        protected virtual DiagnosticResult[] GetExpectedResultAfterFixCodeFixSpecialCases()
-        {
-            return new[]
-            {
-                Diagnostic().WithLocation(12, 30),
-                Diagnostic(CS1065).WithLocation(12, 53),
-                Diagnostic().WithLocation(13, 30),
-                Diagnostic(CS7014).WithLocation(13, 47),
-                Diagnostic().WithLocation(14, 30),
-                Diagnostic(CS1670).WithLocation(14, 47),
-                Diagnostic().WithLocation(15, 25),
-                Diagnostic(CS1669).WithLocation(15, 42),
-            };
-        }
-
-        protected virtual DiagnosticResult[] GetExpectedResultVerifyInvalidCodeConstructions()
-        {
-            return new[]
-            {
-                Diagnostic().WithSpan(4, 50, 4, 58),
-                DiagnosticResult.CompilerError("CS1660").WithMessage("Cannot convert anonymous method to type 'EventHandler[]' because it is not a delegate type").WithSpan(4, 50, 4, 62),
-            };
-        }
     }
 }