Test coverage for conditional type pairs in nested, derived type members

Author: SteveWilkes

AgileMapper.UnitTests/WhenMappingDerivedTypes.cs

@@ -97,7 +97,7 @@ public void ShouldMapAComplexTypeEnumerableMemberFromItsSourceType()
         }
 
         [Fact]
-        public void ShouldConditionallyMapDerivedTypesFromNestedMembers()
+        public void ShouldMapDerivedTypesFromNestedMembers()
         {
             using (var mapper = Mapper.CreateNew())
             {
@@ -117,5 +117,30 @@ public void ShouldConditionallyMapDerivedTypesFromNestedMembers()
                 ((Customer)result.Value).Discount.ShouldBe(0.2);
             }
         }
+
+        [Fact]
+        public void ShouldConditionallyMapDerivedTypesFromNestedMembers()
+        {
+            using (var mapper = Mapper.CreateNew())
+            {
+                mapper.WhenMapping
+                    .From<CustomerViewModel>()
+                    .To<CustomerViewModel>()
+                    .If((s, t) => s.Name == "Mystery Customer")
+                    .MapTo<MysteryCustomerViewModel>()
+                    .And
+                    .If((s, t) => s.Name == "Customer Mystery!")
+                    .MapTo<MysteryCustomerViewModel>();
+
+                var personSource = new PublicField<PersonViewModel>
+                {
+                    Value = new CustomerViewModel { Name = "Mystery Customer", Discount = 0.5 }
+                };
+                var result = mapper.Map(personSource).ToANew<PublicProperty<PersonViewModel>>();
+
+                result.Value.ShouldBeOfType<MysteryCustomerViewModel>();
+                ((MysteryCustomerViewModel)result.Value).Discount.ShouldBe(0.5);
+            }
+        }
     }
 }

AgileMapper/Configuration/MappingConfigInfo.cs

@@ -194,6 +194,12 @@ private Expression GetTypeCheckConditionOrNull(IMemberMapperData mapperData)
             }
 
             var contextAccess = mapperData.GetAppropriateMappingContextAccess(contextTypes);
+
+            if (contextAccess == mapperData.MappingDataObject)
+            {
+                return null;
+            }
+
             var targetAccess = mapperData.GetTargetAccess(contextAccess, _targetType);
             var targetAccessNotNull = targetAccess.GetIsNotDefaultComparison();
 

AgileMapper/Members/MemberMapperDataExtensions.cs

@@ -146,9 +146,9 @@ public static IMemberMapperData GetAppropriateMappingContext(this IMemberMapperD
         public static bool TypesMatch(this IBasicMapperData mapperData, IList<Type> contextTypes)
             => TypesMatch(mapperData, contextTypes[0], contextTypes[1]);
 
-        public static bool TypesMatch(this IBasicMapperData mapperData, Type sourceType, Type targetType)
+        private static bool TypesMatch(IBasicMapperData mapperData, Type sourceType, Type targetType)
         {
-            return sourceType.IsAssignableFrom(mapperData.SourceType) &&
+            return (sourceType.IsAssignableFrom(mapperData.SourceType) || mapperData.SourceType.IsAssignableFrom(sourceType)) &&
                 (targetType.IsAssignableFrom(mapperData.TargetType) || mapperData.TargetType.IsAssignableFrom(targetType));
         }