Add SA1119 and SA1408 tests for pattern matching

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/MaintainabilityRules/SA1119CSharp7UnitTests.cs

@@ -3,9 +3,83 @@
 
 namespace StyleCop.Analyzers.Test.CSharp7.MaintainabilityRules
 {
+    using System.Threading;
+    using System.Threading.Tasks;
     using StyleCop.Analyzers.Test.MaintainabilityRules;
+    using TestHelper;
+    using Xunit;
 
     public class SA1119CSharp7UnitTests : SA1119UnitTests
     {
+        /// <summary>
+        /// Verifies that extra parentheses in pattern matching are reported.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        /// <seealso cref="SA1408CSharp7UnitTests.TestPatternMatchingAsync"/>
+        [Fact]
+        public async Task TestPatternMatchingAsync()
+        {
+            var testCode = @"public class Foo
+{
+    public void Bar()
+    {
+        if ((new object() is bool b) && b)
+        {
+            return;
+        }
+    }
+}";
+            var fixedCode = @"public class Foo
+{
+    public void Bar()
+    {
+        if ( new object() is bool b && b)
+        {
+            return;
+        }
+    }
+}";
+
+            DiagnosticResult[] expected =
+            {
+                this.CSharpDiagnostic(DiagnosticId).WithLocation(5, 13),
+                this.CSharpDiagnostic(ParenthesesDiagnosticId).WithLocation(5, 13),
+                this.CSharpDiagnostic(ParenthesesDiagnosticId).WithLocation(5, 36),
+            };
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpDiagnosticAsync(fixedCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpFixAsync(testCode, fixedCode).ConfigureAwait(false);
+        }
+
+        [Fact]
+        public async Task TestTupleDeconstructionAsync()
+        {
+            var testCode = @"public class Foo
+{
+    public void Bar()
+    {
+        var (a, (b, c), d) = (1, (2, (3)), 4);
+    }
+}";
+            var fixedCode = @"public class Foo
+{
+    public void Bar()
+    {
+        var (a, (b, c), d) = (1, (2, 3), 4);
+    }
+}";
+
+            DiagnosticResult[] expected =
+            {
+                this.CSharpDiagnostic(DiagnosticId).WithLocation(5, 38),
+                this.CSharpDiagnostic(ParenthesesDiagnosticId).WithLocation(5, 38),
+                this.CSharpDiagnostic(ParenthesesDiagnosticId).WithLocation(5, 40),
+            };
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpDiagnosticAsync(fixedCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpFixAsync(testCode, fixedCode).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/MaintainabilityRules/SA1408CSharp7UnitTests.cs

@@ -3,9 +3,33 @@
 
 namespace StyleCop.Analyzers.Test.CSharp7.MaintainabilityRules
 {
+    using System.Threading;
+    using System.Threading.Tasks;
     using StyleCop.Analyzers.Test.MaintainabilityRules;
+    using Xunit;
 
     public class SA1408CSharp7UnitTests : SA1408UnitTests
     {
+        /// <summary>
+        /// Verifies that a code fix for SA1119 in a pattern matching expression does not trigger SA1408.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        /// <seealso cref="SA1119CSharp7UnitTests.TestPatternMatchingAsync"/>
+        [Fact]
+        public async Task TestPatternMatchingAsync()
+        {
+            var testCode = @"public class Foo
+{
+    public void Bar()
+    {
+        if (new object() is bool b && b)
+        {
+            return;
+        }
+    }
+}";
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1119UnitTests.cs

@@ -16,10 +16,10 @@ namespace StyleCop.Analyzers.Test.MaintainabilityRules
 
     public class SA1119UnitTests : CodeFixVerifier
     {
-        private const string DiagnosticId = SA1119StatementMustNotUseUnnecessaryParenthesis.DiagnosticId;
-        private const string ParenthesesDiagnosticId = SA1119StatementMustNotUseUnnecessaryParenthesis.ParenthesesDiagnosticId;
+        protected const string DiagnosticId = SA1119StatementMustNotUseUnnecessaryParenthesis.DiagnosticId;
+        protected const string ParenthesesDiagnosticId = SA1119StatementMustNotUseUnnecessaryParenthesis.ParenthesesDiagnosticId;
 
-        private bool mainDiagnosticShouldBeDisabled = false;
+        protected bool MainDiagnosticShouldBeDisabled { get; set; }
 
         [Fact]
         public async Task TestLiteralAsync()
@@ -1137,7 +1137,7 @@ public string Bar()
         [Fact]
         public async Task TestParenthesisDiagnosticIsNotTriggeredIfParentDiagnosticIsDisabledAsync()
         {
-            this.mainDiagnosticShouldBeDisabled = true;
+            this.MainDiagnosticShouldBeDisabled = true;
 
             string testCode = @"class Foo
 {
@@ -1470,7 +1470,7 @@ protected override CodeFixProvider GetCSharpCodeFixProvider()
         /// <inheritdoc/>
         protected override IEnumerable<string> GetDisabledDiagnostics()
         {
-            if (this.mainDiagnosticShouldBeDisabled)
+            if (this.MainDiagnosticShouldBeDisabled)
             {
                 yield return DiagnosticId;
             }