Convert AnalyzerExtensionsTests and ExclusionTests to the new test helpers

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test/AnalyzerExtensionsTests.cs

@@ -12,10 +12,10 @@ namespace StyleCop.Analyzers.Test
     using Microsoft.CodeAnalysis.CSharp.Syntax;
     using Microsoft.CodeAnalysis.Diagnostics;
     using StyleCop.Analyzers.SpecialRules;
-    using TestHelper;
+    using StyleCop.Analyzers.Test.Verifiers;
     using Xunit;
 
-    public class AnalyzerExtensionsTests : DiagnosticVerifier
+    public class AnalyzerExtensionsTests
     {
         private bool invokedBlockCallback;
         private bool invokedMethodDeclarationCallback;
@@ -32,16 +32,15 @@ void MethodName()
 }
 ";
 
-            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+            await new CSharpTest(this)
+            {
+                TestCode = testCode,
+            }.RunAsync(CancellationToken.None).ConfigureAwait(false);
+
             Assert.True(this.invokedBlockCallback);
             Assert.True(this.invokedMethodDeclarationCallback);
         }
 
-        protected override IEnumerable<DiagnosticAnalyzer> GetCSharpDiagnosticAnalyzers()
-        {
-            yield return new CompilationStartDiagnosticAnalyzer { AnalyzerExtensionsTests = this };
-        }
-
         /// <summary>
         /// Note that I wanted to just extend <see cref="SA0002InvalidSettingsFile"/>, but errors in the meta analyzers
         /// were resulting in AD0001 during the build.
@@ -92,5 +91,20 @@ public override void Initialize(AnalysisContext context)
                     });
             }
         }
+
+        private class CSharpTest : StyleCopDiagnosticVerifier<CompilationStartDiagnosticAnalyzer>.CSharpTest
+        {
+            private readonly AnalyzerExtensionsTests analyzerExtensionsTests;
+
+            public CSharpTest(AnalyzerExtensionsTests analyzerExtensionsTests)
+            {
+                this.analyzerExtensionsTests = analyzerExtensionsTests;
+            }
+
+            protected override IEnumerable<DiagnosticAnalyzer> GetDiagnosticAnalyzers()
+            {
+                yield return new CompilationStartDiagnosticAnalyzer { AnalyzerExtensionsTests = this.analyzerExtensionsTests };
+            }
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers.Test/ExclusionTests.cs

@@ -6,14 +6,13 @@ namespace StyleCop.Analyzers.Test
     using System.Collections.Generic;
     using System.Threading;
     using System.Threading.Tasks;
-    using Microsoft.CodeAnalysis.Diagnostics;
-    using TestHelper;
     using Xunit;
+    using static StyleCop.Analyzers.Test.Verifiers.StyleCopDiagnosticVerifier<TestHelper.ExclusionTestAnalyzer>;
 
     /// <summary>
     /// Unit tests for testing exclusion of auto generated files.
     /// </summary>
-    public class ExclusionTests : DiagnosticVerifier
+    public class ExclusionTests
     {
         /// <summary>
         /// Gets the statements that will be used in the theory test cases.
@@ -62,7 +61,13 @@ public static IEnumerable<object[]> ShouldNotBeExcluded
         [MemberData(nameof(ShouldBeExcluded))]
         public async Task TestIsExcludedAsync(string filename, string testCode)
         {
-            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None, filename: filename).ConfigureAwait(false);
+            await new CSharpTest
+            {
+                TestSources =
+                {
+                    (filename, testCode),
+                },
+            }.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -75,15 +80,19 @@ public async Task TestIsExcludedAsync(string filename, string testCode)
         [MemberData(nameof(ShouldNotBeExcluded))]
         public async Task TestIsNotExcludedAsync(string filename, string testCode)
         {
-            var result = this.CSharpDiagnostic().WithLocation(filename, 1, 1);
-
-            await this.VerifyCSharpDiagnosticAsync(testCode, result, CancellationToken.None, filename: filename).ConfigureAwait(false);
-        }
+            var result = Diagnostic().WithLocation(filename, 1, 1);
 
-        /// <inheritdoc/>
-        protected override IEnumerable<DiagnosticAnalyzer> GetCSharpDiagnosticAnalyzers()
-        {
-            yield return new ExclusionTestAnalyzer();
+            await new CSharpTest
+            {
+                TestSources =
+                {
+                    (filename, testCode),
+                },
+                ExpectedDiagnostics =
+                {
+                    result,
+                },
+            }.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1503UnitTests.cs

@@ -522,7 +522,7 @@ public void Bar(int i)
                 await test.RunAsync(CancellationToken.None).ConfigureAwait(false);
 
                 // Test again with the fixedCode as the test code
-                test.TestSources[0] = fixedCode;
+                test.TestSources[0] = (test.TestSources[0].filename, fixedCode);
                 await test.RunAsync(CancellationToken.None).ConfigureAwait(false);
             }
         }

StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj

@@ -17,6 +17,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis" Version="1.2.1" />
     <PackageReference Include="Microsoft.VisualStudio.Composition" Version="15.6.36" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" PrivateAssets="all" />
   </ItemGroup>