Update dependency FluentAssertions to v6 (#554)

* Update dependency FluentAssertions to v6
* Fix compilation after FluentAssertions upgrade
* Remove FluentAssertions from FluentNHibernate.Testing

+semver:patch

Co-authored-by: Alex Zaytsev <[email protected]>

Author: renovate[bot]

src/FluentNHibernate.Specs/Diagnostics/Registration_diagnostics_specs.cs

@@ -114,7 +114,7 @@ public class when_automapping_with_diagnostics_enabled
             results.AutomappingSkippedTypes.Select(x => x.Reason).Should().Contain("Skipped by result of IAutomappingConfiguration.ShouldMap(Type)");
 
         It should_not_include_a_skipped_entry_for_used_types = () =>
-            results.AutomappingSkippedTypes.Should().NotContain(new Type[] { typeof(Second), typeof(Third) });
+            results.AutomappingSkippedTypes.Select(x => x.Type).Should().NotContain(new Type[] { typeof(Second), typeof(Third) });
 
         It should_include_all_unskipped_types_in_the_candidate_list = () =>
             results.AutomappingCandidateTypes.Should().OnlyContain(type => type.Equals(typeof(Second)) || type.Equals(typeof(Third)));
@@ -160,7 +160,7 @@ public class when_automapping_with_diagnostics_enabled_and_excluding_by_where
             results.AutomappingSkippedTypes.Select(x => x.Reason).Should().Contain("Skipped by Where clause");
 
         It should_not_include_a_skipped_entry_for_used_types = () =>
-            results.AutomappingSkippedTypes.Should().NotContain(new Type[] { typeof(Second), typeof(Third) });
+            results.AutomappingSkippedTypes.Select(x => x.Type).Should().NotContain(new Type[] { typeof(Second), typeof(Third) });
 
         It should_include_all_unskipped_types_in_the_candidate_list = () =>
             results.AutomappingCandidateTypes.Should().OnlyContain(type => type.Equals(typeof(Second)) || type.Equals(typeof(Third)));
@@ -198,7 +198,7 @@ public class when_automapping_with_diagnostics_enabled_and_excluding_by_IgnoreBa
             results.AutomappingSkippedTypes.Select(x => x.Reason).Should().Contain("Skipped by IgnoreBase");
 
         It should_not_include_a_skipped_entry_for_used_types = () =>
-            results.AutomappingSkippedTypes.Should().NotContain(new Type[] { typeof(Second), typeof(Third) });
+            results.AutomappingSkippedTypes.Select(x => x.Type).Should().NotContain(new Type[] { typeof(Second), typeof(Third) });
 
         It should_include_all_unskipped_types_in_the_candidate_list = () =>
             results.AutomappingCandidateTypes.Should().OnlyContain(type => type.Equals(typeof(Second)) || type.Equals(typeof(Third)));
@@ -236,7 +236,7 @@ public class when_automapping_with_diagnostics_enabled_and_excluding_by_generic_
             results.AutomappingSkippedTypes.Select(x => x.Reason).Should().Contain("Skipped by IgnoreBase");
 
         It should_not_include_a_skipped_entry_for_used_types = () =>
-            results.AutomappingSkippedTypes.Should().NotContain(new Type[] { typeof(Second), typeof(Third) });
+            results.AutomappingSkippedTypes.Select(x => x.Type).Should().NotContain(new Type[] { typeof(Second), typeof(Third) });
 
         It should_include_all_unskipped_types_in_the_candidate_list = () =>
             results.AutomappingCandidateTypes.Should().OnlyContain(type => type.Equals(typeof(Second)) || type.Equals(typeof(Third)));
@@ -273,7 +273,7 @@ public class when_automapping_with_diagnostics_enabled_and_excluding_by_layer_su
             results.AutomappingSkippedTypes.Select(x => x.Reason).Should().Contain("Skipped by IAutomappingConfiguration.AbstractClassIsLayerSupertype(Type)");
 
         It should_not_include_a_skipped_entry_for_used_types = () =>
-            results.AutomappingSkippedTypes.Should().NotContain(new Type[] { typeof(Second), typeof(Third) });
+            results.AutomappingSkippedTypes.Select(x => x.Type).Should().NotContain(new Type[] { typeof(Second), typeof(Third) });
 
         It should_include_all_unskipped_types_in_the_candidate_list = () =>
             results.AutomappingCandidateTypes.Should().OnlyContain(type => type.Equals(typeof(Second)) || type.Equals(typeof(Third)));
@@ -318,7 +318,7 @@ public class when_automapping_with_diagnostics_enabled_and_excluding_by_explicit
             results.AutomappingSkippedTypes.Select(x => x.Reason).Should().Contain("Skipped by IAutomappingConfiguration.IsComponent(Type)");
 
         It should_not_include_a_skipped_entry_for_used_types = () =>
-            results.AutomappingSkippedTypes.Should().NotContain(new Type[] { typeof(Second), typeof(Third) } );
+            results.AutomappingSkippedTypes.Select(x => x.Type).Should().NotContain(new Type[] { typeof(Second), typeof(Third) } );
 
         It should_include_all_unskipped_types_in_the_candidate_list = () =>
             results.AutomappingCandidateTypes.Should().OnlyContain(type => type.Equals(typeof(Second)) || type.Equals(typeof(Third)));

src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj

@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="FluentAssertions" Version="4.19.4" />
+    <PackageReference Include="FluentAssertions" Version="6.7.0" />
     <PackageReference Include="Machine.Specifications" Version="1.1.0" />
     <PackageReference Include="Machine.Specifications.Runner.VisualStudio" Version="2.10.2" />
   </ItemGroup>

src/FluentNHibernate.Testing/ConventionFinderTests/AddingTypeTests.cs

@@ -2,7 +2,6 @@
 using FluentNHibernate.Conventions;
 using FluentNHibernate.Conventions.Instances;
 using NUnit.Framework;
-using FluentAssertions;
 
 namespace FluentNHibernate.Testing.ConventionFinderTests
 {
@@ -31,7 +30,6 @@ public void AddingSingleShouldntThrowIfHasIConventionFinderConstructor()
             Action act = () => finder.Add<ConventionWithIConventionFinderConstructor>();
 
             act.ShouldNotThrow();
-
         }
 
         [Test]

src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj

@@ -21,7 +21,6 @@
     <PackageReference Include="Microsoft.Data.Sqlite" Version="2.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="FakeItEasy" Version="7.3.1" />
-    <PackageReference Include="FluentAssertions" Version="4.19.4" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.116" />

src/FluentNHibernate.Testing/Infrastructure/ContainerTester.cs

@@ -1,7 +1,6 @@
 using System;
 using FluentNHibernate.Infrastructure;
 using NUnit.Framework;
-using FluentAssertions;
 
 namespace FluentNHibernate.Testing.Infrastructure
 {

src/FluentNHibernate.Testing/SpecificationExtensions.cs

@@ -7,8 +7,6 @@
 
 namespace FluentNHibernate.Testing
 {
-    public delegate void MethodThatThrows();
-
     public static class SpecificationExtensions
     {
         public static void ShouldBeFalse(this bool condition)
@@ -240,31 +238,19 @@ public static void ShouldNotStartWith(this string actual, string expected)
             StringAssert.DoesNotStartWith(expected, actual);
         }
 
-        public static void ShouldContainErrorMessage(this Exception exception, string expected)
+        public static void WithMessage(this Exception exception, string expected)
         {
-            StringAssert.Contains(expected, exception.Message);
+            Assert.That(exception.Message, Is.EqualTo(expected));
         }
 
-        public static Exception ShouldBeThrownBy(this Type exceptionType, MethodThatThrows method)
+        public static Exception ShouldThrow<TException>(this Action action) where TException : Exception
         {
-            Exception exception = null;
-
-            try
-            {
-                method();
-            }
-            catch (Exception e)
-            {
-                Assert.AreEqual(exceptionType, e.GetType());
-                exception = e;
-            }
-
-            if (exception == null)
-            {
-                Assert.Fail(String.Format("Expected {0} to be thrown.", exceptionType.FullName));
-            }
+            return Assert.Throws<TException>(new TestDelegate(action));
+        }
 
-            return exception;
+        public static void ShouldNotThrow(this Action action)
+        {
+            Assert.DoesNotThrow(new TestDelegate(action));
         }
 
         public static void ShouldEqualSqlDate(this DateTime actual, DateTime expected)

src/FluentNHibernate.Testing/Testing/PersistenceSpecificationTester.cs

@@ -141,8 +141,8 @@ public void should_not_be_equal_without_the_equality_comparer()
         {
             spec = new PersistenceSpecification<Cat>(sessionSource);
 
-            typeof(ApplicationException).ShouldBeThrownBy(() =>
-                spec.CheckList(x => x.AllKittens, cat.AllKittens).VerifyTheMappings());
+            Action act = () => spec.CheckList(x => x.AllKittens, cat.AllKittens).VerifyTheMappings();
+            act.ShouldThrow<ApplicationException>();
         }
 
         [Test]
@@ -163,7 +163,8 @@ public void Can_test_enumerable()
             spec.CheckEnumerable(x => x.EnumerableOfKittens, (cat, kitten) => cat.AddKitten(kitten), kittens);
 #pragma warning restore 618,612
 
-            typeof(ApplicationException).ShouldBeThrownBy(() => spec.VerifyTheMappings());
+            Action act = () => spec.VerifyTheMappings();
+            act.ShouldThrow<ApplicationException>();
         }
 
         [Test]
@@ -232,8 +233,8 @@ public void Should_reject_classes_without_a_parameterless_constructor()
         {
             var _spec = new PersistenceSpecification<NoParameterlessConstructorClass>(sessionSource);
 
-            typeof(MissingConstructorException).ShouldBeThrownBy(() =>
-                _spec.VerifyTheMappings());
+            Action act = () => _spec.VerifyTheMappings();
+            act.ShouldThrow<MissingConstructorException>();
         }
 
         [Test]