Update unit tests to Microsoft.CodeAnalysis.Testing

NuGet.config

@@ -2,6 +2,7 @@
 <configuration>
   <packageSources>
     <add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
+    <add key="roslyn-analyzers" value="https://dotnet.myget.org/F/roslyn-analyzers/api/v3/index.json" />
     <add key="symreader-converter" value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />
   </packageSources>
 </configuration>

StyleCop.Analyzers/Directory.Build.props

@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <LangVersion>7</LangVersion>
+    <LangVersion>7.2</LangVersion>
     <Features>strict</Features>
   </PropertyGroup>
 

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/MaintainabilityRules/SA1119CodeFixProvider.cs

@@ -27,7 +27,7 @@ internal class SA1119CodeFixProvider : CodeFixProvider
     {
         /// <inheritdoc/>
         public override ImmutableArray<string> FixableDiagnosticIds { get; } =
-            ImmutableArray.Create(SA1119StatementMustNotUseUnnecessaryParenthesis.DiagnosticId);
+            ImmutableArray.Create(SA1119StatementMustNotUseUnnecessaryParenthesis.DiagnosticId, SA1119StatementMustNotUseUnnecessaryParenthesis.ParenthesesDiagnosticId);
 
         /// <inheritdoc/>
         public override FixAllProvider GetFixAllProvider()
@@ -42,6 +42,11 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
 
             foreach (var diagnostic in context.Diagnostics)
             {
+                if (diagnostic.Id != SA1119StatementMustNotUseUnnecessaryParenthesis.DiagnosticId)
+                {
+                    continue;
+                }
+
                 SyntaxNode node = root.FindNode(diagnostic.Location.SourceSpan, getInnermostNodeForTie: true, findInsideTrivia: true);
                 if (node.IsMissing)
                 {

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/AnalyzerConfigurationTestsCSharp7.cs

@@ -0,0 +1,9 @@
+// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
+// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
+
+namespace StyleCop.Analyzers.Test.CSharp7
+{
+    public class AnalyzerConfigurationTestsCSharp7 : AnalyzerConfigurationTests
+    {
+    }
+}

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/DocumentationRules/SA1600CSharp7UnitTests.cs

@@ -4,14 +4,13 @@
 namespace StyleCop.Analyzers.Test.CSharp7.DocumentationRules
 {
     using System.Threading.Tasks;
-    using Microsoft.CodeAnalysis;
     using Microsoft.CodeAnalysis.CSharp;
     using StyleCop.Analyzers.Test.DocumentationRules;
     using Xunit;
 
     public class SA1600CSharp7UnitTests : SA1600UnitTests
     {
-        private string currentTestSettings;
+        protected override LanguageVersion LanguageVersion => LanguageVersion.CSharp7_2;
 
         [Fact]
         public async Task TestPrivateProtectedDelegateWithoutDocumentationAsync()
@@ -52,10 +51,10 @@ public async Task TestPrivateProtectedConstructorWithDocumentationAsync()
         [Fact]
         public async Task TestPrivateProtectedFieldWithoutDocumentationAsync()
         {
-            await this.TestFieldDeclarationDocumentationAsync("private protected", true, false).ConfigureAwait(false);
+            await this.TestFieldDeclarationDocumentationAsync(testSettings: null, "private protected", true, false).ConfigureAwait(false);
 
             // Re-test with the 'documentPrivateElements' setting enabled (doesn't impact fields)
-            this.currentTestSettings = @"
+            var testSettings = @"
 {
   ""settings"": {
     ""documentationRules"": {
@@ -65,10 +64,10 @@ public async Task TestPrivateProtectedFieldWithoutDocumentationAsync()
 }
 ";
 
-            await this.TestFieldDeclarationDocumentationAsync("private protected", true, false).ConfigureAwait(false);
+            await this.TestFieldDeclarationDocumentationAsync(testSettings, "private protected", true, false).ConfigureAwait(false);
 
             // Re-test with the 'documentInternalElements' setting disabled (does impact fields)
-            this.currentTestSettings = @"
+            testSettings = @"
 {
   ""settings"": {
     ""documentationRules"": {
@@ -78,10 +77,10 @@ public async Task TestPrivateProtectedFieldWithoutDocumentationAsync()
 }
 ";
 
-            await this.TestFieldDeclarationDocumentationAsync("private protected", false, false).ConfigureAwait(false);
+            await this.TestFieldDeclarationDocumentationAsync(testSettings, "private protected", false, false).ConfigureAwait(false);
 
             // Re-test with the 'documentPrivateFields' setting enabled (does impact fields)
-            this.currentTestSettings = @"
+            testSettings = @"
 {
   ""settings"": {
     ""documentationRules"": {
@@ -91,16 +90,16 @@ public async Task TestPrivateProtectedFieldWithoutDocumentationAsync()
 }
 ";
 
-            await this.TestFieldDeclarationDocumentationAsync("private protected", true, false).ConfigureAwait(false);
+            await this.TestFieldDeclarationDocumentationAsync(testSettings, "private protected", true, false).ConfigureAwait(false);
         }
 
         [Fact]
         public async Task TestPrivateProtectedFieldWithDocumentationAsync()
         {
-            await this.TestFieldDeclarationDocumentationAsync("private protected", false, true).ConfigureAwait(false);
+            await this.TestFieldDeclarationDocumentationAsync(testSettings: null, "private protected", false, true).ConfigureAwait(false);
 
             // Re-test with the 'documentPrivateElements' setting enabled (doesn't impact fields)
-            this.currentTestSettings = @"
+            var testSettings = @"
 {
   ""settings"": {
     ""documentationRules"": {
@@ -110,10 +109,10 @@ public async Task TestPrivateProtectedFieldWithDocumentationAsync()
 }
 ";
 
-            await this.TestFieldDeclarationDocumentationAsync("private protected", false, true).ConfigureAwait(false);
+            await this.TestFieldDeclarationDocumentationAsync(testSettings, "private protected", false, true).ConfigureAwait(false);
 
             // Re-test with the 'documentInternalElements' setting disabled (does impact fields)
-            this.currentTestSettings = @"
+            testSettings = @"
 {
   ""settings"": {
     ""documentationRules"": {
@@ -123,10 +122,10 @@ public async Task TestPrivateProtectedFieldWithDocumentationAsync()
 }
 ";
 
-            await this.TestFieldDeclarationDocumentationAsync("private protected", false, true).ConfigureAwait(false);
+            await this.TestFieldDeclarationDocumentationAsync(testSettings, "private protected", false, true).ConfigureAwait(false);
 
             // Re-test with the 'documentPrivateFields' setting enabled (does impact fields)
-            this.currentTestSettings = @"
+            testSettings = @"
 {
   ""settings"": {
     ""documentationRules"": {
@@ -136,7 +135,7 @@ public async Task TestPrivateProtectedFieldWithDocumentationAsync()
 }
 ";
 
-            await this.TestFieldDeclarationDocumentationAsync("private protected", false, true).ConfigureAwait(false);
+            await this.TestFieldDeclarationDocumentationAsync(testSettings, "private protected", false, true).ConfigureAwait(false);
         }
 
         [Fact]
@@ -187,18 +186,6 @@ public async Task TestPrivateProtectedEventFieldWithDocumentationAsync()
             await this.TestEventFieldDeclarationDocumentationAsync("private protected", false, true).ConfigureAwait(false);
         }
 
-        protected override string GetSettings()
-        {
-            return this.currentTestSettings ?? base.GetSettings();
-        }
-
-        protected override Project CreateProjectImpl(string[] sources, string language, string[] filenames)
-        {
-            var project = base.CreateProjectImpl(sources, language, filenames);
-            var parseOptions = (CSharpParseOptions)project.ParseOptions;
-            return project.WithParseOptions(parseOptions.WithLanguageVersion(LanguageVersion.CSharp7_2));
-        }
-
         protected override async Task TestTypeWithoutDocumentationAsync(string type, bool isInterface)
         {
             await base.TestTypeWithoutDocumentationAsync(type, isInterface).ConfigureAwait(false);

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/DocumentationRules/SA1623CSharp7UnitTests.cs

@@ -8,6 +8,9 @@ namespace StyleCop.Analyzers.Test.CSharp7.DocumentationRules
     using StyleCop.Analyzers.DocumentationRules;
     using StyleCop.Analyzers.Test.DocumentationRules;
     using Xunit;
+    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
+        StyleCop.Analyzers.DocumentationRules.PropertySummaryDocumentationAnalyzer,
+        StyleCop.Analyzers.DocumentationRules.PropertySummaryDocumentationCodeFixProvider>;
 
     public class SA1623CSharp7UnitTests : SA1623UnitTests
     {
@@ -71,11 +74,8 @@ public class TestClass
 }}
 ";
 
-            var expected = this.CSharpDiagnostic(PropertySummaryDocumentationAnalyzer.SA1623Descriptor).WithLocation(9, 7 + accessibility.Length + type.Length).WithArguments(expectedArgument);
-
-            await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
-            await this.VerifyCSharpDiagnosticAsync(fixedTestCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
-            await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
+            var expected = Diagnostic(PropertySummaryDocumentationAnalyzer.SA1623Descriptor).WithLocation(9, 7 + accessibility.Length + type.Length).WithArguments(expectedArgument);
+            await VerifyCSharpFixAsync(testCode, expected, fixedTestCode, CancellationToken.None).ConfigureAwait(false);
         }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/DocumentationRules/SA1624CSharp7UnitTests.cs

@@ -8,6 +8,9 @@ namespace StyleCop.Analyzers.Test.CSharp7.DocumentationRules
     using StyleCop.Analyzers.DocumentationRules;
     using StyleCop.Analyzers.Test.DocumentationRules;
     using Xunit;
+    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
+        StyleCop.Analyzers.DocumentationRules.PropertySummaryDocumentationAnalyzer,
+        StyleCop.Analyzers.DocumentationRules.PropertySummaryDocumentationCodeFixProvider>;
 
     public class SA1624CSharp7UnitTests : SA1624UnitTests
     {
@@ -69,11 +72,8 @@ public class TestClass
 }}
 ";
 
-            var expected = this.CSharpDiagnostic(PropertySummaryDocumentationAnalyzer.SA1624Descriptor).WithLocation(9, 7 + accessibility.Length + type.Length).WithArguments(expectedArgument1, expectedArgument2);
-
-            await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
-            await this.VerifyCSharpDiagnosticAsync(fixedTestCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
-            await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
+            var expected = Diagnostic(PropertySummaryDocumentationAnalyzer.SA1624Descriptor).WithLocation(9, 7 + accessibility.Length + type.Length).WithArguments(expectedArgument1, expectedArgument2);
+            await VerifyCSharpFixAsync(testCode, expected, fixedTestCode, CancellationToken.None).ConfigureAwait(false);
         }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/LayoutRules/SA1500CSharp7UnitTests.cs

@@ -5,9 +5,13 @@ namespace StyleCop.Analyzers.Test.CSharp7.LayoutRules
 {
     using System.Threading;
     using System.Threading.Tasks;
+    using Microsoft.CodeAnalysis.Testing;
     using StyleCop.Analyzers.Test.LayoutRules;
     using TestHelper;
     using Xunit;
+    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
+        StyleCop.Analyzers.LayoutRules.SA1500BracesForMultiLineStatementsMustNotShareLine,
+        StyleCop.Analyzers.LayoutRules.SA1500CodeFixProvider>;
 
     public class SA1500CSharp7UnitTests : SA1500UnitTests
     {
@@ -50,7 +54,7 @@ void LocalFunction5()
     }
 }";
 
-            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+            await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -141,28 +145,26 @@ void LocalFunction6()
             DiagnosticResult[] expectedDiagnostics =
             {
                 // Invalid local function #1
-                this.CSharpDiagnostic().WithLocation(8, 31),
+                Diagnostic().WithLocation(8, 31),
 
                 // Invalid local function #2
-                this.CSharpDiagnostic().WithLocation(12, 31),
+                Diagnostic().WithLocation(12, 31),
 
                 // Invalid local function #3
-                this.CSharpDiagnostic().WithLocation(17, 31),
-                this.CSharpDiagnostic().WithLocation(18, 29),
+                Diagnostic().WithLocation(17, 31),
+                Diagnostic().WithLocation(18, 29),
 
                 // Invalid local function #4
-                this.CSharpDiagnostic().WithLocation(21, 31),
+                Diagnostic().WithLocation(21, 31),
 
                 // Invalid local function #5
-                this.CSharpDiagnostic().WithLocation(27, 29),
+                Diagnostic().WithLocation(27, 29),
 
                 // Invalid local function #6
-                this.CSharpDiagnostic().WithLocation(31, 9),
+                Diagnostic().WithLocation(31, 9),
             };
 
-            await this.VerifyCSharpDiagnosticAsync(testCode, expectedDiagnostics, CancellationToken.None).ConfigureAwait(false);
-            await this.VerifyCSharpDiagnosticAsync(fixedTestCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
-            await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
+            await VerifyCSharpFixAsync(testCode, expectedDiagnostics, fixedTestCode, CancellationToken.None).ConfigureAwait(false);
         }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/LayoutRules/SA1502CSharp7UnitTests.cs

@@ -5,8 +5,12 @@ namespace StyleCop.Analyzers.Test.CSharp7.LayoutRules
 {
     using System.Threading;
     using System.Threading.Tasks;
+    using Microsoft.CodeAnalysis.Testing;
     using StyleCop.Analyzers.Test.LayoutRules;
     using Xunit;
+    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
+        StyleCop.Analyzers.LayoutRules.SA1502ElementMustNotBeOnASingleLine,
+        StyleCop.Analyzers.LayoutRules.SA1502CodeFixProvider>;
 
     public class SA1502CSharp7UnitTests : SA1502UnitTests
     {
@@ -27,7 +31,7 @@ void Bar()
     }
 }";
 
-            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+            await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -45,8 +49,8 @@ void Bar() { }
     }
 }";
 
-            var expected = this.CSharpDiagnostic().WithLocation(5, 20);
-            await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
+            var expected = Diagnostic().WithLocation(5, 20);
+            await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -64,8 +68,8 @@ public void Method()
     }
 }";
 
-            var expected = this.CSharpDiagnostic().WithLocation(5, 19);
-            await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
+            var expected = Diagnostic().WithLocation(5, 19);
+            await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -84,8 +88,8 @@ int Bar()
     }
 }";
 
-            var expected = this.CSharpDiagnostic().WithLocation(6, 9);
-            await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
+            var expected = Diagnostic().WithLocation(6, 9);
+            await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -104,7 +108,7 @@ int Bar() {
     }
 }";
 
-            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+            await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -122,7 +126,7 @@ public void Method()
     }
 }";
 
-            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+            await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -149,7 +153,8 @@ void Bar()
     }
 }";
 
-            await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
+            var expected = Diagnostic().WithLocation(5, 20);
+            await VerifyCSharpFixAsync(testCode, expected, fixedTestCode, CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -177,7 +182,8 @@ int Bar()
     }
 }";
 
-            await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
+            var expected = Diagnostic().WithLocation(5, 19);
+            await VerifyCSharpFixAsync(testCode, expected, fixedTestCode, CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -206,7 +212,8 @@ int Bar()
     }
 }";
 
-            await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
+            var expected = Diagnostic().WithLocation(6, 9);
+            await VerifyCSharpFixAsync(testCode, expected, fixedTestCode, CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -234,7 +241,8 @@ int Bar() /* TR1 */
     }
 }";
 
-            await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
+            var expected = Diagnostic().WithLocation(5, 29);
+            await VerifyCSharpFixAsync(testCode, expected, fixedTestCode, CancellationToken.None).ConfigureAwait(false);
         }
     }
 }