Merge pull request #3063 from sharwell/dead-test-code

Clean up dead test code
DotNetAnalyzers · Nov 8, 2019 · 59adc83 · 59adc83
2 parents d3e7420 + 8869fb9
commit 59adc83
Show file tree

Hide file tree

Showing 26 changed files with 37 additions and 273 deletions.
diff --git a/StyleCop.Analyzers/Directory.Build.props b/StyleCop.Analyzers/Directory.Build.props
@@ -49,6 +49,16 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="2.11.0-beta2-63603-03" PrivateAssets="all" />
   </ItemGroup>
 
+  <!-- Public API -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="2.9.7" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Include="PublicAPI.Shipped.txt" Condition="Exists('PublicAPI.Shipped.txt')" />
+    <AdditionalFiles Include="PublicAPI.Unshipped.txt" Condition="Exists('PublicAPI.Unshipped.txt')" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)*.ruleset" Link="%(Filename)%(Extension)" />
 

diff --git a/...Cop.Analyzers.CodeFixes/DocumentationRules/PropertySummaryDocumentationCodeFixProvider.cs b/...Cop.Analyzers.CodeFixes/DocumentationRules/PropertySummaryDocumentationCodeFixProvider.cs
@@ -21,7 +21,7 @@ namespace StyleCop.Analyzers.DocumentationRules
     /// </summary>
     [ExportCodeFixProvider(LanguageNames.CSharp, Name = nameof(PropertySummaryDocumentationCodeFixProvider))]
     [Shared]
-    public class PropertySummaryDocumentationCodeFixProvider : CodeFixProvider
+    internal class PropertySummaryDocumentationCodeFixProvider : CodeFixProvider
     {
         /// <inheritdoc/>
         public override ImmutableArray<string> FixableDiagnosticIds { get; } =

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/PublicAPI.Shipped.txt b/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/PublicAPI.Shipped.txt
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/PublicAPI.Unshipped.txt b/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/PublicAPI.Unshipped.txt
diff --git a/...nalyzers/StyleCop.Analyzers.Test/DocumentationRules/InheritdocCodeFixProviderUnitTests.cs b/...nalyzers/StyleCop.Analyzers.Test/DocumentationRules/InheritdocCodeFixProviderUnitTests.cs
@@ -194,7 +194,6 @@ public class ChildClass : ParentClass
                     Diagnostic(SA1600).WithLocation(12, 35),
                 },
                 FixedCode = testCode,
-                FixedState = { InheritanceMode = StateInheritanceMode.AutoInheritAll },
                 NumberOfIncrementalIterations = 1,
                 NumberOfFixAllIterations = 1,
             }.RunAsync(CancellationToken.None).ConfigureAwait(false);
@@ -232,7 +231,6 @@ public class ChildClass : ParentClass
                     Diagnostic(SA1600).WithLocation(12, 35),
                 },
                 FixedCode = testCode,
-                FixedState = { InheritanceMode = StateInheritanceMode.AutoInheritAll },
                 NumberOfIncrementalIterations = 1,
                 NumberOfFixAllIterations = 1,
             }.RunAsync(CancellationToken.None).ConfigureAwait(false);

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1609UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1609UnitTests.cs
@@ -414,14 +414,6 @@ private static Task VerifyCSharpFixAsync(string source, DiagnosticResult[] expec
                 },
             };
 
-            if (source == fixedSource)
-            {
-                test.FixedState.InheritanceMode = StateInheritanceMode.AutoInheritAll;
-                test.FixedState.MarkupHandling = MarkupMode.Allow;
-                test.BatchFixedState.InheritanceMode = StateInheritanceMode.AutoInheritAll;
-                test.BatchFixedState.MarkupHandling = MarkupMode.Allow;
-            }
-
             test.ExpectedDiagnostics.AddRange(expected);
             return test.RunAsync(cancellationToken);
         }

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1610UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1610UnitTests.cs
@@ -414,18 +414,10 @@ private static Task VerifyCSharpFixAsync(string source, DiagnosticResult[] expec
                 },
             };
 
-            if (source == fixedSource)
+            if (source == fixedSource && offerEmptyFixer)
             {
-                test.FixedState.InheritanceMode = StateInheritanceMode.AutoInheritAll;
-                test.FixedState.MarkupHandling = MarkupMode.Allow;
-                test.BatchFixedState.InheritanceMode = StateInheritanceMode.AutoInheritAll;
-                test.BatchFixedState.MarkupHandling = MarkupMode.Allow;
-
-                if (offerEmptyFixer)
-                {
-                    test.NumberOfIncrementalIterations = 1;
-                    test.NumberOfFixAllIterations = 1;
-                }
+                test.NumberOfIncrementalIterations = 1;
+                test.NumberOfFixAllIterations = 1;
             }
 
             test.ExpectedDiagnostics.AddRange(expected);

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1616UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1616UnitTests.cs
@@ -612,18 +612,10 @@ private static Task VerifyCSharpFixAsync(string source, DiagnosticResult[] expec
                 },
             };
 
-            if (source == fixedSource)
+            if (source == fixedSource && offerEmptyFixer)
             {
-                test.FixedState.InheritanceMode = StateInheritanceMode.AutoInheritAll;
-                test.FixedState.MarkupHandling = MarkupMode.Allow;
-                test.BatchFixedState.InheritanceMode = StateInheritanceMode.AutoInheritAll;
-                test.BatchFixedState.MarkupHandling = MarkupMode.Allow;
-
-                if (offerEmptyFixer)
-                {
-                    test.NumberOfIncrementalIterations = 1;
-                    test.NumberOfFixAllIterations = 1;
-                }
+                test.NumberOfIncrementalIterations = 1;
+                test.NumberOfFixAllIterations = 1;
             }
 
             test.ExpectedDiagnostics.AddRange(expected);

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1617UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1617UnitTests.cs
@@ -359,14 +359,6 @@ private static Task VerifyCSharpFixAsync(string source, DiagnosticResult[] expec
                 },
             };
 
-            if (source == fixedSource)
-            {
-                test.FixedState.InheritanceMode = StateInheritanceMode.AutoInheritAll;
-                test.FixedState.MarkupHandling = MarkupMode.Allow;
-                test.BatchFixedState.InheritanceMode = StateInheritanceMode.AutoInheritAll;
-                test.BatchFixedState.MarkupHandling = MarkupMode.Allow;
-            }
-
             test.ExpectedDiagnostics.AddRange(expected);
             return test.RunAsync(cancellationToken);
         }

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1629UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1629UnitTests.cs
@@ -869,14 +869,6 @@ private static Task VerifyCSharpFixAsync(string source, DiagnosticResult[] expec
             test.TestCode = source;
             test.FixedCode = fixedSource;
 
-            if (source == fixedSource)
-            {
-                test.FixedState.InheritanceMode = StateInheritanceMode.AutoInheritAll;
-                test.FixedState.MarkupHandling = MarkupMode.Allow;
-                test.BatchFixedState.InheritanceMode = StateInheritanceMode.AutoInheritAll;
-                test.BatchFixedState.MarkupHandling = MarkupMode.Allow;
-            }
-
             return test.RunAsync(cancellationToken);
         }
 

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1642UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1642UnitTests.cs
@@ -1245,14 +1245,6 @@ private static Task VerifyCSharpFixAsync(string source, DiagnosticResult[] expec
             test.TestCode = source;
             test.FixedCode = fixedSource;
 
-            if (source == fixedSource)
-            {
-                test.FixedState.InheritanceMode = StateInheritanceMode.AutoInheritAll;
-                test.FixedState.MarkupHandling = MarkupMode.Allow;
-                test.BatchFixedState.InheritanceMode = StateInheritanceMode.AutoInheritAll;
-                test.BatchFixedState.MarkupHandling = MarkupMode.Allow;
-            }
-
             return test.RunAsync(cancellationToken);
         }
 

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1643UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1643UnitTests.cs
@@ -346,14 +346,6 @@ private static Task VerifyCSharpFixAsync(string source, DiagnosticResult[] expec
             test.TestCode = source;
             test.FixedCode = fixedSource;
 
-            if (source == fixedSource)
-            {
-                test.FixedState.InheritanceMode = StateInheritanceMode.AutoInheritAll;
-                test.FixedState.MarkupHandling = MarkupMode.Allow;
-                test.BatchFixedState.InheritanceMode = StateInheritanceMode.AutoInheritAll;
-                test.BatchFixedState.MarkupHandling = MarkupMode.Allow;
-            }
-
             return test.RunAsync(cancellationToken);
         }
 

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1651UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1651UnitTests.cs
@@ -264,14 +264,6 @@ private static Task VerifyCSharpFixAsync(string source, DiagnosticResult[] expec
             test.TestCode = source;
             test.FixedCode = fixedSource;
 
-            if (source == fixedSource)
-            {
-                test.FixedState.InheritanceMode = StateInheritanceMode.AutoInheritAll;
-                test.FixedState.MarkupHandling = MarkupMode.Allow;
-                test.BatchFixedState.InheritanceMode = StateInheritanceMode.AutoInheritAll;
-                test.BatchFixedState.MarkupHandling = MarkupMode.Allow;
-            }
-
             return test.RunAsync(cancellationToken);
         }
 

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/ObjectPools/SharedPoolsTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/ObjectPools/SharedPoolsTests.cs
@@ -211,17 +211,31 @@ public void TestClearAndFreeLarge()
         [Fact]
         public void TestPooledObjectHandlesNullAllocation()
         {
-            object Allocator(ObjectPool<object> pool)
+            object NullAllocator(ObjectPool<object> pool)
                 => null;
 
+            object NonNullAllocator(ObjectPool<object> pool)
+                => new object();
+
+            bool releaserCalled = false;
             void Releaser(ObjectPool<object> pool, object obj)
             {
+                releaserCalled = true;
             }
 
-            using (var obj = new PooledObject<object>(SharedPools.Default<object>(), Allocator, Releaser))
+            using (var obj = new PooledObject<object>(SharedPools.Default<object>(), NullAllocator, Releaser))
             {
                 Assert.Null(obj.Object);
             }
+
+            Assert.False(releaserCalled);
+
+            using (var obj = new PooledObject<object>(SharedPools.Default<object>(), NonNullAllocator, Releaser))
+            {
+                Assert.NotNull(obj.Object);
+            }
+
+            Assert.True(releaserCalled);
         }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/TestDiagnosticProvider.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/TestDiagnosticProvider.cs
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/TestXmlReferenceResolver.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/TestXmlReferenceResolver.cs
diff --git a/...eCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/DebugMessagesUnitTestsBase.cs b/...eCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/DebugMessagesUnitTestsBase.cs
@@ -297,16 +297,7 @@ protected Task VerifyCSharpDiagnosticAsync(string source, DiagnosticResult[] exp
         protected virtual string BuildTestCode(string format)
         {
             StringBuilder argumentList = new StringBuilder();
-            foreach (var argument in this.InitialArguments)
-            {
-                if (argumentList.Length > 0)
-                {
-                    argumentList.Append(", ");
-                }
-
-                argumentList.Append(argument);
-            }
-
+            argumentList.Append(string.Join(", ", this.InitialArguments));
             if (argumentList.Length > 0)
             {
                 argumentList.Append(", ");
@@ -406,7 +397,7 @@ public void Bar()
             await this.VerifyCSharpDiagnosticAsync(string.Format(this.BuildTestCode(testCodeFormat), argument), expected, CancellationToken.None).ConfigureAwait(false);
         }
 
-        private class CSharpTest : StyleCopDiagnosticVerifier<EmptyAnalyzer>.CSharpTest
+        private class CSharpTest : StyleCopDiagnosticVerifier<EmptyDiagnosticAnalyzer>.CSharpTest
         {
             private readonly DebugMessagesUnitTestsBase testFixture;
 

diff --git a/...eCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/FileMayOnlyContainTestBase.cs b/...eCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/FileMayOnlyContainTestBase.cs
@@ -339,23 +339,13 @@ protected Task VerifyCSharpFixAsync(string source, string testSettings, Diagnost
                 test.FixedSources.Add(fixedSource);
             }
 
-            if (fixedSources.Length == 1
-                && (fixedSources[0].fileName == string.Empty || fixedSources[0].fileName == "Test0.cs")
-                && source == fixedSources[0].content)
-            {
-                test.FixedState.InheritanceMode = StateInheritanceMode.AutoInheritAll;
-                test.FixedState.MarkupHandling = MarkupMode.Allow;
-                test.BatchFixedState.InheritanceMode = StateInheritanceMode.AutoInheritAll;
-                test.BatchFixedState.MarkupHandling = MarkupMode.Allow;
-            }
-
             test.ExpectedDiagnostics.AddRange(expected);
             return test.RunAsync(cancellationToken);
         }
 
         protected virtual string GetSettings() => null;
 
-        private class CSharpTest : StyleCopCodeFixVerifier<EmptyAnalyzer, EmptyCodeFixProvider>.CSharpTest
+        private class CSharpTest : StyleCopCodeFixVerifier<EmptyDiagnosticAnalyzer, EmptyCodeFixProvider>.CSharpTest
         {
             private readonly FileMayOnlyContainTestBase testFixture;
 

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/UsingCodeFixProviderUnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/UsingCodeFixProviderUnitTests.cs
@@ -660,14 +660,6 @@ private Task VerifyCSharpFixAsync(string source, DiagnosticResult[] expected, st
                 Settings = testSettings,
             };
 
-            if (source == fixedSource)
-            {
-                test.FixedState.InheritanceMode = StateInheritanceMode.AutoInheritAll;
-                test.FixedState.MarkupHandling = MarkupMode.Allow;
-                test.BatchFixedState.InheritanceMode = StateInheritanceMode.AutoInheritAll;
-                test.BatchFixedState.MarkupHandling = MarkupMode.Allow;
-            }
-
             test.ExpectedDiagnostics.AddRange(expected);
             test.RemainingDiagnostics.AddRange(remainingDiagnostics);
             return test.RunAsync(cancellationToken);