Move EmptyDiagnosticResults to the verifier helpers

sharwell · sharwell · commit d01a67c3c150 · 2018-08-10T08:29:17.000-05:00
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/SpacingRules/SA1000CSharp7UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/SpacingRules/SA1000CSharp7UnitTests.cs
@@ -8,7 +8,9 @@ namespace StyleCop.Analyzers.Test.CSharp7.SpacingRules
     using StyleCop.Analyzers.Test.SpacingRules;
     using TestHelper;
     using Xunit;
-    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<StyleCop.Analyzers.SpacingRules.SA1000KeywordsMustBeSpacedCorrectly, StyleCop.Analyzers.SpacingRules.TokenSpacingCodeFixProvider>;
+    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
+        StyleCop.Analyzers.SpacingRules.SA1000KeywordsMustBeSpacedCorrectly,
+        StyleCop.Analyzers.SpacingRules.TokenSpacingCodeFixProvider>;
 
     public class SA1000CSharp7UnitTests : SA1000UnitTests
     {
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1000UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1000UnitTests.cs
@@ -8,16 +8,16 @@ namespace StyleCop.Analyzers.Test.SpacingRules
     using StyleCop.Analyzers.SpacingRules;
     using TestHelper;
     using Xunit;
-    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<StyleCop.Analyzers.SpacingRules.SA1000KeywordsMustBeSpacedCorrectly, StyleCop.Analyzers.SpacingRules.TokenSpacingCodeFixProvider>;
+    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
+        StyleCop.Analyzers.SpacingRules.SA1000KeywordsMustBeSpacedCorrectly,
+        StyleCop.Analyzers.SpacingRules.TokenSpacingCodeFixProvider>;
 
     /// <summary>
     /// This class contains unit tests for <see cref="SA1000KeywordsMustBeSpacedCorrectly"/> and
     /// <see cref="TokenSpacingCodeFixProvider"/>.
     /// </summary>
     public class SA1000UnitTests
     {
-        protected static DiagnosticResult[] EmptyDiagnosticResults { get; } = { };
-
         [Fact]
         public async Task TestCatchallStatementAsync()
         {
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/CodeFixVerifier`2.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/CodeFixVerifier`2.cs
@@ -13,6 +13,9 @@ internal static class CodeFixVerifier<TAnalyzer, TCodeFix>
         where TAnalyzer : DiagnosticAnalyzer, new()
         where TCodeFix : CodeFixProvider, new()
     {
+        internal static DiagnosticResult[] EmptyDiagnosticResults
+            => DiagnosticVerifier<TAnalyzer>.EmptyDiagnosticResults;
+
         internal static DiagnosticResult Diagnostic(string diagnosticId = null)
             => DiagnosticVerifier<TAnalyzer>.Diagnostic(diagnosticId);
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/DiagnosticVerifier`1.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/DiagnosticVerifier`1.cs
@@ -13,6 +13,8 @@ namespace StyleCop.Analyzers.Test.Verifiers
     internal static class DiagnosticVerifier<TAnalyzer>
         where TAnalyzer : DiagnosticAnalyzer, new()
     {
+        internal static DiagnosticResult[] EmptyDiagnosticResults { get; } = { };
+
         internal static DiagnosticResult Diagnostic(string diagnosticId = null)
         {
             var analyzer = new TAnalyzer();
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopCodeFixVerifier`2.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopCodeFixVerifier`2.cs
@@ -14,6 +14,9 @@ internal static class StyleCopCodeFixVerifier<TAnalyzer, TCodeFix>
         where TAnalyzer : DiagnosticAnalyzer, new()
         where TCodeFix : CodeFixProvider, new()
     {
+        internal static DiagnosticResult[] EmptyDiagnosticResults
+            => DiagnosticVerifier<TAnalyzer>.EmptyDiagnosticResults;
+
         internal static DiagnosticResult Diagnostic(string diagnosticId = null)
             => DiagnosticVerifier<TAnalyzer>.Diagnostic(diagnosticId);
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopDiagnosticVerifier`1.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopDiagnosticVerifier`1.cs
@@ -15,6 +15,9 @@ namespace StyleCop.Analyzers.Test.Verifiers
     internal static class StyleCopDiagnosticVerifier<TAnalyzer>
         where TAnalyzer : DiagnosticAnalyzer, new()
     {
+        internal static DiagnosticResult[] EmptyDiagnosticResults
+            => DiagnosticVerifier<TAnalyzer>.EmptyDiagnosticResults;
+
         internal static DiagnosticResult Diagnostic(string diagnosticId = null)
             => DiagnosticVerifier<TAnalyzer>.Diagnostic(diagnosticId);
 

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,9 @@ internal static class CodeFixVerifier<TAnalyzer, TCodeFix>`
`13`	`13`	`where TAnalyzer : DiagnosticAnalyzer, new()`
`14`	`14`	`where TCodeFix : CodeFixProvider, new()`
`15`	`15`	`{`
	`16`	`+ internal static DiagnosticResult[] EmptyDiagnosticResults`
	`17`	`+ => DiagnosticVerifier<TAnalyzer>.EmptyDiagnosticResults;`
	`18`	`+`
`16`	`19`	`internal static DiagnosticResult Diagnostic(string diagnosticId = null)`
`17`	`20`	`=> DiagnosticVerifier<TAnalyzer>.Diagnostic(diagnosticId);`
`18`	`21`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ namespace StyleCop.Analyzers.Test.Verifiers`
`13`	`13`	`internal static class DiagnosticVerifier<TAnalyzer>`
`14`	`14`	`where TAnalyzer : DiagnosticAnalyzer, new()`
`15`	`15`	`{`
	`16`	`+ internal static DiagnosticResult[] EmptyDiagnosticResults { get; } = { };`
	`17`	`+`
`16`	`18`	`internal static DiagnosticResult Diagnostic(string diagnosticId = null)`
`17`	`19`	`{`
`18`	`20`	`var analyzer = new TAnalyzer();`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@ internal static class StyleCopCodeFixVerifier<TAnalyzer, TCodeFix>`
`14`	`14`	`where TAnalyzer : DiagnosticAnalyzer, new()`
`15`	`15`	`where TCodeFix : CodeFixProvider, new()`
`16`	`16`	`{`
	`17`	`+ internal static DiagnosticResult[] EmptyDiagnosticResults`
	`18`	`+ => DiagnosticVerifier<TAnalyzer>.EmptyDiagnosticResults;`
	`19`	`+`
`17`	`20`	`internal static DiagnosticResult Diagnostic(string diagnosticId = null)`
`18`	`21`	`=> DiagnosticVerifier<TAnalyzer>.Diagnostic(diagnosticId);`
`19`	`22`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,9 @@ namespace StyleCop.Analyzers.Test.Verifiers`
`15`	`15`	`internal static class StyleCopDiagnosticVerifier<TAnalyzer>`
`16`	`16`	`where TAnalyzer : DiagnosticAnalyzer, new()`
`17`	`17`	`{`
	`18`	`+ internal static DiagnosticResult[] EmptyDiagnosticResults`
	`19`	`+ => DiagnosticVerifier<TAnalyzer>.EmptyDiagnosticResults;`
	`20`	`+`
`18`	`21`	`internal static DiagnosticResult Diagnostic(string diagnosticId = null)`
`19`	`22`	`=> DiagnosticVerifier<TAnalyzer>.Diagnostic(diagnosticId);`
`20`	`23`