Allowing configured condition type tests if mapping from an interface…

…, re: #146
agileobjects · Jun 17, 2019 · f115d2e · f115d2e
1 parent 58623d9
commit f115d2e
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 4 deletions.
diff --git a/AgileMapper.UnitTests/Configuration/WhenConfiguringDataSources.cs b/AgileMapper.UnitTests/Configuration/WhenConfiguringDataSources.cs
@@ -148,6 +148,33 @@ public void ShouldApplyMultipleConfiguredMembersBySourceType()
             }
         }
 
+        [Fact]
+        public void ShouldAllowConditionTypeTestsWhenMappingFromAnInterface()
+        {
+            using (var mapper = Mapper.CreateNew())
+            {
+                var sourceData = default(Issue146.Source.Data);
+
+                mapper.WhenMapping
+                    .From<Issue146.Source.Container>().To<Issue146.Target.Cont>()
+                    .Map(s => s.Empty, t => t.Info);
+
+                mapper.WhenMapping
+                    .From<Issue146.Source.IEmpty>().To<Issue146.Target.Data>()
+                    .After
+                    .MappingEnds
+                    .If(ctx => ctx.Source is Issue146.Source.Data)
+                    .Call(ctx => sourceData = (Issue146.Source.Data)ctx.Source);
+
+                var source = new Issue146.Source.Container("xxx");
+                var result = mapper.Map(source).ToANew<Issue146.Target.Cont>();
+
+                result.ShouldNotBeNull();
+                sourceData.ShouldNotBeNull();
+                sourceData.ShouldBeSameAs(source.Empty);
+            }
+        }
+
         // See https://github.com/agileobjects/AgileMapper/issues/111
         [Fact]
         public void ShouldConditionallyApplyAToTargetConfiguredSimpleTypeConstant()
@@ -168,7 +195,7 @@ public void ShouldConditionallyApplyAToTargetConfiguredSimpleTypeConstant()
         }
 
         [Fact]
-        public void ShouldApplyAToTargetConfiguredSimpleTypeConstant()
+        public void ShouldConditionallyApplyAToTargetConfiguredSimpleType()
         {
             using (var mapper = Mapper.CreateNew())
             {
@@ -1178,7 +1205,7 @@ public void ShouldApplyAConfiguredSourceInterfaceMember()
                 result.Name.ShouldBe("input");
                 result.Info.ShouldNotBeNull();
                 result.Info.Id.ShouldBe("12321");
-                
+
                 // Source has a .Value member, but we don't runtime-type interfaces
                 result.Info.Value.ShouldBeNull();
             }
@@ -1766,6 +1793,7 @@ public class ParamDef
         // ReSharper restore MemberCanBePrivate.Local
         // ReSharper restore CollectionNeverQueried.Local
 
+        // ReSharper disable InconsistentNaming
         internal static class Issue145
         {
             public class IdsSource
@@ -1785,6 +1813,7 @@ public class OtherDataSource
 
             public class DataSourceContainer
             {
+
                 public IdsSource ids;
                 public ResultSource res;
                 public OtherDataSource oth;
@@ -1817,6 +1846,7 @@ public class DataTarget
                 public OtherDataTarget oth;
             }
         }
+        // ReSharper restore InconsistentNaming
 
         internal static class Issue146
         {

diff --git a/AgileMapper/Configuration/MappingConfigInfo.cs b/AgileMapper/Configuration/MappingConfigInfo.cs
@@ -11,6 +11,7 @@
 #endif
     using Extensions.Internal;
     using Members;
+    using NetStandardPolyfills;
     using ObjectPopulation;
     using ReadableExpressions;
 
@@ -123,9 +124,10 @@ public void AddConditionOrThrow(LambdaExpression conditionLambda)
             _conditionLambda = ConfiguredLambdaInfo.For(conditionLambda);
         }
 
-        private static void ErrorIfConditionHasTypeTest(LambdaExpression conditionLambda)
+        private void ErrorIfConditionHasTypeTest(LambdaExpression conditionLambda)
         {
-            if (TypeTestFinder.HasNoTypeTest(conditionLambda))
+            if ((SourceType?.IsInterface() == true) ||
+                 TypeTestFinder.HasNoTypeTest(conditionLambda))
             {
                 return;
             }