Merge pull request #2881 from sharwell/update-testing

vweijsters · web-flow · commit 836d74a15e44 · 2019-02-13T20:38:34.000+01:00
Update Microsoft.CodeAnalysis.Testing
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/FileHeaderTestBase.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/FileHeaderTestBase.cs
@@ -121,6 +121,7 @@ protected Task VerifyCSharpFixAsync(string source, DiagnosticResult[] expected,
                 Settings = this.GetSettings(),
             };
 
+            test.Exclusions &= ~AnalysisExclusions.Suppression;
             test.ExpectedDiagnostics.AddRange(expected);
             test.RemainingDiagnostics.AddRange(remainingDiagnostics);
             test.DisabledDiagnostics.AddRange(this.GetDisabledDiagnostics());
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/NoXmlFileHeaderUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/NoXmlFileHeaderUnitTests.cs
@@ -410,6 +410,7 @@ private static Task VerifyCSharpFixAsync(string source, string testSettings, Dia
                 Settings = testSettings,
             };
 
+            test.Exclusions &= ~AnalysisExclusions.Suppression;
             test.ExpectedDiagnostics.AddRange(expected);
             return test.RunAsync(cancellationToken);
         }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ExclusionTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/ExclusionTests.cs
@@ -6,6 +6,7 @@ namespace StyleCop.Analyzers.Test
     using System.Collections.Generic;
     using System.Threading;
     using System.Threading.Tasks;
+    using Microsoft.CodeAnalysis.Testing;
     using Xunit;
     using static StyleCop.Analyzers.Test.Verifiers.StyleCopDiagnosticVerifier<TestHelper.ExclusionTestAnalyzer>;
 
@@ -82,7 +83,7 @@ public async Task TestIsNotExcludedAsync(string filename, string testCode)
         {
             var result = Diagnostic().WithLocation(filename, 1, 1);
 
-            await new CSharpTest
+            var test = new CSharpTest
             {
                 TestSources =
                 {
@@ -92,7 +93,10 @@ public async Task TestIsNotExcludedAsync(string filename, string testCode)
                 {
                     result,
                 },
-            }.RunAsync(CancellationToken.None).ConfigureAwait(false);
+            };
+
+            test.Exclusions &= ~AnalysisExclusions.Suppression;
+            await test.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1503UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1503UnitTests.cs
@@ -350,8 +350,15 @@ public void Bar(int i)
     }
 }";
 
-            var expected = Diagnostic().WithLocation(8, 13);
-            await VerifyCSharpFixAsync(testCode, expected, fixedTestCode, CancellationToken.None).ConfigureAwait(false);
+            var test = new CSharpTest
+            {
+                TestCode = testCode,
+                ExpectedDiagnostics = { Diagnostic().WithLocation(8, 13) },
+                FixedCode = fixedTestCode,
+            };
+
+            test.Exclusions &= ~AnalysisExclusions.Suppression;
+            await test.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <summary>
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1519UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1519UnitTests.cs
@@ -582,8 +582,15 @@ public void Bar(int i)
     }
 }";
 
-            var expected = Diagnostic().WithLocation(8, 13);
-            await VerifyCSharpFixAsync(testCode, expected, fixedTestCode, CancellationToken.None).ConfigureAwait(false);
+            var test = new CSharpTest
+            {
+                TestCode = testCode,
+                ExpectedDiagnostics = { Diagnostic().WithLocation(8, 13) },
+                FixedCode = fixedTestCode,
+            };
+
+            test.Exclusions &= ~AnalysisExclusions.Suppression;
+            await test.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <summary>
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1520UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1520UnitTests.cs
@@ -395,8 +395,15 @@ public void Bar(int i)
     }
 }";
 
-            var expected = Diagnostic().WithLocation(8, 13);
-            await VerifyCSharpFixAsync(testCode, expected, fixedTestCode, CancellationToken.None).ConfigureAwait(false);
+            var test = new CSharpTest
+            {
+                TestCode = testCode,
+                ExpectedDiagnostics = { Diagnostic().WithLocation(8, 13) },
+                FixedCode = fixedTestCode,
+            };
+
+            test.Exclusions &= ~AnalysisExclusions.Suppression;
+            await test.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <summary>
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1119UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1119UnitTests.cs
@@ -1039,6 +1039,14 @@ public void Bar()
         bool flag = false;
         string data = $""{(flag)}"";
     }
+}";
+            string fixedCode = @"class Foo
+{
+    public void Bar()
+    {
+        bool flag = false;
+        string data = $""{ flag}"";
+    }
 }";
             DiagnosticResult[] expected =
             {
@@ -1047,7 +1055,7 @@ public void Bar()
                 Diagnostic(ParenthesesDiagnosticId).WithLocation(6, 31),
             };
 
-            await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
+            await VerifyCSharpFixAsync(testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
         }
 
         [Fact]
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1412UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1412UnitTests.cs
@@ -8,6 +8,7 @@ namespace StyleCop.Analyzers.Test.MaintainabilityRules
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis.CodeFixes;
+    using Microsoft.CodeAnalysis.Testing;
     using Microsoft.CodeAnalysis.Text;
     using Xunit;
     using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
@@ -38,12 +39,15 @@ public async Task TestFileWithWrongEncodingAsync(int codepage)
 
             var expected = Diagnostic().WithLocation(1, 1);
 
-            await new CSharpTest
+            var test = new CSharpTest
             {
                 TestSources = { testCode },
                 ExpectedDiagnostics = { expected },
                 FixedSources = { fixedCode },
-            }.RunAsync(CancellationToken.None).ConfigureAwait(false);
+            };
+
+            test.Exclusions &= ~AnalysisExclusions.Suppression;
+            await test.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
 
         [Fact]
@@ -54,12 +58,15 @@ public async Task TestFileWithUtf8EncodingWithoutBOMAsync()
 
             var expected = Diagnostic().WithLocation(1, 1);
 
-            await new CSharpTest
+            var test = new CSharpTest
             {
                 TestSources = { testCode },
                 ExpectedDiagnostics = { expected },
                 FixedSources = { fixedCode },
-            }.RunAsync(CancellationToken.None).ConfigureAwait(false);
+            };
+
+            test.Exclusions &= ~AnalysisExclusions.Suppression;
+            await test.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
 
         [Theory]
@@ -73,7 +80,7 @@ public async Task TestFixAllAsync(int codepage)
         [Fact]
         public async Task TestFixAllWithMultipleEncodingsAsync()
         {
-            await new CSharpTest
+            var test = new CSharpTest
             {
                 TestSources =
                 {
@@ -95,12 +102,15 @@ public async Task TestFixAllWithMultipleEncodingsAsync()
                 },
                 NumberOfFixAllIterations = 2,
                 NumberOfFixAllInDocumentIterations = 3,
-            }.RunAsync(CancellationToken.None).ConfigureAwait(false);
+            };
+
+            test.Exclusions &= ~AnalysisExclusions.Suppression;
+            await test.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
 
         private async Task TestFixAllExecuterAsync(int codepage, FixAllScope scope)
         {
-            await new CSharpTest
+            var test = new CSharpTest
             {
                 TestSources =
                 {
@@ -119,7 +129,10 @@ private async Task TestFixAllExecuterAsync(int codepage, FixAllScope scope)
                 },
                 NumberOfFixAllIterations = 1,
                 NumberOfFixAllInDocumentIterations = 2,
-            }.RunAsync(CancellationToken.None).ConfigureAwait(false);
+            };
+
+            test.Exclusions &= ~AnalysisExclusions.Suppression;
+            await test.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Settings/SettingsFileCodeFixProviderUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Settings/SettingsFileCodeFixProviderUnitTests.cs
@@ -31,7 +31,7 @@ namespace NamespaceName
         [Fact]
         public async Task TestMissingFileHeaderWithLeadingTriviaAsync()
         {
-            await new CSharpTest
+            var test = new CSharpTest
             {
                 TestCode = TestCode,
                 ExpectedDiagnostics = { Diagnostic(FileHeaderAnalyzers.SA1633DescriptorMissing).WithLocation(1, 1) },
@@ -42,7 +42,10 @@ public async Task TestMissingFileHeaderWithLeadingTriviaAsync()
                     (SettingsHelper.SettingsFileName, SettingsFileCodeFixProvider.DefaultSettingsFileContent),
                 },
                 Settings = null,
-            }.RunAsync(CancellationToken.None).ConfigureAwait(false);
+            };
+
+            test.Exclusions &= ~AnalysisExclusions.Suppression;
+            await test.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -52,7 +55,7 @@ public async Task TestMissingFileHeaderWithLeadingTriviaAsync()
         [Fact]
         public async Task TestSettingsFileDoesNotExistAsync()
         {
-            await new CSharpTest
+            var test = new CSharpTest
             {
                 TestCode = TestCode,
                 ExpectedDiagnostics = { Diagnostic(FileHeaderAnalyzers.SA1633DescriptorMissing).WithLocation(1, 1) },
@@ -63,7 +66,10 @@ public async Task TestSettingsFileDoesNotExistAsync()
                     (SettingsHelper.SettingsFileName, SettingsFileCodeFixProvider.DefaultSettingsFileContent),
                 },
                 Settings = null,
-            }.RunAsync(CancellationToken.None).ConfigureAwait(false);
+            };
+
+            test.Exclusions &= ~AnalysisExclusions.Suppression;
+            await test.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -73,15 +79,18 @@ public async Task TestSettingsFileDoesNotExistAsync()
         [Fact]
         public async Task TestSettingsFileAlreadyExistsAsync()
         {
-            await new CSharpTest
+            var test = new CSharpTest
             {
                 TestCode = TestCode,
                 ExpectedDiagnostics = { Diagnostic(FileHeaderAnalyzers.SA1633DescriptorMissing).WithLocation(1, 1) },
                 FixedCode = TestCode,
                 FixedState = { InheritanceMode = StateInheritanceMode.AutoInheritAll },
                 Settings = "{}",
                 SettingsFileName = SettingsHelper.SettingsFileName,
-            }.RunAsync(CancellationToken.None).ConfigureAwait(false);
+            };
+
+            test.Exclusions &= ~AnalysisExclusions.Suppression;
+            await test.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -91,15 +100,18 @@ public async Task TestSettingsFileAlreadyExistsAsync()
         [Fact]
         public async Task TestDotPrefixedSettingsFileAlreadyExistsAsync()
         {
-            await new CSharpTest
+            var test = new CSharpTest
             {
                 TestCode = TestCode,
                 ExpectedDiagnostics = { Diagnostic(FileHeaderAnalyzers.SA1633DescriptorMissing).WithLocation(1, 1) },
                 FixedCode = TestCode,
                 FixedState = { InheritanceMode = StateInheritanceMode.AutoInheritAll },
                 Settings = "{}",
                 SettingsFileName = SettingsHelper.AltSettingsFileName,
-            }.RunAsync(CancellationToken.None).ConfigureAwait(false);
+            };
+
+            test.Exclusions &= ~AnalysisExclusions.Suppression;
+            await test.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj
@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis" Version="1.2.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.0.0-beta1-63310-01" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.0.0-beta1-63812-02" />
     <PackageReference Include="Microsoft.VisualStudio.Composition" Version="15.6.36" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/DiagnosticVerifierTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/DiagnosticVerifierTests.cs

Original file line number	Diff line number	Diff line change
`@@ -410,6 +410,7 @@ private static Task VerifyCSharpFixAsync(string source, string testSettings, Dia`
`410`	`410`	`Settings = testSettings,`
`411`	`411`	`};`
`412`	`412`
	`413`	`+ test.Exclusions &= ~AnalysisExclusions.Suppression;`
`413`	`414`	`test.ExpectedDiagnostics.AddRange(expected);`
`414`	`415`	`return test.RunAsync(cancellationToken);`
`415`	`416`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ namespace StyleCop.Analyzers.Test`
`6`	`6`	`using System.Collections.Generic;`
`7`	`7`	`using System.Threading;`
`8`	`8`	`using System.Threading.Tasks;`
	`9`	`+ using Microsoft.CodeAnalysis.Testing;`
`9`	`10`	`using Xunit;`
`10`	`11`	`using static StyleCop.Analyzers.Test.Verifiers.StyleCopDiagnosticVerifier<TestHelper.ExclusionTestAnalyzer>;`
`11`	`12`
`@@ -82,7 +83,7 @@ public async Task TestIsNotExcludedAsync(string filename, string testCode)`
`82`	`83`	`{`
`83`	`84`	`var result = Diagnostic().WithLocation(filename, 1, 1);`
`84`	`85`
`85`		`- await new CSharpTest`
	`86`	`+ var test = new CSharpTest`
`86`	`87`	`{`
`87`	`88`	`TestSources =`
`88`	`89`	`{`
`@@ -92,7 +93,10 @@ public async Task TestIsNotExcludedAsync(string filename, string testCode)`
`92`	`93`	`{`
`93`	`94`	`result,`
`94`	`95`	`},`
`95`		`- }.RunAsync(CancellationToken.None).ConfigureAwait(false);`
	`96`	`+ };`
	`97`	`+`
	`98`	`+ test.Exclusions &= ~AnalysisExclusions.Suppression;`
	`99`	`+ await test.RunAsync(CancellationToken.None).ConfigureAwait(false);`
`96`	`100`	`}`
`97`	`101`	`}`
`98`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ namespace StyleCop.Analyzers.Test.MaintainabilityRules`
`8`	`8`	`using System.Threading;`
`9`	`9`	`using System.Threading.Tasks;`
`10`	`10`	`using Microsoft.CodeAnalysis.CodeFixes;`
	`11`	`+ using Microsoft.CodeAnalysis.Testing;`
`11`	`12`	`using Microsoft.CodeAnalysis.Text;`
`12`	`13`	`using Xunit;`
`13`	`14`	`using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<`
`@@ -38,12 +39,15 @@ public async Task TestFileWithWrongEncodingAsync(int codepage)`
`38`	`39`
`39`	`40`	`var expected = Diagnostic().WithLocation(1, 1);`
`40`	`41`
`41`		`- await new CSharpTest`
	`42`	`+ var test = new CSharpTest`
`42`	`43`	`{`
`43`	`44`	`TestSources = { testCode },`
`44`	`45`	`ExpectedDiagnostics = { expected },`
`45`	`46`	`FixedSources = { fixedCode },`
`46`		`- }.RunAsync(CancellationToken.None).ConfigureAwait(false);`
	`47`	`+ };`
	`48`	`+`
	`49`	`+ test.Exclusions &= ~AnalysisExclusions.Suppression;`
	`50`	`+ await test.RunAsync(CancellationToken.None).ConfigureAwait(false);`
`47`	`51`	`}`
`48`	`52`
`49`	`53`	`[Fact]`
`@@ -54,12 +58,15 @@ public async Task TestFileWithUtf8EncodingWithoutBOMAsync()`
`54`	`58`
`55`	`59`	`var expected = Diagnostic().WithLocation(1, 1);`
`56`	`60`
`57`		`- await new CSharpTest`
	`61`	`+ var test = new CSharpTest`
`58`	`62`	`{`
`59`	`63`	`TestSources = { testCode },`
`60`	`64`	`ExpectedDiagnostics = { expected },`
`61`	`65`	`FixedSources = { fixedCode },`
`62`		`- }.RunAsync(CancellationToken.None).ConfigureAwait(false);`
	`66`	`+ };`
	`67`	`+`
	`68`	`+ test.Exclusions &= ~AnalysisExclusions.Suppression;`
	`69`	`+ await test.RunAsync(CancellationToken.None).ConfigureAwait(false);`
`63`	`70`	`}`
`64`	`71`
`65`	`72`	`[Theory]`
`@@ -73,7 +80,7 @@ public async Task TestFixAllAsync(int codepage)`
`73`	`80`	`[Fact]`
`74`	`81`	`public async Task TestFixAllWithMultipleEncodingsAsync()`
`75`	`82`	`{`
`76`		`- await new CSharpTest`
	`83`	`+ var test = new CSharpTest`
`77`	`84`	`{`
`78`	`85`	`TestSources =`
`79`	`86`	`{`
`@@ -95,12 +102,15 @@ public async Task TestFixAllWithMultipleEncodingsAsync()`
`95`	`102`	`},`
`96`	`103`	`NumberOfFixAllIterations = 2,`
`97`	`104`	`NumberOfFixAllInDocumentIterations = 3,`
`98`		`- }.RunAsync(CancellationToken.None).ConfigureAwait(false);`
	`105`	`+ };`
	`106`	`+`
	`107`	`+ test.Exclusions &= ~AnalysisExclusions.Suppression;`
	`108`	`+ await test.RunAsync(CancellationToken.None).ConfigureAwait(false);`
`99`	`109`	`}`
`100`	`110`
`101`	`111`	`private async Task TestFixAllExecuterAsync(int codepage, FixAllScope scope)`
`102`	`112`	`{`
`103`		`- await new CSharpTest`
	`113`	`+ var test = new CSharpTest`
`104`	`114`	`{`
`105`	`115`	`TestSources =`
`106`	`116`	`{`
`@@ -119,7 +129,10 @@ private async Task TestFixAllExecuterAsync(int codepage, FixAllScope scope)`
`119`	`129`	`},`
`120`	`130`	`NumberOfFixAllIterations = 1,`
`121`	`131`	`NumberOfFixAllInDocumentIterations = 2,`
`122`		`- }.RunAsync(CancellationToken.None).ConfigureAwait(false);`
	`132`	`+ };`
	`133`	`+`
	`134`	`+ test.Exclusions &= ~AnalysisExclusions.Suppression;`
	`135`	`+ await test.RunAsync(CancellationToken.None).ConfigureAwait(false);`
`123`	`136`	`}`
`124`	`137`	`}`
`125`	`138`	`}`