You can exclude explicitly implemented properties from BeEquivalentTo…

… via ExcludingExplicitlyImplementedProperties
dennisdoomen · Nov 26, 2024 · 6a0a792 · 6a0a792
1 parent 5062f49
commit 6a0a792
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 5 deletions.
diff --git a/Src/FluentAssertions/Equivalency/Selection/AllPropertiesSelectionRule.cs b/Src/FluentAssertions/Equivalency/Selection/AllPropertiesSelectionRule.cs
@@ -14,8 +14,7 @@ internal class AllPropertiesSelectionRule : IMemberSelectionRule
     public IEnumerable<IMember> SelectMembers(INode currentNode, IEnumerable<IMember> selectedMembers,
         MemberSelectionContext context)
     {
-        MemberVisibility visibility = context.IncludedProperties | MemberVisibility.ExplicitlyImplemented |
-            MemberVisibility.DefaultInterfaceProperties;
+        MemberVisibility visibility = context.IncludedProperties;
 
         IEnumerable<IMember> selectedProperties = context.Type
             .GetProperties(visibility.ToMemberKind())

diff --git a/Src/FluentAssertions/Equivalency/SelfReferenceEquivalencyOptions.cs b/Src/FluentAssertions/Equivalency/SelfReferenceEquivalencyOptions.cs
@@ -273,7 +273,8 @@ public TSelf ExcludingFields()
     /// </remarks>
     public TSelf IncludingProperties()
     {
-        includedProperties = MemberVisibility.Public;
+        includedProperties = MemberVisibility.Public | MemberVisibility.ExplicitlyImplemented |
+            MemberVisibility.DefaultInterfaceProperties;
         return (TSelf)this;
     }
 
@@ -282,7 +283,8 @@ public TSelf IncludingProperties()
     /// </summary>
     public TSelf IncludingInternalProperties()
     {
-        includedProperties = MemberVisibility.Public | MemberVisibility.Internal;
+        includedProperties = MemberVisibility.Public | MemberVisibility.Internal | MemberVisibility.ExplicitlyImplemented |
+            MemberVisibility.DefaultInterfaceProperties;
         return (TSelf)this;
     }
 
@@ -298,6 +300,15 @@ public TSelf ExcludingProperties()
         return (TSelf)this;
     }
 
+    /// <summary>
+    /// Excludes properties that are explicitly implemented from the equivalency comparison.
+    /// </summary>
+    public TSelf ExcludingExplicitlyImplementedProperties()
+    {
+        includedProperties &= ~MemberVisibility.ExplicitlyImplemented;
+        return (TSelf)this;
+    }
+
     /// <summary>
     /// Instructs the comparison to exclude non-browsable members in the expectation (members set to
     /// <see cref="EditorBrowsableState.Never"/>). It is not required that they be marked non-browsable in the subject. Use

diff --git a/Tests/FluentAssertions.Equivalency.Specs/SelectionRulesSpecs.Interfaces.cs b/Tests/FluentAssertions.Equivalency.Specs/SelectionRulesSpecs.Interfaces.cs
@@ -291,13 +291,37 @@ public void Can_find_explicitly_implemented_property_on_the_subject()
             person.Should().BeEquivalentTo(new { Name = "Bob" });
         }
 
+        [Fact]
+        public void Can_exclude_explicitly_implemented_properties()
+        {
+            // Arrange
+            var subject = new Person
+            {
+                NormalProperty = "Normal",
+            };
+
+            ((IPerson)subject).Name = "Bob";
+
+            var expectation = new Person
+            {
+                NormalProperty = "Normal",
+            };
+
+            ((IPerson)expectation).Name = "Jim";
+
+            // Act / Assert
+            subject.Should().BeEquivalentTo(expectation, options => options.ExcludingExplicitlyImplementedProperties());
+        }
+
         private interface IPerson
         {
             string Name { get; set; }
         }
 
         private class Person : IPerson
         {
+            public string NormalProperty { get; set; }
+
             string IPerson.Name { get; set; }
         }
 

diff --git a/docs/_pages/releases.md b/docs/_pages/releases.md
@@ -7,7 +7,7 @@ sidebar:
   nav: "sidebar"
 ---
 
-## 7.0 Alpha X
+## 8.0 Alpha X
 
 ### What's new
 
@@ -41,6 +41,7 @@ sidebar:
 * All assertions that support chaining using the `.Which` construct will now amend the caller identifier - [2539](https://github.com/fluentassertions/pull/2539)
 * Introduced a `MethodInfoFormatter` and improved the `PropertyInfoFormatter` - [2539](https://github.com/fluentassertions/pull/2539)
 * `Excluding()` / `For().Exclude()` and `Including()` on `BeEquivalentTo()` now also accepts an anonymous object to include/exclude multiple members at once - [#2488](https://github.com/fluentassertions/fluentassertions/pull/2488)
+* You can exclude explicitly implemented properties from `BeEquivalentTo` via `ExcludingExplicitlyImplementedProperties` - [9999](https://github.com/fluentassertions/pull/9999)
 
 ### Fixes
 * Fixed formatting error when checking nullable `DateTimeOffset` with