Merge pull request #3287 from sharwell/update-testing

sharwell · web-flow · commit 5b6d5be51ea7 · 2020-12-29T15:38:48.000-08:00
Update Microsoft.CodeAnalysis.Testing to 1.0.1-beta1.20623.3
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/LayoutRules/SA1516CSharp9UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/LayoutRules/SA1516CSharp9UnitTests.cs
@@ -37,25 +37,20 @@ public async Task TestStatementSpacingInTopLevelProgramAsync()
             await new CSharpTest(LanguageVersion.CSharp9)
             {
                 ReferenceAssemblies = ReferenceAssemblies.Net.Net50,
-                TestCode = testCode,
-                ExpectedDiagnostics =
+                TestState =
                 {
-                    // /0/Test0.cs(3,1): warning SA1516: Elements should be separated by blank line
-                    Diagnostic().WithLocation(0),
-
-                    // /0/Test0.cs(3,1): warning SA1516: Elements should be separated by blank line
-                    Diagnostic().WithLocation(0),
-                },
-                FixedCode = fixedCode,
-                SolutionTransforms =
-                {
-                    (solution, projectId) =>
+                    OutputKind = OutputKind.ConsoleApplication,
+                    Sources = { testCode },
+                    ExpectedDiagnostics =
                     {
-                        var project = solution.GetProject(projectId);
-                        var options = project.CompilationOptions;
-                        return solution.WithProjectCompilationOptions(projectId, options.WithOutputKind(OutputKind.ConsoleApplication));
+                        // /0/Test0.cs(3,1): warning SA1516: Elements should be separated by blank line
+                        Diagnostic().WithLocation(0),
+
+                        // /0/Test0.cs(3,1): warning SA1516: Elements should be separated by blank line
+                        Diagnostic().WithLocation(0),
                     },
                 },
+                FixedCode = fixedCode,
             }.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
     }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/OrderingRules/SA1200CSharp9OutsideNamespaceUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/OrderingRules/SA1200CSharp9OutsideNamespaceUnitTests.cs
@@ -34,17 +34,12 @@ public async Task TestValidUsingStatementsInTopLevelProgramAsync()
             await new CSharpTest(LanguageVersion.CSharp9)
             {
                 ReferenceAssemblies = ReferenceAssemblies.Net.Net50,
-                TestCode = testCode,
-                Settings = TestSettings,
-                SolutionTransforms =
+                TestState =
                 {
-                    (solution, projectId) =>
-                    {
-                        var project = solution.GetProject(projectId);
-                        var options = project.CompilationOptions;
-                        return solution.WithProjectCompilationOptions(projectId, options.WithOutputKind(OutputKind.ConsoleApplication));
-                    },
+                    OutputKind = OutputKind.ConsoleApplication,
+                    Sources = { testCode },
                 },
+                Settings = TestSettings,
             }.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
     }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/OrderingRules/SA1200CSharp9PreserveUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/OrderingRules/SA1200CSharp9PreserveUnitTests.cs
@@ -34,17 +34,12 @@ public async Task TestValidUsingStatementsInTopLevelProgramAsync()
             await new CSharpTest(LanguageVersion.CSharp9)
             {
                 ReferenceAssemblies = ReferenceAssemblies.Net.Net50,
-                TestCode = testCode,
-                Settings = TestSettings,
-                SolutionTransforms =
+                TestState =
                 {
-                    (solution, projectId) =>
-                    {
-                        var project = solution.GetProject(projectId);
-                        var options = project.CompilationOptions;
-                        return solution.WithProjectCompilationOptions(projectId, options.WithOutputKind(OutputKind.ConsoleApplication));
-                    },
+                    OutputKind = OutputKind.ConsoleApplication,
+                    Sources = { testCode },
                 },
+                Settings = TestSettings,
             }.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
     }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/OrderingRules/SA1200CSharp9UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/OrderingRules/SA1200CSharp9UnitTests.cs
@@ -34,15 +34,10 @@ public async Task TestValidUsingStatementsInTopLevelProgramAsync()
             await new CSharpTest(LanguageVersion.CSharp9)
             {
                 ReferenceAssemblies = ReferenceAssemblies.Net.Net50,
-                TestCode = testCode,
-                SolutionTransforms =
+                TestState =
                 {
-                    (solution, projectId) =>
-                    {
-                        var project = solution.GetProject(projectId);
-                        var options = project.CompilationOptions;
-                        return solution.WithProjectCompilationOptions(projectId, options.WithOutputKind(OutputKind.ConsoleApplication));
-                    },
+                    OutputKind = OutputKind.ConsoleApplication,
+                    Sources = { testCode },
                 },
             }.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1005UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1005UnitTests.cs
@@ -271,14 +271,10 @@ public class Bar
             // Verify that this works if the project was configured to treat documentation comments as regular comments
             await new CSharpTest
             {
-                TestCode = testCode,
-                SolutionTransforms =
+                TestState =
                 {
-                    (solution, projectId) =>
-                    {
-                        var project = solution.GetProject(projectId);
-                        return solution.WithProjectParseOptions(projectId, project.ParseOptions.WithDocumentationMode(DocumentationMode.None));
-                    },
+                    DocumentationMode = DocumentationMode.None,
+                    Sources = { testCode },
                 },
             }.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpecialRules/SA0001UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpecialRules/SA0001UnitTests.cs
@@ -28,14 +28,10 @@ public async Task TestEnabledDocumentationModesAsync(DocumentationMode documenta
 
             await new CSharpTest
             {
-                TestCode = testCode,
-                SolutionTransforms =
+                TestState =
                 {
-                    (solution, projectId) =>
-                    {
-                        var project = solution.GetProject(projectId);
-                        return solution.WithProjectParseOptions(projectId, project.ParseOptions.WithDocumentationMode(documentationMode));
-                    },
+                    DocumentationMode = documentationMode,
+                    Sources = { testCode },
                 },
             }.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
@@ -54,15 +50,11 @@ public async Task TestDisabledDocumentationModesAsync(DocumentationMode document
 
             await new CSharpTest
             {
-                TestCode = testCode,
-                ExpectedDiagnostics = { expected },
-                SolutionTransforms =
+                TestState =
                 {
-                    (solution, projectId) =>
-                    {
-                        var project = solution.GetProject(projectId);
-                        return solution.WithProjectParseOptions(projectId, project.ParseOptions.WithDocumentationMode(documentationMode));
-                    },
+                    DocumentationMode = documentationMode,
+                    Sources = { testCode },
+                    ExpectedDiagnostics = { expected },
                 },
             }.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.CSharp.Workspaces" Version="1.3.2" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.0.1-beta1.20559.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.0.1-beta1.20623.3" />
     <PackageReference Include="Microsoft.VisualStudio.Composition" Version="16.1.8" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="xunit" Version="2.4.1" />

Original file line number	Diff line number	Diff line change
`@@ -34,17 +34,12 @@ public async Task TestValidUsingStatementsInTopLevelProgramAsync()`
`34`	`34`	`await new CSharpTest(LanguageVersion.CSharp9)`
`35`	`35`	`{`
`36`	`36`	`ReferenceAssemblies = ReferenceAssemblies.Net.Net50,`
`37`		`- TestCode = testCode,`
`38`		`- Settings = TestSettings,`
`39`		`- SolutionTransforms =`
	`37`	`+ TestState =`
`40`	`38`	`{`
`41`		`- (solution, projectId) =>`
`42`		`- {`
`43`		`- var project = solution.GetProject(projectId);`
`44`		`- var options = project.CompilationOptions;`
`45`		`- return solution.WithProjectCompilationOptions(projectId, options.WithOutputKind(OutputKind.ConsoleApplication));`
`46`		`- },`
	`39`	`+ OutputKind = OutputKind.ConsoleApplication,`
	`40`	`+ Sources = { testCode },`
`47`	`41`	`},`
	`42`	`+ Settings = TestSettings,`
`48`	`43`	`}.RunAsync(CancellationToken.None).ConfigureAwait(false);`
`49`	`44`	`}`
`50`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,15 +34,10 @@ public async Task TestValidUsingStatementsInTopLevelProgramAsync()`
`34`	`34`	`await new CSharpTest(LanguageVersion.CSharp9)`
`35`	`35`	`{`
`36`	`36`	`ReferenceAssemblies = ReferenceAssemblies.Net.Net50,`
`37`		`- TestCode = testCode,`
`38`		`- SolutionTransforms =`
	`37`	`+ TestState =`
`39`	`38`	`{`
`40`		`- (solution, projectId) =>`
`41`		`- {`
`42`		`- var project = solution.GetProject(projectId);`
`43`		`- var options = project.CompilationOptions;`
`44`		`- return solution.WithProjectCompilationOptions(projectId, options.WithOutputKind(OutputKind.ConsoleApplication));`
`45`		`- },`
	`39`	`+ OutputKind = OutputKind.ConsoleApplication,`
	`40`	`+ Sources = { testCode },`
`46`	`41`	`},`
`47`	`42`	`}.RunAsync(CancellationToken.None).ConfigureAwait(false);`
`48`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -271,14 +271,10 @@ public class Bar`
`271`	`271`	`// Verify that this works if the project was configured to treat documentation comments as regular comments`
`272`	`272`	`await new CSharpTest`
`273`	`273`	`{`
`274`		`- TestCode = testCode,`
`275`		`- SolutionTransforms =`
	`274`	`+ TestState =`
`276`	`275`	`{`
`277`		`- (solution, projectId) =>`
`278`		`- {`
`279`		`- var project = solution.GetProject(projectId);`
`280`		`- return solution.WithProjectParseOptions(projectId, project.ParseOptions.WithDocumentationMode(DocumentationMode.None));`
`281`		`- },`
	`276`	`+ DocumentationMode = DocumentationMode.None,`
	`277`	`+ Sources = { testCode },`
`282`	`278`	`},`
`283`	`279`	`}.RunAsync(CancellationToken.None).ConfigureAwait(false);`
`284`	`280`	`}`