tests: update FluentAssertions to version 6.1.0 (#112)

* update FluentAssertions to version 6.1.0

* update referenced assemblies for test code

* remove tests for non generic collections

* update test asserting the AndConstraint

Author: Meir017

src/FluentAssertions.Analyzers.Tests/DiagnosticVerifier.cs

@@ -35,6 +35,8 @@ static DiagnosticVerifier()
                 typeof(AssertionScope), // FluentAssertions.Core
                 typeof(AssertionExtensions), // FluentAssertions
             }.Select(type => type.GetTypeInfo().Assembly.Location)
+            .Append(GetSystemAssemblyPathByName("System.Runtime.Extensions.dll"))
+            .Append(GetSystemAssemblyPathByName("System.Data.Common.dll"))
             .Append(GetSystemAssemblyPathByName("System.Threading.Tasks.dll"))
             .Append(GetSystemAssemblyPathByName("System.Runtime.dll"))
             .Append(GetSystemAssemblyPathByName("System.Reflection.dll"))

src/FluentAssertions.Analyzers.Tests/FluentAssertions.Analyzers.Tests.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.9.0" />
+    <PackageReference Include="FluentAssertions" Version="6.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
     <PackageReference Include="MSTest.TestFramework" Version="2.0.0" />

src/FluentAssertions.Analyzers.Tests/GenerateCode.cs

@@ -33,24 +33,6 @@ public static string GenericIListExpressionBodyAssertion(string assertion) => Ge
             .AppendLine("}")
             .ToString();
 
-        public static string IEnumerableAssertion(string assertion) => new StringBuilder()
-            .AppendLine("using System.Collections;")
-            .AppendLine("using System.Linq;")
-            .AppendLine("using System;")
-            .AppendLine("using FluentAssertions;using FluentAssertions.Extensions;")
-            .AppendLine("namespace TestNamespace")
-            .AppendLine("{")
-            .AppendLine("    public class TestClass")
-            .AppendLine("    {")
-            .AppendLine("        public void TestMethod(IEnumerable actual, IEnumerable expected)")
-            .AppendLine("        {")
-            .AppendLine($"            {assertion}")
-            .AppendLine("        }")
-            .AppendLine("    }")
-            .AppendMainMethod()
-            .AppendLine("}")
-            .ToString();
-
         public static string GenericIEnumerableAssertion(string assertion) => new StringBuilder()
             .AppendLine("using System.Collections.Generic;")
             .AppendLine("using System.Linq;")

src/FluentAssertions.Analyzers.Tests/Tips/CollectionTests.cs

@@ -356,15 +356,6 @@ public class CollectionTests
         [Implemented]
         public void CollectionShouldNotHaveSameCount_TestCodeFix(string oldAssertion, string newAssertion) => VerifyCSharpFixCodeBlock<CollectionShouldNotHaveSameCountCodeFix, CollectionShouldNotHaveSameCountAnalyzer>(oldAssertion, newAssertion);
 
-        [AssertionDataTestMethod]
-        [AssertionDiagnostic("actual.Should().HaveCount(1{0});")]
-        [Implemented]
-        public void CollectionShouldContainSingle_TestAnalyzer_NonGenericIEnumerableShouldNotReport(string assertion)
-        {
-            var source = GenerateCode.IEnumerableAssertion(assertion);
-            DiagnosticVerifier.VerifyCSharpDiagnosticUsingAllAnalyzers(source);
-        }
-
         [AssertionDataTestMethod]
         [AssertionDiagnostic("actual.Should().HaveCount(1{0});")]
         [Implemented]

src/FluentAssertions.Analyzers.Tests/Tips/SanityTests.cs

@@ -155,7 +155,7 @@ public static void Main()
         [Implemented(Reason = "https://github.com/fluentassertions/fluentassertions.analyzers/issues/63")]
         public void StringShouldNotBeEmptyAndShouldNotBeNull_ShouldNotTrigger()
         {
-            const string assertion = "actual.Should().NotBeEmpty().And.Should().NotBeNull();";
+            const string assertion = "actual.Should().NotBeEmpty().And.Subject.Should().NotBeNull();";
             var source = GenerateCode.StringAssertion(assertion);
 
             DiagnosticVerifier.VerifyCSharpDiagnosticUsingAllAnalyzers(source);
@@ -258,30 +258,5 @@ public static void Main()
 
             DiagnosticVerifier.VerifyCSharpDiagnosticUsingAllAnalyzers(source);
         }
-
-        [TestMethod]
-        [Implemented(Reason = "https://github.com/fluentassertions/fluentassertions.analyzers/issues/82")]
-        public void XmlNodeListShouldHaveCount1_ShouldNotReport()
-        {
-            const string source = @"
-using System.Xml;
-using System.Collections.Generic;
-using FluentAssertions;
-using FluentAssertions.Extensions;
-
-namespace TestNamespace
-{
-    public class Program
-    {
-        public static void Main()
-        {
-            XmlNodeList childNodes = new XmlDocument().ChildNodes;
-            childNodes.Should().HaveCount(1);
-        }
-    }
-}";
-
-            DiagnosticVerifier.VerifyCSharpDiagnosticUsingAllAnalyzers(source);
-        }
     }
 }