Merge 8370fe2 into 0fd7aca

fluentassertions · Jan 15, 2023 · f76e875 · f76e875
2 parents 0fd7aca + 8370fe2
commit f76e875
Show file tree

Hide file tree

Showing 8 changed files with 325 additions and 62 deletions.
diff --git a/Src/FluentAssertions/Common/TypeExtensions.cs b/Src/FluentAssertions/Common/TypeExtensions.cs
@@ -178,16 +178,19 @@ public static bool OverridesEquals(this Type type)
     /// <returns>
     /// Returns <see langword="null"/> if no such property exists.
     /// </returns>
-    public static PropertyInfo FindProperty(this Type type, string propertyName, Type preferredType)
+    public static PropertyInfo FindProperty(this Type type, string propertyName)
     {
-        List<PropertyInfo> properties =
-            type.GetProperties(AllInstanceMembersFlag)
-                .Where(pi => pi.Name == propertyName)
-                .ToList();
+        while (type != typeof(object))
+        {
+            if (type.GetProperty(propertyName, AllInstanceMembersFlag | BindingFlags.DeclaredOnly) is { } property)
+            {
+                return property;
+            }
+
+            type = type.BaseType;
+        }
 
-        return properties.Count > 1
-            ? properties.SingleOrDefault(p => p.PropertyType == preferredType)
-            : properties.SingleOrDefault();
+        return null;
     }
 
     /// <summary>
@@ -196,16 +199,19 @@ public static PropertyInfo FindProperty(this Type type, string propertyName, Typ
     /// <returns>
     /// Returns <see langword="null"/> if no such property exists.
     /// </returns>
-    public static FieldInfo FindField(this Type type, string fieldName, Type preferredType)
+    public static FieldInfo FindField(this Type type, string fieldName)
     {
-        List<FieldInfo> properties =
-            type.GetFields(AllInstanceMembersFlag)
-                .Where(pi => pi.Name == fieldName)
-                .ToList();
+        while (type != typeof(object))
+        {
+            if (type.GetField(fieldName, AllInstanceMembersFlag | BindingFlags.DeclaredOnly) is { } field)
+            {
+                return field;
+            }
+
+            type = type.BaseType;
+        }
 
-        return properties.Count > 1
-            ? properties.SingleOrDefault(p => p.FieldType == preferredType)
-            : properties.SingleOrDefault();
+        return null;
     }
 
     public static IEnumerable<MemberInfo> GetNonPrivateMembers(this Type typeToReflect, MemberVisibility visibility)

diff --git a/Src/FluentAssertions/Equivalency/Matching/MappedMemberMatchingRule.cs b/Src/FluentAssertions/Equivalency/Matching/MappedMemberMatchingRule.cs
@@ -35,7 +35,7 @@ public IMember Match(IMember expectedMember, object subject, INode parent, IEqui
         {
             if (expectedMember.Name == expectationMemberName)
             {
-                var member = MemberFactory.Find(subject, subjectMemberName, expectedMember.Type, parent);
+                var member = MemberFactory.Find(subject, subjectMemberName, parent);
                 if (member is null)
                 {
                     throw new ArgumentException(

diff --git a/Src/FluentAssertions/Equivalency/Matching/MappedPathMatchingRule.cs b/Src/FluentAssertions/Equivalency/Matching/MappedPathMatchingRule.cs
@@ -50,7 +50,7 @@ public IMember Match(IMember expectedMember, object subject, INode parent, IEqui
 
         if (path.IsEquivalentTo(expectedMember.PathAndName))
         {
-            var member = MemberFactory.Find(subject, subjectPath.MemberName, expectedMember.Type, parent);
+            var member = MemberFactory.Find(subject, subjectPath.MemberName, parent);
             if (member is null)
             {
                 throw new ArgumentException(

diff --git a/Src/FluentAssertions/Equivalency/Matching/MustMatchByNameRule.cs b/Src/FluentAssertions/Equivalency/Matching/MustMatchByNameRule.cs
@@ -15,13 +15,13 @@ public IMember Match(IMember expectedMember, object subject, INode parent, IEqui
 
         if (config.IncludedProperties != MemberVisibility.None)
         {
-            PropertyInfo propertyInfo = subject.GetType().FindProperty(expectedMember.Name, expectedMember.Type);
+            PropertyInfo propertyInfo = subject.GetType().FindProperty(expectedMember.Name);
             subjectMember = (propertyInfo is not null) && !propertyInfo.IsIndexer() ? new Property(propertyInfo, parent) : null;
         }
 
         if ((subjectMember is null) && config.IncludedFields != MemberVisibility.None)
         {
-            FieldInfo fieldInfo = subject.GetType().FindField(expectedMember.Name, expectedMember.Type);
+            FieldInfo fieldInfo = subject.GetType().FindField(expectedMember.Name);
             subjectMember = (fieldInfo is not null) ? new Field(fieldInfo, parent) : null;
         }
 

diff --git a/Src/FluentAssertions/Equivalency/Matching/TryMatchByNameRule.cs b/Src/FluentAssertions/Equivalency/Matching/TryMatchByNameRule.cs
@@ -10,13 +10,13 @@ internal class TryMatchByNameRule : IMemberMatchingRule
 {
     public IMember Match(IMember expectedMember, object subject, INode parent, IEquivalencyAssertionOptions config)
     {
-        PropertyInfo property = subject.GetType().FindProperty(expectedMember.Name, expectedMember.Type);
+        PropertyInfo property = subject.GetType().FindProperty(expectedMember.Name);
         if ((property is not null) && !property.IsIndexer())
         {
             return new Property(property, parent);
         }
 
-        FieldInfo field = subject.GetType().FindField(expectedMember.Name, expectedMember.Type);
+        FieldInfo field = subject.GetType().FindField(expectedMember.Name);
         return (field is not null) ? new Field(field, parent) : null;
     }
 

diff --git a/Src/FluentAssertions/Equivalency/MemberFactory.cs b/Src/FluentAssertions/Equivalency/MemberFactory.cs
@@ -21,15 +21,15 @@ public static IMember Create(MemberInfo memberInfo, INode parent)
         throw new NotSupportedException($"Don't know how to deal with a {memberInfo.MemberType}");
     }
 
-    internal static IMember Find(object target, string memberName, Type preferredMemberType, INode parent)
+    internal static IMember Find(object target, string memberName, INode parent)
     {
-        PropertyInfo property = target.GetType().FindProperty(memberName, preferredMemberType);
+        PropertyInfo property = target.GetType().FindProperty(memberName);
         if ((property is not null) && !property.IsIndexer())
         {
             return new Property(property, parent);
         }
 
-        FieldInfo field = target.GetType().FindField(memberName, preferredMemberType);
+        FieldInfo field = target.GetType().FindField(memberName);
         return (field is not null) ? new Field(field, parent) : null;
     }
 }