SE UTs: Replace ValidateTag with TagValue (#7236)

SonarSource · May 23, 2023 · 030173b · 030173b
1 parent 91059f8
commit 030173b
Show file tree

Hide file tree

Showing 14 changed files with 341 additions and 337 deletions.
diff --git a/...sts/SonarAnalyzer.UnitTest/SymbolicExecution/Roslyn/RoslynSymbolicExecutionTest.Binary.cs b/...sts/SonarAnalyzer.UnitTest/SymbolicExecution/Roslyn/RoslynSymbolicExecutionTest.Binary.cs
@@ -625,7 +625,7 @@ public void Binary_NullableRelationalNonNull_SetsObjectConstraint_CS(string expr
         validator.ValidateContainsOperation(OperationKind.Binary);
         validator.ValidateTag("If", x => x.HasConstraint(ObjectConstraint.NotNull).Should().BeTrue("arg comparison true, hence non-null"));
         validator.ValidateTag("If", x => x.HasConstraint<NumberConstraint>().Should().BeTrue("arg inferred a value from the comparison"));
-        validator.ValidateTag("Else", x => x.Should().HaveNoConstraints("arg either null or comparison false"));
+        validator.TagValue("Else").Should().HaveNoConstraints("arg either null or comparison false");
     }
 
     [DataTestMethod]
@@ -641,7 +641,7 @@ public void Binary_StringConcatenation_Binary_CS(string expression)
             """;
         var validator = SETestContext.CreateCS(code).Validator;
         validator.ValidateContainsOperation(OperationKind.Binary);
-        validator.ValidateTag("S", x => x.Should().HaveNoConstraints()); // FIXME: s is not null here (https://github.com/SonarSource/sonar-dotnet/issues/7111)
+        validator.TagValue("S").Should().HaveNoConstraints(); // FIXME: s is not null here (https://github.com/SonarSource/sonar-dotnet/issues/7111)
     }
 
     [DataTestMethod]
@@ -657,7 +657,7 @@ public void Binary_StringConcatenation_Compund_CS(string expression)
             """;
         var validator = SETestContext.CreateCS(code).Validator;
         validator.ValidateContainsOperation(OperationKind.Binary);
-        validator.ValidateTag("S", x => x.Should().HaveOnlyConstraint(ObjectConstraint.Null)); // FIXME: s is not null here (https://github.com/SonarSource/sonar-dotnet/issues/7111)
+        validator.TagValue("S").Should().HaveOnlyConstraint(ObjectConstraint.Null); // FIXME: s is not null here (https://github.com/SonarSource/sonar-dotnet/issues/7111)
     }
 
     [DataTestMethod]
@@ -680,7 +680,7 @@ public void Binary_NumberLiteral_SetsBoolConstraint_IsTrue(string value, string
             Tag("Result", result);
             """;
         var validator = SETestContext.CreateCS(code).Validator;
-        validator.ValidateTag("Result", x => x.Should().HaveOnlyConstraints(ObjectConstraint.NotNull, BoolConstraint.True));
+        validator.TagValue("Result").Should().HaveOnlyConstraints(ObjectConstraint.NotNull, BoolConstraint.True);
     }
 
     [DataTestMethod]
@@ -700,7 +700,7 @@ public void Binary_NumberLiteral_SetsBoolConstraint_IsFalse(string value, string
             Tag("Result", result);
             """;
         var validator = SETestContext.CreateCS(code, "int arg").Validator;
-        validator.ValidateTag("Result", x => x.Should().HaveOnlyConstraints(ObjectConstraint.NotNull, BoolConstraint.False));
+        validator.TagValue("Result").Should().HaveOnlyConstraints(ObjectConstraint.NotNull, BoolConstraint.False);
     }
 
     [DataTestMethod]
@@ -759,7 +759,7 @@ public void Binary_PlusAndMinus(string expression, int expected)
             Tag("Value", value);
             """;
         var validator = SETestContext.CreateCS(code).Validator;
-        validator.ValidateTag("Value", x => x.Should().HaveOnlyConstraints(ObjectConstraint.NotNull, NumberConstraint.From(expected)));
+        validator.TagValue("Value").Should().HaveOnlyConstraints(ObjectConstraint.NotNull, NumberConstraint.From(expected));
     }
 
     [DataTestMethod]
@@ -781,7 +781,7 @@ public void Binary_Multiplication_SingleValue(int left, int right, int expected)
             var value = left * right;
             Tag("Value", value);
             """;
-        SETestContext.CreateCS(code).Validator.ValidateTag("Value", x => x.Should().HaveOnlyConstraints(ObjectConstraint.NotNull, NumberConstraint.From(expected)));
+        SETestContext.CreateCS(code).Validator.TagValue("Value").Should().HaveOnlyConstraints(ObjectConstraint.NotNull, NumberConstraint.From(expected));
     }
 
     [DataTestMethod]
@@ -819,7 +819,7 @@ public void Binary_Multiplication_Range(string expression, int? expectedMin, int
             }
             """;
         var validator = SETestContext.CreateCS(code, "int i, int j").Validator;
-        validator.ValidateTag("Value", x => x.Should().HaveOnlyConstraints(ObjectConstraint.NotNull, NumberConstraint.From(expectedMin, expectedMax)));
+        validator.TagValue("Value").Should().HaveOnlyConstraints(ObjectConstraint.NotNull, NumberConstraint.From(expectedMin, expectedMax));
     }
 
     [DataTestMethod]
@@ -879,6 +879,6 @@ public void Binary_BitAnd_Range(string expression, int? expectedMin, int? expect
             }
             """;
         var validator = SETestContext.CreateCS(code, "int i, int j").Validator;
-        validator.ValidateTag("Value", x => x.Should().HaveOnlyConstraints(ObjectConstraint.NotNull, NumberConstraint.From(expectedMin, expectedMax)));
+        validator.TagValue("Value").Should().HaveOnlyConstraints(ObjectConstraint.NotNull, NumberConstraint.From(expectedMin, expectedMax));
     }
 }