Extra derived type mapping test coverage

Author: SteveWilkes

AgileMapper.UnitTests/WhenMappingDerivedTypes.cs

@@ -95,5 +95,33 @@ public void ShouldMapAComplexTypeEnumerableMemberFromItsSourceType()
             resultValues.First().ShouldBeOfType<Customer>();
             resultValues.Second().ShouldBeOfType<Person>();
         }
+
+        [Fact]
+        public void ShouldConditionallyMapDerivedTypesFromNestedMembers()
+        {
+            using (var mapper = Mapper.CreateNew())
+            {
+                var sourceData = new { Discount = default(string), Report = default(string) };
+
+                mapper.WhenMapping
+                    .From(sourceData)
+                    .To<PersonViewModel>()
+                    .If((d, p) => d.Report != default(string))
+                    .MapTo<MysteryCustomerViewModel>()
+                    .And
+                    .If((d, p) => d.Discount != default(string))
+                    .MapTo<CustomerViewModel>();
+
+                var customerSource = new { Value = new { Discount = "0.2", Report = default(string) } };
+                var result = mapper.Map(customerSource).ToANew<PublicSetMethod<PersonViewModel>>();
+
+                result.Value.ShouldBeOfType<CustomerViewModel>();
+
+                var mysteryCustomerSource = new { Value = new { Discount = default(string), Report = "Lovely!" } };
+                result = mapper.Map(mysteryCustomerSource).ToANew<PublicSetMethod<PersonViewModel>>();
+
+                result.Value.ShouldBeOfType<MysteryCustomerViewModel>();
+            }
+        }
     }
 }

AgileMapper/ObjectPopulation/DerivedComplexTypeMappingsFactory.cs

@@ -88,12 +88,7 @@ private static Expression GetTypePairCondition(DerivedTypePair derivedTypePair,
 
             var pairCondition = derivedTypePair.GetConditionOrNull(mapperData);
 
-            if (condition == null)
-            {
-                return pairCondition;
-            }
-
-            return Expression.AndAlso(pairCondition, condition);
+            return (condition != null) ? Expression.AndAlso(pairCondition, condition) : pairCondition;
         }
 
         private static void AddDerivedSourceTypeMappings(