Merge pull request fluentassertions#2261 from jnyrup/auto_conversion

Fix auto conversion to enums
dennisdoomen · Aug 16, 2023 · 818e7dc · 818e7dc
2 parents 292b9dd + 174bb4c
commit 818e7dc
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/Src/FluentAssertions/Equivalency/Steps/AutoConversionStep.cs b/Src/FluentAssertions/Equivalency/Steps/AutoConversionStep.cs
@@ -58,10 +58,10 @@ private static bool TryChangeType(object subject, Type expectationType, out obje
         {
             if (expectationType.IsEnum)
             {
-                if (Enum.IsDefined(expectationType, subject))
+                if (subject is sbyte or byte or short or ushort or int or uint or long or ulong)
                 {
                     conversionResult = Enum.ToObject(expectationType, subject);
-                    return true;
+                    return Enum.IsDefined(expectationType, conversionResult);
                 }
 
                 return false;

diff --git a/Tests/FluentAssertions.Equivalency.Specs/MemberConversionSpecs.cs b/Tests/FluentAssertions.Equivalency.Specs/MemberConversionSpecs.cs
@@ -56,12 +56,36 @@ public void Numbers_can_be_converted_to_enums()
     {
         // Arrange
         var expectation = new { Property = EnumFour.Three };
-        var subject = new { Property = 3 };
+        var subject = new { Property = 3UL };
 
         // Act / Assert
         subject.Should().BeEquivalentTo(expectation, options => options.WithAutoConversion());
     }
 
+    [Fact]
+    public void Enums_are_not_converted_to_enums_of_different_type()
+    {
+        // Arrange
+        var expectation = new { Property = EnumTwo.Two };
+        var subject = new { Property = EnumThree.Two };
+
+        // Act / Assert
+        subject.Should().BeEquivalentTo(expectation, options => options.WithAutoConversion());
+    }
+
+    [Fact]
+    public void Strings_are_not_converted_to_enums()
+    {
+        // Arrange
+        var expectation = new { Property = EnumTwo.Two };
+        var subject = new { Property = "Two" };
+
+        // Act / Assert
+        var act = () => subject.Should().BeEquivalentTo(expectation, options => options.WithAutoConversion());
+
+        act.Should().Throw<XunitException>();
+    }
+
     [Fact]
     public void Numbers_that_are_out_of_range_cannot_be_converted_to_enums()
     {

diff --git a/docs/_pages/releases.md b/docs/_pages/releases.md
@@ -15,6 +15,8 @@ sidebar:
 ### Fixes
 * `because` and `becauseArgs` were not included in the error message when collections of enums were not equivalent - [#2214](https://github.com/fluentassertions/fluentassertions/pull/2214)
 * Improve caller identification for tests written in Visual Basic - [#2254](https://github.com/fluentassertions/fluentassertions/pull/2254)
+* Improved auto conversion to enums for objects of different integral type - [#2261](https://github.com/fluentassertions/fluentassertions/pull/2261)
+* Fixed exceptions when trying to auto convert strings or enums of different type to enums- [#2261](https://github.com/fluentassertions/fluentassertions/pull/2261)
 
 ## 6.11.0