Update SA1000 tests for relational and logical patterns

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/SpacingRules/SA1000CSharp9UnitTests.cs

@@ -1,15 +1,12 @@
 // Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-#nullable disable
-
 namespace StyleCop.Analyzers.Test.CSharp9.SpacingRules
 {
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis.Testing;
     using StyleCop.Analyzers.Test.CSharp8.SpacingRules;
     using Xunit;
-
     using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
         StyleCop.Analyzers.SpacingRules.SA1000KeywordsMustBeSpacedCorrectly,
         StyleCop.Analyzers.SpacingRules.TokenSpacingCodeFixProvider>;
@@ -24,47 +21,58 @@ public async Task TestTargetTypedNewAsync()
             await this.TestKeywordStatementAsync(statementWithoutSpace, DiagnosticResult.EmptyDiagnosticResults, statementWithoutSpace).ConfigureAwait(false);
         }
 
-        [Fact]
+        [Theory]
         [WorkItem(3508, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3508")]
-        public async Task TestIsBeforeRelationalPatternAsync()
+        [InlineData("<")]
+        [InlineData("<=")]
+        [InlineData(">")]
+        [InlineData(">=")]
+        public async Task TestIsBeforeRelationalPatternAsync(string @operator)
         {
-            var statementWithoutSpace = "_ = 1 {|#0:is|}>1;";
-            var statementWithSpace = "_ = 1 is >1;";
+            var statementWithoutSpace = $"_ = 1 {{|#0:is|}}{@operator}1;";
+            var statementWithSpace = $"_ = 1 is {@operator}1;";
 
             var expected = Diagnostic().WithArguments("is", string.Empty, "followed").WithLocation(0);
             await this.TestKeywordStatementAsync(statementWithoutSpace, expected, statementWithSpace).ConfigureAwait(false);
         }
 
-        [Fact]
+        [Theory]
         [WorkItem(3508, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3508")]
-        public async Task TestNotBeforeRelationalPatternAsync()
+        [InlineData("<")]
+        [InlineData("<=")]
+        [InlineData(">")]
+        [InlineData(">=")]
+        public async Task TestNotBeforeRelationalPatternAsync(string relationalOperator)
         {
-            var statementWithoutSpace = "_ = 1 is {|#0:not|}>1;";
-            var statementWithSpace = "_ = 1 is not >1;";
+            var statementWithoutSpace = $"_ = 1 is {{|#0:not|}}{relationalOperator}1;";
+            var statementWithSpace = $"_ = 1 is not {relationalOperator}1;";
 
             var expected = Diagnostic().WithArguments("not", string.Empty, "followed").WithLocation(0);
             await this.TestKeywordStatementAsync(statementWithoutSpace, expected, statementWithSpace).ConfigureAwait(false);
         }
 
-        [Fact]
+        [Theory]
         [WorkItem(3508, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3508")]
-        public async Task TestAndBeforeRelationalPatternAsync()
+        [CombinatorialData]
+        public async Task TestAndBeforeRelationalPatternAsync(
+            [CombinatorialValues("and", "or")] string logicalOperator,
+            [CombinatorialValues("<", "<=", ">", ">=")] string relationalOperator)
         {
-            var statementWithoutSpace = "_ = 1 is 1 {|#0:and|}>0;";
-            var statementWithSpace = "_ = 1 is 1 and >0;";
+            var statementWithoutSpace = $"_ = (int?)1 is not null {{|#0:{logicalOperator}|}}{relationalOperator}1;";
+            var statementWithSpace = $"_ = (int?)1 is not null {logicalOperator} {relationalOperator}1;";
 
-            var expected = Diagnostic().WithArguments("and", string.Empty, "followed").WithLocation(0);
+            var expected = Diagnostic().WithArguments(logicalOperator, string.Empty, "followed").WithLocation(0);
             await this.TestKeywordStatementAsync(statementWithoutSpace, expected, statementWithSpace).ConfigureAwait(false);
         }
 
         [Fact]
-        [WorkItem(3508, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3508")]
-        public async Task TestOrBeforeRelationalPatternAsync()
+        [WorkItem(3968, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3968")]
+        public async Task TestNotBeforeConstantPatternMissingSpaceAsync()
         {
-            var statementWithoutSpace = "_ = 1 is 1 {|#0:or|}>1;";
-            var statementWithSpace = "_ = 1 is 1 or >1;";
+            var statementWithoutSpace = "_ = new object() is {|#0:not|}(null);";
+            var statementWithSpace = "_ = new object() is not (null);";
 
-            var expected = Diagnostic().WithArguments("or", string.Empty, "followed").WithLocation(0);
+            var expected = Diagnostic().WithArguments("not", string.Empty, "followed").WithLocation(0);
             await this.TestKeywordStatementAsync(statementWithoutSpace, expected, statementWithSpace).ConfigureAwait(false);
         }
     }