Test coverage for mappingDataObject.Parent.As<TSource, TTarget>()

Author: SteveWilkes

AgileMapper.UnitTests/Configuration/WhenConfiguringObjectCreation.cs

@@ -305,10 +305,12 @@ public void ShouldIncludeMappingDetailsInANestedObjectCreationException()
             mappingEx.Message.ShouldContain(Constants.CreateNew);
 
             mappingEx.InnerException.ShouldNotBeNull();
+            // ReSharper disable once PossibleNullReferenceException
             mappingEx.InnerException.Message.ShouldContain("PersonViewModel -> Person.Address");
             mappingEx.InnerException.Message.ShouldContain(Constants.CreateNew);
 
             mappingEx.InnerException.InnerException.ShouldNotBeNull();
+            // ReSharper disable once PossibleNullReferenceException
             mappingEx.InnerException.InnerException.Message.ShouldBe("Can't make an address, sorry");
         }
 
@@ -376,7 +378,7 @@ public void ShouldHandleAnObjectMappingDataCreationException()
 
                 thrownException.InnerException.ShouldNotBeNull();
                 // ReSharper disable once PossibleNullReferenceException
-                thrownException.InnerException.Message.ShouldBe(MappingException.NO_MAPPING_DATA);
+                thrownException.InnerException.Message.ShouldBe(MappingException.NoMappingData);
             }
         }
 

AgileMapper.UnitTests/Configuration/WhenConfiguringObjectCreationCallbacks.cs

@@ -64,8 +64,10 @@ public void ShouldWrapANestedObjectCreatingCallbackException()
 
             exception.InnerException.ShouldNotBeNull();
             exception.InnerException.ShouldBeOfType<MappingException>();
+            // ReSharper disable once PossibleNullReferenceException
             exception.InnerException.InnerException.ShouldNotBeNull();
             exception.InnerException.InnerException.ShouldBeOfType<InvalidOperationException>();
+            // ReSharper disable once PossibleNullReferenceException
             exception.InnerException.InnerException.Message.ShouldBe("OH NO");
         }
 
@@ -421,5 +423,28 @@ public void ShouldCallObjectCreatingAndObjectCreatedCallbacksForSpecifiedTypesCo
                 postCallbackObjects.ShouldBe(source, target.Address);
             }
         }
+
+        [Fact]
+        public void ShouldUseATypedParentContextAccessForACallbackArgument()
+        {
+            using (var mapper = Mapper.CreateNew())
+            {
+                mapper
+                    .WhenMapping
+                    .From<PublicField<object>>()
+                    .To<PublicProperty<Product>>()
+                    .After
+                    .CreatingInstancesOf<Product>()
+                    .Call(Console.WriteLine);
+
+                var source = new PublicField<object>
+                {
+                    Value = new Product { ProductId = "UBER-WIDGET" }
+                };
+                var target = new PublicProperty<Product>();
+
+                mapper.Map(source).OnTo(target);
+            }
+        }
     }
 }

AgileMapper/Configuration/ParametersSwapper.cs

@@ -199,6 +199,11 @@ public static Expression UseTargetMember(IMemberMapperData mapperData, Expressio
 
         public static Expression UseInstanceVariable(IMemberMapperData mapperData, Expression contextAccess, Type targetType)
         {
+            if (!contextAccess.Type.IsGenericType())
+            {
+                return UseTargetMember(mapperData, contextAccess, targetType);
+            }
+
             var instanceVariableAccess = mapperData
                 .GetAppropriateMappingContext(contextAccess.Type.GetGenericArguments())
                 .InstanceVariable;

AgileMapper/MappingException.cs

@@ -16,7 +16,7 @@ public class MappingException : Exception
         internal static readonly ConstructorInfo ConstructorInfo =
             typeof(MappingException).GetNonPublicInstanceConstructors().First();
 
-        internal const string NO_MAPPING_DATA = "An exception occurred creating a mapping data instance";
+        internal const string NoMappingData = "An exception occurred creating a mapping data instance";
 
         /// <summary>
         /// Initializes a new instance of the MappingException class.
@@ -34,7 +34,7 @@ private static string GetMessage(IMemberMapperData mapperData)
         {
             if (mapperData == null)
             {
-                return NO_MAPPING_DATA;
+                return NoMappingData;
             }
 
             var rootData = GetRootMapperData(mapperData);

AgileMapper/Members/MemberMapperDataExtensions.cs

@@ -7,6 +7,7 @@ namespace AgileObjects.AgileMapper.Members
     using System.Reflection;
     using Extensions;
     using ObjectPopulation;
+    using ReadableExpressions.Extensions;
 
     internal static class MemberMapperDataExtensions
     {
@@ -161,15 +162,18 @@ public static Expression GetTypedContextAccess(
                 return mapperData.MappingDataObject;
             }
 
-            var contextAccessTypes = contextAccess.Type.GetGenericArguments();
-
-            if (contextTypes[0].IsAssignableFrom(contextAccessTypes[0]) &&
-                contextTypes[1].IsAssignableFrom(contextAccessTypes[1]))
+            if (contextAccess.Type.IsGenericType())
             {
-                return contextAccess;
+                var contextAccessTypes = contextAccess.Type.GetGenericArguments();
+
+                if (contextTypes[0].IsAssignableFrom(contextAccessTypes[0]) &&
+                    contextTypes[1].IsAssignableFrom(contextAccessTypes[1]))
+                {
+                    return contextAccess;
+                }
             }
 
-            return GetAsCall(contextAccess, contextTypes);
+            return GetAsCall(contextAccess, contextTypes[0], contextTypes[1]);
         }
 
         public static Expression GetAsCall(this IMemberMapperData mapperData, Type sourceType, Type targetType)
@@ -205,6 +209,11 @@ private static Expression GetAccess(
                 return directAccessExpression;
             }
 
+            if (!contextAccess.Type.IsGenericType())
+            {
+                return accessMethodFactory.Invoke(contextAccess, type);
+            }
+
             var contextTypes = contextAccess.Type.GetGenericArguments();
 
             if (type.IsAssignableFrom(contextTypes[contextTypesIndex]))