Add FluentAssertions analyzer and fix raised issues (#2072)

SonarSource · Nov 5, 2018 · 923cb83 · 923cb83
1 parent a422ff0
commit 923cb83
Show file tree

Hide file tree

Showing 18 changed files with 80 additions and 81 deletions.
diff --git a/sonaranalyzer-dotnet/tests/SonarAnalyzer.UnitTest/Common/MultiValueDictionaryTest.cs b/sonaranalyzer-dotnet/tests/SonarAnalyzer.UnitTest/Common/MultiValueDictionaryTest.cs
@@ -51,7 +51,7 @@ public void MultiValueDictionary_Add_Set()
             mvd.Add(42, 42);
 
             mvd.Keys.Should().HaveCount(2);
-            mvd[5].Should().HaveCount(1);
+            mvd[5].Should().ContainSingle();
         }
 
         [TestMethod]

diff --git a/sonaranalyzer-dotnet/tests/SonarAnalyzer.UnitTest/Common/RuleDescriptorTest.cs b/sonaranalyzer-dotnet/tests/SonarAnalyzer.UnitTest/Common/RuleDescriptorTest.cs
@@ -82,8 +82,7 @@ private static void CheckRuleDescriptorsNotEmpty(AnalyzerLanguage language)
                 ruleDetail.Title.Should().NotBeNull();
             }
 
-            ruleDetails.Should().HaveSameCount(
-                ruleDetails.Select(descriptor => descriptor.Key).Distinct());
+            ruleDetails.Should().OnlyHaveUniqueItems();
         }
     }
 }
diff --git a/sonaranalyzer-dotnet/tests/SonarAnalyzer.UnitTest/Common/RuleFinderTest.cs b/sonaranalyzer-dotnet/tests/SonarAnalyzer.UnitTest/Common/RuleFinderTest.cs
@@ -60,10 +60,10 @@ public void GetAllAnalyzerTypes()
             var finder = new RuleFinder();
 
             var countParameterless = finder.GetParameterlessAnalyzerTypes(AnalyzerLanguage.CSharp).Count();
-            finder.AllAnalyzerTypes.Count().Should().BeGreaterThan(countParameterless);
+            finder.AllAnalyzerTypes.Should().HaveCountGreaterThan(countParameterless);
 
             countParameterless = finder.GetParameterlessAnalyzerTypes(AnalyzerLanguage.VisualBasic).Count();
-            finder.AllAnalyzerTypes.Count().Should().BeGreaterThan(countParameterless);
+            finder.AllAnalyzerTypes.Should().HaveCountGreaterThan(countParameterless);
         }
     }
 }
diff --git a/sonaranalyzer-dotnet/tests/SonarAnalyzer.UnitTest/ControlFlowGraph/ControlFlowGraphTest.cs b/sonaranalyzer-dotnet/tests/SonarAnalyzer.UnitTest/ControlFlowGraph/ControlFlowGraphTest.cs
@@ -1381,7 +1381,7 @@ public void Cfg_Coalesce_Multiple()
             dBlock.SuccessorBlocks.Should().OnlyContain(bcdBlock);
             bcdBlock.SuccessorBlocks.Should().OnlyContain(exitBlock);
 
-            bcdBlock.Instructions.Should().HaveCount(1);
+            bcdBlock.Instructions.Should().ContainSingle();
             bcdBlock.Instructions.Should().Contain(i => i.ToString() == "a = b ?? c ?? d");
         }
 
@@ -1502,7 +1502,7 @@ public void Cfg_ConditionalMultiple()
                 .SuccessorBlocks.First().Should().Be(cfg.ExitBlock);
 
             var assignmentBlock = cfg.ExitBlock.PredecessorBlocks.First();
-            assignmentBlock.Instructions.Should().HaveCount(1);
+            assignmentBlock.Instructions.Should().ContainSingle();
             assignmentBlock.Instructions.Should().Contain(i => i.ToString() == "a = cond1 ? (cond2?x:y) : (cond3?p:q)");
         }
 
@@ -1529,7 +1529,7 @@ public void Cfg_ConditionalAccess()
 
             branchBlock.BranchingNode.Kind().Should().Be(SyntaxKind.ConditionalAccessExpression);
 
-            branchBlock.Instructions.Should().HaveCount(1);
+            branchBlock.Instructions.Should().ContainSingle();
             branchBlock.Instructions.Should().Contain(i => i.ToString() == "o");
 
             VerifyAllInstructions(branchBlock, "o");
@@ -3312,7 +3312,7 @@ private static IControlFlowGraph Build(string methodBody)
 
         private void VerifyInstructions(Block block, int fromIndex, params string[] instructions)
         {
-            block.Instructions.Count.Should().BeGreaterOrEqualTo(fromIndex + instructions.Length);
+            block.Instructions.Should().HaveCountGreaterOrEqualTo(fromIndex + instructions.Length);
             for (var i = 0; i < instructions.Length; i++)
             {
                 block.Instructions[fromIndex + i].ToString().Should().Be(instructions[i]);

diff --git a/sonaranalyzer-dotnet/tests/SonarAnalyzer.UnitTest/Helpers/FlowAnalysis/ExplodedGraphTest.cs b/sonaranalyzer-dotnet/tests/SonarAnalyzer.UnitTest/Helpers/FlowAnalysis/ExplodedGraphTest.cs
@@ -353,7 +353,7 @@ public void ExplodedGraph_BothBranchesVisited()
                 "and thus should be processed only once.");
             numberOfLastInstructionVisits.Should().Be(2);
 
-            visitedBlocks.Count.Should().Be(cfg.Blocks.Count() - 1 /* Exit block*/);
+            visitedBlocks.Should().HaveCount(cfg.Blocks.Count() - 1 /* Exit block*/);
         }
 
         [TestMethod]
@@ -427,7 +427,7 @@ public void ExplodedGraph_BothBranchesVisited_NonCondition()
             explodedGraph.Walk();
 
             explorationEnded.Should().BeTrue();
-            visitedBlocks.Count.Should().Be(cfg.Blocks.Count() - 1 /* Exit block */);
+            visitedBlocks.Should().HaveCount(cfg.Blocks.Count() - 1 /* Exit block */);
             countConditionEvaluated.Should().Be(0);
         }
 

diff --git a/...sts/SonarAnalyzer.UnitTest/Helpers/FlowAnalysis/NullableSymbolicValue_TrySetConstraint.cs b/...sts/SonarAnalyzer.UnitTest/Helpers/FlowAnalysis/NullableSymbolicValue_TrySetConstraint.cs
@@ -45,7 +45,7 @@ public void TrySetConstraint_Existing_No_Set_True()
 
             var newProgramStates = this.sv_0.TrySetConstraint(BoolConstraint.True, ps).ToList();
 
-            newProgramStates.Should().HaveCount(1);
+            newProgramStates.Should().ContainSingle();
             ShouldHaveConstraint(newProgramStates[0], this.sv_0, NullableValueConstraint.HasValue);
             ShouldHaveConstraint(newProgramStates[0], this.sv_w, BoolConstraint.True);
         }
@@ -57,7 +57,7 @@ public void TrySetConstraint_Existing_No_Set_False()
 
             var newProgramStates = this.sv_0.TrySetConstraint(BoolConstraint.False, ps).ToList();
 
-            newProgramStates.Should().HaveCount(1);
+            newProgramStates.Should().ContainSingle();
             ShouldHaveConstraint(newProgramStates[0], this.sv_0, NullableValueConstraint.HasValue);
             ShouldHaveConstraint(newProgramStates[0], this.sv_w, BoolConstraint.False);
         }
@@ -69,7 +69,7 @@ public void TrySetConstraint_Existing_No_Set_NoValue()
 
             var newProgramStates = this.sv_0.TrySetConstraint(NullableValueConstraint.NoValue, ps).ToList();
 
-            newProgramStates.Should().HaveCount(1);
+            newProgramStates.Should().ContainSingle();
             ShouldHaveConstraint(newProgramStates[0], this.sv_0, NullableValueConstraint.NoValue);
         }
 
@@ -80,7 +80,7 @@ public void TrySetConstraint_Existing_No_Set_HasValue()
 
             var newProgramStates = this.sv_0.TrySetConstraint(NullableValueConstraint.HasValue, ps).ToList();
 
-            newProgramStates.Should().HaveCount(1);
+            newProgramStates.Should().ContainSingle();
             ShouldHaveConstraint(newProgramStates[0], this.sv_0, NullableValueConstraint.HasValue);
         }
 
@@ -91,7 +91,7 @@ public void TrySetConstraint_Existing_No_Set_Null()
 
             var newProgramStates = this.sv_0.TrySetConstraint(ObjectConstraint.Null, ps).ToList();
 
-            newProgramStates.Should().HaveCount(1);
+            newProgramStates.Should().ContainSingle();
             ShouldHaveConstraint(newProgramStates[0], this.sv_0, NullableValueConstraint.NoValue);
         }
 
@@ -102,7 +102,7 @@ public void TrySetConstraint_Existing_No_Set_NotNull()
 
             var newProgramStates = this.sv_0.TrySetConstraint(ObjectConstraint.NotNull, ps).ToList();
 
-            newProgramStates.Should().HaveCount(1);
+            newProgramStates.Should().ContainSingle();
             ShouldHaveConstraint(newProgramStates[0], this.sv_0, NullableValueConstraint.HasValue);
         }
 
@@ -133,7 +133,7 @@ public void TrySetConstraint_Existing_True_Set_False()
 
             var newProgramStates = this.sv_0.TrySetConstraint(BoolConstraint.False, ps).ToList();
 
-            newProgramStates.Should().HaveCount(0);
+            newProgramStates.Should().BeEmpty();
         }
 
         [TestMethod]
@@ -143,7 +143,7 @@ public void TrySetConstraint_Existing_True_Set_NoValue()
 
             var newProgramStates = this.sv_0.TrySetConstraint(NullableValueConstraint.NoValue, ps).ToList();
 
-            newProgramStates.Should().HaveCount(0);
+            newProgramStates.Should().BeEmpty();
         }
 
         [TestMethod]
@@ -163,7 +163,7 @@ public void TrySetConstraint_Existing_True_Set_Null()
 
             var newProgramStates = this.sv_0.TrySetConstraint(ObjectConstraint.Null, ps).ToList();
 
-            newProgramStates.Should().HaveCount(0);
+            newProgramStates.Should().BeEmpty();
         }
 
         [TestMethod]
@@ -193,7 +193,7 @@ public void TrySetConstraint_Existing_False_Set_True()
 
             var newProgramStates = this.sv_0.TrySetConstraint(BoolConstraint.True, ps).ToList();
 
-            newProgramStates.Should().HaveCount(0);
+            newProgramStates.Should().BeEmpty();
         }
 
         [TestMethod]
@@ -213,7 +213,7 @@ public void TrySetConstraint_Existing_False_Set_NoValue()
 
             var newProgramStates = this.sv_0.TrySetConstraint(NullableValueConstraint.NoValue, ps).ToList();
 
-            newProgramStates.Should().HaveCount(0);
+            newProgramStates.Should().BeEmpty();
         }
 
         [TestMethod]
@@ -233,7 +233,7 @@ public void TrySetConstraint_Existing_False_Set_Null()
 
             var newProgramStates = this.sv_0.TrySetConstraint(ObjectConstraint.Null, ps).ToList();
 
-            newProgramStates.Should().HaveCount(0);
+            newProgramStates.Should().BeEmpty();
         }
 
         [TestMethod]
@@ -263,7 +263,7 @@ public void TrySetConstraint_Existing_NoValue_Set_True()
 
             var newProgramStates = this.sv_0.TrySetConstraint(BoolConstraint.True, ps).ToList();
 
-            newProgramStates.Should().HaveCount(0);
+            newProgramStates.Should().BeEmpty();
         }
 
         [TestMethod]
@@ -273,7 +273,7 @@ public void TrySetConstraint_Existing_NoValue_Set_False()
 
             var newProgramStates = this.sv_0.TrySetConstraint(BoolConstraint.False, ps).ToList();
 
-            newProgramStates.Should().HaveCount(0);
+            newProgramStates.Should().BeEmpty();
         }
 
         [TestMethod]
@@ -293,7 +293,7 @@ public void TrySetConstraint_Existing_NoValue_Set_HasValue()
 
             var newProgramStates = this.sv_0.TrySetConstraint(NullableValueConstraint.HasValue, ps).ToList();
 
-            newProgramStates.Should().HaveCount(0);
+            newProgramStates.Should().BeEmpty();
         }
 
         [TestMethod]
@@ -313,7 +313,7 @@ public void TrySetConstraint_Existing_NoValue_Set_NotNull()
 
             var newProgramStates = this.sv_0.TrySetConstraint(ObjectConstraint.NotNull, ps).ToList();
 
-            newProgramStates.Should().HaveCount(0);
+            newProgramStates.Should().BeEmpty();
         }
 
         [TestMethod]
@@ -333,7 +333,7 @@ public void TrySetConstraint_Existing_HasValue_Set_True()
 
             var newProgramStates = this.sv_0.TrySetConstraint(BoolConstraint.True, ps).ToList();
 
-            newProgramStates.Should().HaveCount(1);
+            newProgramStates.Should().ContainSingle();
             ShouldHaveConstraint(newProgramStates[0], this.sv_0, NullableValueConstraint.HasValue);
             ShouldHaveConstraint(newProgramStates[0], this.sv_w, BoolConstraint.True);
         }
@@ -345,7 +345,7 @@ public void TrySetConstraint_Existing_HasValue_Set_False()
 
             var newProgramStates = this.sv_0.TrySetConstraint(BoolConstraint.False, ps).ToList();
 
-            newProgramStates.Should().HaveCount(1);
+            newProgramStates.Should().ContainSingle();
             ShouldHaveConstraint(newProgramStates[0], this.sv_0, NullableValueConstraint.HasValue);
             ShouldHaveConstraint(newProgramStates[0], this.sv_w, BoolConstraint.False);
         }
@@ -357,7 +357,7 @@ public void TrySetConstraint_Existing_HasValue_Set_NoValue()
 
             var newProgramStates = this.sv_0.TrySetConstraint(NullableValueConstraint.NoValue, ps).ToList();
 
-            newProgramStates.Should().HaveCount(0);
+            newProgramStates.Should().BeEmpty();
         }
 
         [TestMethod]
@@ -377,7 +377,7 @@ public void TrySetConstraint_Existing_HasValue_Set_Null()
 
             var newProgramStates = this.sv_0.TrySetConstraint(ObjectConstraint.Null, ps).ToList();
 
-            newProgramStates.Should().HaveCount(0);
+            newProgramStates.Should().BeEmpty();
         }
 
         [TestMethod]
@@ -407,7 +407,7 @@ public void TrySetConstraint_Existing_Null_Set_True()
 
             var newProgramStates = this.sv_0.TrySetConstraint(BoolConstraint.True, ps).ToList();
 
-            newProgramStates.Should().HaveCount(0);
+            newProgramStates.Should().BeEmpty();
         }
 
         [TestMethod]
@@ -417,7 +417,7 @@ public void TrySetConstraint_Existing_Null_Set_False()
 
             var newProgramStates = this.sv_0.TrySetConstraint(BoolConstraint.False, ps).ToList();
 
-            newProgramStates.Should().HaveCount(0);
+            newProgramStates.Should().BeEmpty();
         }
 
         [TestMethod]
@@ -437,7 +437,7 @@ public void TrySetConstraint_Existing_Null_Set_HasValue()
 
             var newProgramStates = this.sv_0.TrySetConstraint(NullableValueConstraint.HasValue, ps).ToList();
 
-            newProgramStates.Should().HaveCount(0);
+            newProgramStates.Should().BeEmpty();
         }
 
         [TestMethod]
@@ -457,7 +457,7 @@ public void TrySetConstraint_Existing_Null_Set_NotNull()
 
             var newProgramStates = this.sv_0.TrySetConstraint(ObjectConstraint.NotNull, ps).ToList();
 
-            newProgramStates.Should().HaveCount(0);
+            newProgramStates.Should().BeEmpty();
         }
 
         [TestMethod]
@@ -477,7 +477,7 @@ public void TrySetConstraint_Existing_NotNull_Set_True()
 
             var newProgramStates = this.sv_0.TrySetConstraint(BoolConstraint.True, ps).ToList();
 
-            newProgramStates.Should().HaveCount(1);
+            newProgramStates.Should().ContainSingle();
             ShouldHaveConstraint(newProgramStates[0], this.sv_0, NullableValueConstraint.HasValue);
             ShouldHaveConstraint(newProgramStates[0], this.sv_w, BoolConstraint.True);
         }
@@ -489,7 +489,7 @@ public void TrySetConstraint_Existing_NotNull_Set_False()
 
             var newProgramStates = this.sv_0.TrySetConstraint(BoolConstraint.False, ps).ToList();
 
-            newProgramStates.Should().HaveCount(1);
+            newProgramStates.Should().ContainSingle();
             ShouldHaveConstraint(newProgramStates[0], this.sv_0, NullableValueConstraint.HasValue);
             ShouldHaveConstraint(newProgramStates[0], this.sv_w, BoolConstraint.False);
         }
@@ -501,7 +501,7 @@ public void TrySetConstraint_Existing_NotNull_Set_NoValue()
 
             var newProgramStates = this.sv_0.TrySetConstraint(NullableValueConstraint.NoValue, ps).ToList();
 
-            newProgramStates.Should().HaveCount(0);
+            newProgramStates.Should().BeEmpty();
         }
 
         [TestMethod]
@@ -521,7 +521,7 @@ public void TrySetConstraint_Existing_NotNull_Set_Null()
 
             var newProgramStates = this.sv_0.TrySetConstraint(ObjectConstraint.Null, ps).ToList();
 
-            newProgramStates.Should().HaveCount(0);
+            newProgramStates.Should().BeEmpty();
         }
 
         [TestMethod]

diff --git a/...rAnalyzer.UnitTest/Helpers/FlowAnalysis/NullableSymbolicValue_TrySetOppositeConstraint.cs b/...rAnalyzer.UnitTest/Helpers/FlowAnalysis/NullableSymbolicValue_TrySetOppositeConstraint.cs
@@ -73,7 +73,7 @@ public void TrySetOppositeConstraint_Existing_No_Set_None()
 
             var newProgramStates = this.sv_0.TrySetOppositeConstraint(NullableValueConstraint.NoValue, ps).ToList();
 
-            newProgramStates.Should().HaveCount(1);
+            newProgramStates.Should().ContainSingle();
             ShouldHaveConstraint(newProgramStates[0], this.sv_0, NullableValueConstraint.HasValue);
         }
 
@@ -84,7 +84,7 @@ public void TrySetOppositeConstraint_Existing_No_Set_Some()
 
             var newProgramStates = this.sv_0.TrySetOppositeConstraint(NullableValueConstraint.HasValue, ps).ToList();
 
-            newProgramStates.Should().HaveCount(1);
+            newProgramStates.Should().ContainSingle();
             ShouldHaveConstraint(newProgramStates[0], this.sv_0, NullableValueConstraint.NoValue);
         }
 
@@ -95,7 +95,7 @@ public void TrySetOppositeConstraint_Existing_No_Set_Null()
 
             var newProgramStates = this.sv_0.TrySetOppositeConstraint(ObjectConstraint.Null, ps).ToList();
 
-            newProgramStates.Should().HaveCount(1);
+            newProgramStates.Should().ContainSingle();
             ShouldHaveConstraint(newProgramStates[0], this.sv_0, NullableValueConstraint.HasValue);
         }