Allowing source-rooted maps to include MapFrom when validating

JakeGinnivan · Dec 8, 2011 · 3f42da3 · 3f42da3
1 parent 4a4ed49
commit 3f42da3
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/src/AutoMapper/TypeMap.cs b/src/AutoMapper/TypeMap.cs
@@ -127,10 +127,19 @@ public string[] GetUnmappedPropertyNames()
                     .Except(autoMappedProperties)
                     .Except(inheritedProperties);
             else
+            {
+                var redirectedSourceMembers = _propertyMaps
+                    .Where(pm => pm.IsMapped())
+                    .Where(pm => pm.CustomExpression != null)
+                    .Select(pm => pm.SourceMember.Name);
+
                 properties = _sourceType.GetPublicReadAccessors()
                     .Select(p => p.Name)
                     .Except(autoMappedProperties)
-                    .Except(inheritedProperties);
+                    .Except(inheritedProperties)
+                    .Except(redirectedSourceMembers)
+                    ;
+            }
 
             return properties.Where(memberName => !IgnorePropertiesStartingWith.Any(memberName.StartsWith)).ToArray();
         }

diff --git a/src/UnitTests/ReverseMapping.cs b/src/UnitTests/ReverseMapping.cs
@@ -106,5 +106,34 @@ public void Should_throw_a_configuration_validation_error()
             }
         }
 
+        public class When_validating_only_against_source_members_and_unmatching_source_members_are_manually_mapped : NonValidatingSpecBase
+        {
+            public class Source
+            {
+                public int Value { get; set; }
+                public int Value2 { get; set; }
+            }
+            public class Destination
+            {
+                public int Value { get; set; }
+                public int Value3 { get; set; }
+            }
+
+            protected override void Establish_context()
+            {
+                Mapper.Initialize(cfg =>
+                {
+                    cfg.CreateMap<Source, Destination>(MemberList.Source)
+                        .ForMember(dest => dest.Value3, opt => opt.MapFrom(src => src.Value2));
+                });
+            }
+
+            [Test]
+            public void Should_not_throw_a_configuration_validation_error()
+            {
+                typeof(AutoMapperConfigurationException).ShouldNotBeThrownBy(Mapper.AssertConfigurationIsValid);
+            }
+        }
+
     }
 }