Upgraded to FluentAssertions 5.1.1, activated test for 5.x.x (#27)

* Upgraded to FluentAssertions 5.1.1, activated test for 5.x.x

* upgraded libs

Author: AdaskoTheBeAsT

src/FluentAssertions.Analyzers.Tests/DiagnosticVerifier.cs

@@ -42,6 +42,9 @@ static DiagnosticVerifier()
             .Append(GetSystemAssemblyPathByName("System.Private.Xml.Linq.dll"))
             .Append(GetSystemAssemblyPathByName("System.Linq.Expressions.dll"))
             .Append(GetSystemAssemblyPathByName("System.Collections.dll"))
+            .Append(GetSystemAssemblyPathByName("netstandard.dll"))
+            .Append(GetSystemAssemblyPathByName("System.Xml.ReaderWriter.dll"))
+            .Append(GetSystemAssemblyPathByName("System.Private.Xml.dll"))
             .Select(location => (MetadataReference)MetadataReference.CreateFromFile(location))
             .ToImmutableArray();
 

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

@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="4.19.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
+    <PackageReference Include="FluentAssertions" Version="5.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.2.0" />
   </ItemGroup>
 
   <ItemGroup>

src/FluentAssertions.Analyzers.Tests/GenerateCode.cs

@@ -16,7 +16,7 @@ public static string EnumerableExpressionBodyAssertion(string assertion) => Enum
             .AppendLine("using System.Collections.Generic;")
             .AppendLine("using System.Linq;")
             .AppendLine("using System;")
-            .AppendLine("using FluentAssertions;")
+            .AppendLine("using FluentAssertions;using FluentAssertions.Extensions;")
             .AppendLine("namespace TestNamespace")
             .AppendLine("{")
             .AppendLine("    public class TestClass")
@@ -42,7 +42,7 @@ public static string EnumerableExpressionBodyAssertion(string assertion) => Enum
             .AppendLine("using System.Collections.Generic;")
             .AppendLine("using System.Linq;")
             .AppendLine("using System;")
-            .AppendLine("using FluentAssertions;")
+            .AppendLine("using FluentAssertions;using FluentAssertions.Extensions;")
             .AppendLine("namespace TestNamespace")
             .AppendLine("{")
             .AppendLine("    public class TestClass")
@@ -80,7 +80,7 @@ public static string EnumerableExpressionBodyAssertion(string assertion) => Enum
 
         public static string StringAssertion(string assertion) => new StringBuilder()
             .AppendLine("using System;")
-            .AppendLine("using FluentAssertions;")
+            .AppendLine("using FluentAssertions;using FluentAssertions.Extensions;")
             .AppendLine("namespace TestNamespace")
             .AppendLine("{")
             .AppendLine("    class TestClass")

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

@@ -227,7 +227,7 @@ public class CollectionTests
         [AssertionCodeFix(
             oldAssertion: "actual.AsEnumerable().Count().Should().BeGreaterThan(6{0}).And.ToString();",
             newAssertion: "actual.AsEnumerable().Should().HaveCountGreaterThan(6{0}).And.ToString();")]
-        [Implemented, Ignore("Will be available in Fluent Assertions 5.0")]
+        [Implemented]
         public void CollectionShouldHaveCountGreaterThan_TestCodeFix(string oldAssertion, string newAssertion) => VerifyCSharpFixCodeBlock<CollectionShouldHaveCountGreaterThanCodeFix, CollectionShouldHaveCountGreaterThanAnalyzer>(oldAssertion, newAssertion);
 
         [AssertionDataTestMethod]
@@ -251,7 +251,7 @@ public class CollectionTests
         [AssertionCodeFix(
             oldAssertion: "actual.AsEnumerable().Count().Should().BeGreaterOrEqualTo(6{0}).And.ToString();",
             newAssertion: "actual.AsEnumerable().Should().HaveCountGreaterOrEqualTo(6{0}).And.ToString();")]
-        [Implemented, Ignore("Will be available in Fluent Assertions 5.0")]
+        [Implemented]
         public void CollectionShouldHaveCountGreaterOrEqualTo_TestCodeFix(string oldAssertion, string newAssertion) => VerifyCSharpFixCodeBlock<CollectionShouldHaveCountGreaterOrEqualToCodeFix, CollectionShouldHaveCountGreaterOrEqualToAnalyzer>(oldAssertion, newAssertion);
 
         [AssertionDataTestMethod]
@@ -275,7 +275,7 @@ public class CollectionTests
         [AssertionCodeFix(
             oldAssertion: "actual.AsEnumerable().Count().Should().BeLessThan(6{0}).And.ToString();",
             newAssertion: "actual.AsEnumerable().Should().HaveCountLessThan(6{0}).And.ToString();")]
-        [Implemented, Ignore("Will be available in Fluent Assertions 5.0")]
+        [Implemented]
         public void CollectionShouldHaveCountLessThan_TestCodeFix(string oldAssertion, string newAssertion) => VerifyCSharpFixCodeBlock<CollectionShouldHaveCountLessThanCodeFix, CollectionShouldHaveCountLessThanAnalyzer>(oldAssertion, newAssertion);
 
         [AssertionDataTestMethod]
@@ -299,7 +299,7 @@ public class CollectionTests
         [AssertionCodeFix(
             oldAssertion: "actual.AsEnumerable().Count().Should().BeLessOrEqualTo(6{0}).And.ToString();",
             newAssertion: "actual.AsEnumerable().Should().HaveCountLessOrEqualTo(6{0}).And.ToString();")]
-        [Implemented, Ignore("Will be available in Fluent Assertions 5.0")]
+        [Implemented]
         public void CollectionShouldHaveCountLessOrEqualTo_TestCodeFix(string oldAssertion, string newAssertion) => VerifyCSharpFixCodeBlock<CollectionShouldHaveCountLessOrEqualToCodeFix, CollectionShouldHaveCountLessOrEqualToAnalyzer>(oldAssertion, newAssertion);
 
         [AssertionDataTestMethod]
@@ -323,7 +323,7 @@ public class CollectionTests
         [AssertionCodeFix(
             oldAssertion: "actual.AsEnumerable().Count().Should().NotBe(6{0}).And.ToString();",
             newAssertion: "actual.AsEnumerable().Should().NotHaveCount(6{0}).And.ToString();")]
-        [Implemented, Ignore("Will be available in Fluent Assertions 5.0")]
+        [Implemented]
         public void CollectionShouldNotHaveCount_TestCodeFix(string oldAssertion, string newAssertion) => VerifyCSharpFixCodeBlock<CollectionShouldNotHaveCountCodeFix, CollectionShouldNotHaveCountAnalyzer>(oldAssertion, newAssertion);
 
         [AssertionDataTestMethod]
@@ -355,7 +355,7 @@ public class CollectionTests
         [AssertionCodeFix(
             oldAssertion: "actual.AsEnumerable().Count().Should().NotBe(unexpected.Count(){0}).And.ToString();",
             newAssertion: "actual.AsEnumerable().Should().NotHaveSameCount(unexpected{0}).And.ToString();")]
-        [Implemented, Ignore("Will be available in Fluent Assertions 5.0")]
+        [Implemented]
         public void CollectionShouldNotHaveSameCount_TestCodeFix(string oldAssertion, string newAssertion) => VerifyCSharpFixCodeBlock<CollectionShouldNotHaveSameCountCodeFix, CollectionShouldNotHaveSameCountAnalyzer>(oldAssertion, newAssertion);
 
         [AssertionDataTestMethod]
@@ -563,7 +563,8 @@ public class CollectionTests
         [AssertionCodeFix(
             oldAssertion: "actual.AsEnumerable().Select(x => x.BooleanProperty).Should().NotContainNulls({0}).And.ToString();",
             newAssertion: "actual.AsEnumerable().Should().NotContainNulls(x => x.BooleanProperty{0}).And.ToString();")]
-        [Implemented, Ignore("Will be available in Fluent Assertions 5.0")]
+        [Implemented]
+        [Ignore("What Should Happen?")]
         public void CollectionShouldNotContainNulls_TestCodeFix(string oldAssertion, string newAssertion) => VerifyCSharpFixCodeBlock<CollectionShouldNotContainNullsCodeFix, CollectionShouldNotContainNullsAnalyzer>(oldAssertion, newAssertion);
 
         [AssertionDataTestMethod]
@@ -596,7 +597,6 @@ public class CollectionTests
         [AssertionCodeFix(
             oldAssertion: "actual.AsEnumerable().Select(x => x.BooleanProperty).Should().OnlyHaveUniqueItems({0}).And.ToString();",
             newAssertion: "actual.AsEnumerable().Should().OnlyHaveUniqueItems(x => x.BooleanProperty{0}).And.ToString();")]
-        [Ignore("Will be available in Fluent Assertions 5.0")]
         public void CollectionShouldOnlyHaveUniqueItemsByComparer_TestCodeFix(string oldAssertion, string newAssertion) => VerifyCSharpFixCodeBlock<CollectionShouldOnlyHaveUniqueItemsByComparerCodeFix, CollectionShouldOnlyHaveUniqueItemsByComparerAnalyzer>(oldAssertion, newAssertion);
 
         [AssertionDataTestMethod]

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

@@ -16,7 +16,7 @@ private void VerifyCSharpDiagnostic(string assertion)
         {
             var code = new StringBuilder()
                 .AppendLine("using System;")
-                .AppendLine("using FluentAssertions;")
+                .AppendLine("using FluentAssertions;using FluentAssertions.Extensions;")
                 .AppendLine("namespace TestNamespace")
                 .AppendLine("{")
                 .AppendLine("    class TestClass")

src/FluentAssertions.Analyzers/FluentAssertions.Analyzers.csproj

@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.3.2" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.3.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.6.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.6.1" />
     <PackageReference Include="Microsoft.Composition" Version="1.0.31" />
   </ItemGroup>