Add ComparingMembers(Func<Type, bool?>) predicate) (fluentassertions#…

…1374)
ursenzler · Aug 13, 2020 · a6d37d2 · a6d37d2
1 parent 0b32279
commit a6d37d2
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 24 deletions.
diff --git a/Src/FluentAssertions/Equivalency/SelfReferenceEquivalencyAssertionOptions.cs b/Src/FluentAssertions/Equivalency/SelfReferenceEquivalencyAssertionOptions.cs
@@ -58,6 +58,8 @@ public abstract class SelfReferenceEquivalencyAssertionOptions<TSelf> : IEquival
 
         private bool includeFields;
 
+        private Func<Type, bool?> comparingByMembersCallback = null;
+
         #endregion
 
         internal SelfReferenceEquivalencyAssertionOptions()
@@ -162,38 +164,29 @@ IEnumerable<IMemberSelectionRule> IEquivalencyAssertionOptions.SelectionRules
 
         EqualityStrategy IEquivalencyAssertionOptions.GetEqualityStrategy(Type type)
         {
-            EqualityStrategy strategy;
+            var callbackResult = comparingByMembersCallback?.Invoke(type);
+            if (callbackResult != null)
+            {
+                return callbackResult.Value ? EqualityStrategy.ForceMembers : EqualityStrategy.ForceEquals;
+            }
 
             if (referenceTypes.Any(type.IsSameOrInherits))
             {
-                strategy = EqualityStrategy.ForceMembers;
+                return EqualityStrategy.ForceMembers;
             }
-            else if (valueTypes.Any(type.IsSameOrInherits))
+
+            if (valueTypes.Any(type.IsSameOrInherits))
             {
-                strategy = EqualityStrategy.ForceEquals;
+                return EqualityStrategy.ForceEquals;
             }
-            else
+
+            if (getDefaultEqualityStrategy != null)
             {
-                if (getDefaultEqualityStrategy != null)
-                {
-                    strategy = getDefaultEqualityStrategy(type);
-                }
-                else
-                {
-                    bool hasValueSemantics = hasValueSemanticsMap.GetOrAdd(type, t => t.HasValueSemantics());
-
-                    if (hasValueSemantics)
-                    {
-                        strategy = EqualityStrategy.Equals;
-                    }
-                    else
-                    {
-                        strategy = EqualityStrategy.Members;
-                    }
-                }
+                return getDefaultEqualityStrategy(type);
             }
 
-            return strategy;
+            bool hasValueSemantics = hasValueSemanticsMap.GetOrAdd(type, t => t.HasValueSemantics());
+            return hasValueSemantics ? EqualityStrategy.Equals : EqualityStrategy.Members;
         }
 
         public ITraceWriter TraceWriter { get; private set; }
@@ -539,6 +532,12 @@ public TSelf ComparingByMembers<T>()
             return (TSelf)this;
         }
 
+        public TSelf ComparingByMembers(Func<Type, bool?> predicate)
+        {
+            comparingByMembersCallback = predicate;
+            return (TSelf)this;
+        }
+
         /// <summary>
         /// Marks the <typeparamref name="T" /> as a value type which must be compared using its
         /// <see cref="object.Equals(object)" /> method, regardless of it overriding it or not.

diff --git a/Tests/Approval.Tests/ApiApproval.cs b/Tests/Approval.Tests/ApiApproval.cs
@@ -19,7 +19,7 @@ public class ApiApproval
         [InlineData("FluentAssertions", "netstandard2.1")]
         [InlineData("FluentAssertions", "netcoreapp2.1")]
         [InlineData("FluentAssertions", "netcoreapp3.0")]
-        [UseReporter(typeof(DiffReporter))]
+        [UseReporter(typeof(RiderReporter))]
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void ApproveApi(string projectName, string frameworkVersion)
         {

diff --git a/Tests/Approval.Tests/ApprovedApi/FluentAssertions/net47.approved.txt b/Tests/Approval.Tests/ApprovedApi/FluentAssertions/net47.approved.txt
@@ -854,6 +854,7 @@ namespace FluentAssertions.Equivalency
         public FluentAssertions.Equivalency.ITraceWriter TraceWriter { get; }
         protected TSelf AddSelectionRule(FluentAssertions.Equivalency.IMemberSelectionRule selectionRule) { }
         public TSelf AllowingInfiniteRecursion() { }
+        public TSelf ComparingByMembers(System.Func<System.Type, bool?> predicate) { }
         public TSelf ComparingByMembers<T>() { }
         public TSelf ComparingByValue<T>() { }
         public TSelf ComparingEnumsByName() { }

diff --git a/Tests/Approval.Tests/ApprovedApi/FluentAssertions/netcoreapp2.1.approved.txt b/Tests/Approval.Tests/ApprovedApi/FluentAssertions/netcoreapp2.1.approved.txt
@@ -854,6 +854,7 @@ namespace FluentAssertions.Equivalency
         public FluentAssertions.Equivalency.ITraceWriter TraceWriter { get; }
         protected TSelf AddSelectionRule(FluentAssertions.Equivalency.IMemberSelectionRule selectionRule) { }
         public TSelf AllowingInfiniteRecursion() { }
+        public TSelf ComparingByMembers(System.Func<System.Type, bool?> predicate) { }
         public TSelf ComparingByMembers<T>() { }
         public TSelf ComparingByValue<T>() { }
         public TSelf ComparingEnumsByName() { }

diff --git a/Tests/Approval.Tests/ApprovedApi/FluentAssertions/netcoreapp3.0.approved.txt b/Tests/Approval.Tests/ApprovedApi/FluentAssertions/netcoreapp3.0.approved.txt
@@ -854,6 +854,7 @@ namespace FluentAssertions.Equivalency
         public FluentAssertions.Equivalency.ITraceWriter TraceWriter { get; }
         protected TSelf AddSelectionRule(FluentAssertions.Equivalency.IMemberSelectionRule selectionRule) { }
         public TSelf AllowingInfiniteRecursion() { }
+        public TSelf ComparingByMembers(System.Func<System.Type, bool?> predicate) { }
         public TSelf ComparingByMembers<T>() { }
         public TSelf ComparingByValue<T>() { }
         public TSelf ComparingEnumsByName() { }

diff --git a/Tests/Approval.Tests/ApprovedApi/FluentAssertions/netstandard2.0.approved.txt b/Tests/Approval.Tests/ApprovedApi/FluentAssertions/netstandard2.0.approved.txt
@@ -847,6 +847,7 @@ namespace FluentAssertions.Equivalency
         public FluentAssertions.Equivalency.ITraceWriter TraceWriter { get; }
         protected TSelf AddSelectionRule(FluentAssertions.Equivalency.IMemberSelectionRule selectionRule) { }
         public TSelf AllowingInfiniteRecursion() { }
+        public TSelf ComparingByMembers(System.Func<System.Type, bool?> predicate) { }
         public TSelf ComparingByMembers<T>() { }
         public TSelf ComparingByValue<T>() { }
         public TSelf ComparingEnumsByName() { }

diff --git a/Tests/Approval.Tests/ApprovedApi/FluentAssertions/netstandard2.1.approved.txt b/Tests/Approval.Tests/ApprovedApi/FluentAssertions/netstandard2.1.approved.txt
@@ -854,6 +854,7 @@ namespace FluentAssertions.Equivalency
         public FluentAssertions.Equivalency.ITraceWriter TraceWriter { get; }
         protected TSelf AddSelectionRule(FluentAssertions.Equivalency.IMemberSelectionRule selectionRule) { }
         public TSelf AllowingInfiniteRecursion() { }
+        public TSelf ComparingByMembers(System.Func<System.Type, bool?> predicate) { }
         public TSelf ComparingByMembers<T>() { }
         public TSelf ComparingByValue<T>() { }
         public TSelf ComparingEnumsByName() { }