Replace FluentAssertions with Machine.Specifications.Should (#736)

+semver:patch

Author: hazzik

src/FluentNHibernate.Specs/Automapping/AutoMapBackwardsCompatibilitySpecs.cs

@@ -2,7 +2,6 @@
 using FluentNHibernate.Automapping;
 using FluentNHibernate.Specs.Automapping.Fixtures;
 using Machine.Specifications;
-using FluentAssertions;
 
 namespace FluentNHibernate.Specs.Automapping;
 // just verify that the obsolete methods still work until we bin them entirely
@@ -14,7 +13,7 @@ public class when_using_automap_obsolete_where_method_for_assembly_of : AutoMapO
             .BuildMappings();
 
     It should_use_the_where_clause_provided = () =>
-        was_called.Should().BeTrue();
+        was_called.ShouldBeTrue();
 }
 
 public class when_using_automap_obsolete_where_method_for_an_assembly : AutoMapObsoleteSpec
@@ -24,7 +23,7 @@ public class when_using_automap_obsolete_where_method_for_an_assembly : AutoMapO
             .BuildMappings();
 
     It should_use_the_where_clause_provided = () =>
-        was_called.Should().BeTrue();
+        was_called.ShouldBeTrue();
 }
 
 public class when_using_automap_obsolete_where_method_for_a_source : AutoMapObsoleteSpec
@@ -34,7 +33,7 @@ public class when_using_automap_obsolete_where_method_for_a_source : AutoMapObso
             .BuildMappings();
 
     It should_use_the_where_clause_provided = () =>
-        was_called.Should().BeTrue();
+        was_called.ShouldBeTrue();
 }
 
 public abstract class AutoMapObsoleteSpec

src/FluentNHibernate.Specs/Automapping/AutoPersistenceModelSpecs.cs

@@ -9,7 +9,6 @@
 using FluentNHibernate.Specs.Automapping.Fixtures;
 using FluentNHibernate.Specs.ExternalFixtures;
 using Machine.Specifications;
-using FluentAssertions;
 
 namespace FluentNHibernate.Specs.Automapping;
 
@@ -57,7 +56,7 @@ public class when_the_automapper_is_ran_to_completion
         ex = Catch.Exception(() => setup.BuildConfiguration());
 
     It should_generate_xml_that_is_accepted_by_the_nhibernate_schema_validation = () =>
-        ex.Should().BeNull();
+        ex.ShouldBeNull();
 
     static FluentConfiguration setup;
     static Exception ex;
@@ -87,7 +86,7 @@ public class when_the_automapper_is_told_to_map_an_inheritance_hierarchy
     // that were already mapped in the child. Needed to change the
     // ordering so parents are always mapped before their children
     It should_map_the_top_most_class_first = () =>
-        ex.Should().BeNull();
+        ex.ShouldBeNull();
 
     static Exception ex;
 }
@@ -103,11 +102,11 @@ public class when_the_automapper_maps_an_inheritance_hierarchy_with_three_levels
             .SelectMany(x => x.Classes);
 
     It should_map_the_parent = () =>
-        mappings.Count().Should().Be(1);
+        mappings.Count().ShouldEqual(1);
 
     It should_map_the_child_child_as_a_subclass_of_parent = () =>
         mappings.Single()
-            .Subclasses.Single().Type.Should().Be(typeof(ChildChild));
+            .Subclasses.Single().Type.ShouldEqual(typeof(ChildChild));
 
     static AutoPersistenceModel mapper;
     static IEnumerable<ClassMapping> mappings;

src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.Components.cs

@@ -8,7 +8,6 @@
 using FluentNHibernate.Specs.ExternalFixtures;
 using FluentNHibernate.Utils;
 using Machine.Specifications;
-using FluentAssertions;
 
 namespace FluentNHibernate.Specs.Automapping;
 
@@ -68,7 +67,7 @@ public class when_the_automapper_is_told_to_map_an_entity_and_a_component_that_h
             .Components.ShouldContain(x => x.Type == typeof(Component));
 
     It should_use_the_component_map_for_mapping = () =>
-        mappings.Single().Components.Single().Access.Should().Be("none");
+        mappings.Single().Components.Single().Access.ShouldEqual("none");
 
     static AutoPersistenceModel mapper;
     static IEnumerable<ClassMapping> mappings;
@@ -105,15 +104,15 @@ public class when_the_automapper_maps_nested_comonents
             .SelectMany(x => x.Properties)
             .SelectMany(x => x.Columns)
             .Select(x => x.Name)
-            .Should().Contain(new string[] { "LeftLocationProperty", "RightLocationProperty" });
+            .ShouldContain("LeftLocationProperty", "RightLocationProperty");
 
     It should_prefix_the_components_in_the_components = () =>
         mapping.Components
             .SelectMany(x => x.Components)
             .SelectMany(x => x.Properties)
             .SelectMany(x => x.Columns)
             .Select(x => x.Name)
-            .Should().Contain(new string[] { "LeftAPropertyA", "LeftBPropertyB", "RightAPropertyA", "RightBPropertyB" });
+            .ShouldContain("LeftAPropertyA", "LeftBPropertyB", "RightAPropertyA", "RightBPropertyB");
 
     static AutoPersistenceModel mapper;
     static ClassMapping mapping;

src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.ElementCollections.cs

@@ -6,7 +6,6 @@
 using FluentNHibernate.MappingModel.Collections;
 using FluentNHibernate.Specs.Automapping.Fixtures;
 using Machine.Specifications;
-using FluentAssertions;
 
 namespace FluentNHibernate.Specs.Automapping;
 
@@ -16,7 +15,7 @@ public class when_the_automapper_is_asked_if_it_can_map_a_list_of_strings : Auto
         maps_property = step.ShouldMap(FakeMembers.IListOfStrings);
 
     It should_accept_the_property = () =>
-        maps_property.Should().BeTrue();
+        maps_property.ShouldBeTrue();
 
     static bool maps_property;
 }
@@ -27,7 +26,7 @@ public class when_the_automapper_is_asked_if_it_can_map_a_list_of_ints : AutoMap
         maps_property = step.ShouldMap(FakeMembers.IListOfInts);
 
     It should_accept_the_property = () =>
-        maps_property.Should().BeTrue();
+        maps_property.ShouldBeTrue();
 
     static bool maps_property;
 }
@@ -38,7 +37,7 @@ public class when_the_automapper_is_asked_if_it_can_map_a_list_of_doubles : Auto
         maps_property = step.ShouldMap(FakeMembers.IListOfDoubles);
 
     It should_accept_the_property = () =>
-        maps_property.Should().BeTrue();
+        maps_property.ShouldBeTrue();
 
     static bool maps_property;
 }
@@ -49,7 +48,7 @@ public class when_the_automapper_is_asked_if_it_can_map_a_list_of_shorts : AutoM
         maps_property = step.ShouldMap(FakeMembers.IListOfShorts);
 
     It should_accept_the_property = () =>
-        maps_property.Should().BeTrue();
+        maps_property.ShouldBeTrue();
 
     static bool maps_property;
 }
@@ -60,7 +59,7 @@ public class when_the_automapper_is_asked_if_it_can_map_a_list_of_longs : AutoMa
         maps_property = step.ShouldMap(FakeMembers.IListOfLongs);
 
     It should_accept_the_property = () =>
-        maps_property.Should().BeTrue();
+        maps_property.ShouldBeTrue();
 
     static bool maps_property;
 }
@@ -71,7 +70,7 @@ public class when_the_automapper_is_asked_if_it_can_map_a_list_of_floats : AutoM
         maps_property = step.ShouldMap(FakeMembers.IListOfFloats);
 
     It should_accept_the_property = () =>
-        maps_property.Should().BeTrue();
+        maps_property.ShouldBeTrue();
 
     static bool maps_property;
 }
@@ -82,7 +81,7 @@ public class when_the_automapper_is_asked_if_it_can_map_a_list_of_bools : AutoMa
         maps_property = step.ShouldMap(FakeMembers.IListOfBools);
 
     It should_accept_the_property = () =>
-        maps_property.Should().BeTrue();
+        maps_property.ShouldBeTrue();
 
     static bool maps_property;
 }
@@ -93,7 +92,7 @@ public class when_the_automapper_is_asked_if_it_can_map_a_list_of_DateTimes : Au
         maps_property = step.ShouldMap(FakeMembers.IListOfDateTimes);
 
     It should_accept_the_property = () =>
-        maps_property.Should().BeTrue();
+        maps_property.ShouldBeTrue();
 
     static bool maps_property;
 }
@@ -107,7 +106,7 @@ public class when_the_automapper_is_told_to_map_a_list_of_simple_types_with_a_cu
         step.Map(container, FakeMembers.IListOfStrings);
 
     It should_create_use_the_element_column_name_defined_in_the_expressions = () =>
-        container.Collections.Single().Element.Columns.Single().Name.Should().Be("custom_column");
+        container.Collections.Single().Element.Columns.Single().Name.ShouldEqual("custom_column");
 }
 
 public class when_the_automapper_is_told_to_map_a_list_of_simple_types : AutoMapOneToManySpec
@@ -116,43 +115,43 @@ public class when_the_automapper_is_told_to_map_a_list_of_simple_types : AutoMap
         step.Map(container, FakeMembers.IListOfStrings);
 
     It should_create_a_collection = () =>
-        container.Collections.Count().Should().Be(1);
+        container.Collections.Count().ShouldEqual(1);
 
     It should_create_a_collection_that_s_a_bag = () =>
-        container.Collections.Single().Collection.Should().Be(Collection.Bag);
+        container.Collections.Single().Collection.ShouldEqual(Collection.Bag);
 
     It should_create_an_element_for_the_collection = () =>
-        container.Collections.Single().Element.Should().NotBeNull();
+        container.Collections.Single().Element.ShouldNotBeNull();
 
     It should_use_the_default_element_column = () =>
-        container.Collections.Single().Element.Columns.Single().Name.Should().Be("Value");
+        container.Collections.Single().Element.Columns.Single().Name.ShouldEqual("Value");
 
     It should_set_the_element_type_to_the_first_generic_argument_of_the_collection_type = () =>
-        container.Collections.Single().Element.Type.Should().Be(new TypeReference(typeof(string)));
+        container.Collections.Single().Element.Type.ShouldEqual(new TypeReference(typeof(string)));
 
     It should_create_a_key = () =>
-        container.Collections.Single().Key.Should().NotBeNull();
+        container.Collections.Single().Key.ShouldNotBeNull();
 
     It should_set_the_key_s_containing_entity_to_the_type_owning_the_property = () =>
-        container.Collections.Single().Key.ContainingEntityType.Should().Be(FakeMembers.Type);
+        container.Collections.Single().Key.ContainingEntityType.ShouldEqual(FakeMembers.Type);
 
     It should_create_a_column_for_the_key_with_the_default_id_naming = () =>
-        container.Collections.Single().Key.Columns.Single().Name.Should().Be("Target_id");
+        container.Collections.Single().Key.Columns.Single().Name.ShouldEqual("Target_id");
 
     It should_set_the_collection_s_containing_entity_type_to_the_type_owning_the_property = () =>
-        container.Collections.Single().ContainingEntityType.Should().Be(FakeMembers.Type);
+        container.Collections.Single().ContainingEntityType.ShouldEqual(FakeMembers.Type);
 
     It should_set_the_collection_s_member_to_the_property = () =>
-        container.Collections.Single().Member.Should().Be(FakeMembers.IListOfStrings);
+        container.Collections.Single().Member.ShouldEqual(FakeMembers.IListOfStrings);
 
     It should_set_the_collection_s_name_to_the_property_name = () =>
-        container.Collections.Single().Name.Should().Be(FakeMembers.IListOfStrings.Name);
+        container.Collections.Single().Name.ShouldEqual(FakeMembers.IListOfStrings.Name);
 
     It should_not_create_a_relationship_for_the_collection = () =>
-        container.Collections.Single().Relationship.Should().BeNull();
+        container.Collections.Single().Relationship.ShouldBeNull();
 
     It should_not_create_a_component_for_the_collection = () =>
-        container.Collections.Single().CompositeElement.Should().BeNull();
+        container.Collections.Single().CompositeElement.ShouldBeNull();
 }
 
 public abstract class AutoMapOneToManySpec

src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.Properties.Enum.cs

@@ -3,7 +3,6 @@
 using FluentNHibernate.MappingModel.ClassBased;
 using FluentNHibernate.Specs.Automapping.Fixtures;
 using Machine.Specifications;
-using FluentAssertions;
 using NHibernate.Type;
 
 namespace FluentNHibernate.Specs.Automapping;
@@ -17,7 +16,7 @@ public class when_the_automapper_is_told_to_map_an_entity_with_static_properties
         mapping = mapper.BuildMappings().SelectMany(x => x.Classes).First();
 
     It should_not_create_property_mappings_for_the_static_properties = () =>
-        mapping.Properties.Any(x => x.Name == "StaticProperty").Should().BeFalse();
+        mapping.Properties.Any(x => x.Name == "StaticProperty").ShouldBeFalse();
 
     static AutoPersistenceModel mapper;
     static ClassMapping mapping;
@@ -35,7 +34,7 @@ public class when_the_automapper_is_told_to_map_an_entity_with_a_enum_property :
         mapping.Properties.ShouldContain(x => x.Name == "EnumProperty");
 
     It should_use_the_enum_string_type_for_the_property = () =>
-        mapping.Properties.First().Type.GetUnderlyingSystemType().Should().Be(typeof(EnumStringType<Enum>));
+        mapping.Properties.First().Type.GetUnderlyingSystemType().ShouldEqual(typeof(EnumStringType<Enum>));
 
     It should_create_a_column_for_the_property_mapping_with_the_property_name = () =>
         mapping.Properties.First().Columns.ShouldContain(x => x.Name == "EnumProperty");
@@ -53,7 +52,7 @@ public class when_the_automapper_is_told_to_map_an_entity_with_a_nullable_enum_p
         mapping.Properties.ShouldContain(x => x.Name == "EnumProperty");
 
     It should_use_the_enum_string_mapper_for_the_property = () =>
-        mapping.Properties.First().Type.GetUnderlyingSystemType().Should().Be(typeof(EnumStringType<Enum>));
+        mapping.Properties.First().Type.GetUnderlyingSystemType().ShouldEqual(typeof(EnumStringType<Enum>));
 
     It should_create_a_column_for_the_property_mapping_with_the_property_name = () =>
         mapping.Properties.First().Columns.ShouldContain(x => x.Name == "EnumProperty");