When using fields - not properties inside of ".Member" - throws Excep…

…tion #59
fluentsprings · Nov 15, 2015 · 52dc59a · 52dc59a
1 parent 4514bdc
commit 52dc59a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/ExpressMapper NET40/MemberConfiguration.cs b/ExpressMapper NET40/MemberConfiguration.cs
@@ -59,7 +59,11 @@ public IMemberConfiguration<T, TN> Member<TMember, TNMember>(Expression<Func<TN,
 
             var propertyInfo = typeof(TN).GetProperty(memberExpression.Member.Name);
 
-            if (propertyInfo.CanWrite && propertyInfo.GetSetMethod(true).IsPublic)
+            if (propertyInfo != null && !propertyInfo.CanWrite || (propertyInfo != null && propertyInfo.CanWrite && !propertyInfo.GetSetMethod(true).IsPublic))
+            {
+                Ignore(dest);
+            }
+            else
             {
                 foreach (var typeMapper in _typeMappers)
                 {
@@ -79,7 +83,11 @@ public IMemberConfiguration<T, TN> Function<TMember, TNMember>(Expression<Func<T
 
             var propertyInfo = typeof(TN).GetProperty(memberExpression.Member.Name);
 
-            if (propertyInfo.CanWrite && propertyInfo.GetSetMethod(true).IsPublic)
+            if (propertyInfo != null && !propertyInfo.CanWrite && !propertyInfo.GetSetMethod(true).IsPublic)
+            {
+                Ignore(dest);
+            }
+            else
             {
                 foreach (var typeMapper in _typeMappers)
                 {

diff --git a/ExpressMapper.Tests NET40/BasicTests.cs b/ExpressMapper.Tests NET40/BasicTests.cs
@@ -50,6 +50,24 @@ public void FieldsTest()
             Assert.AreEqual(bvm, srcAndDest.Value);
         }
 
+        [Test]
+        public void CustomMemberAndFunctionFieldsTest()
+        {
+            Mapper.Register<Brand, BrandViewModel>();
+            Mapper.Register<Table, TableViewModel>()
+                .Member(t => t.Id, t => t.Id)
+                .Function(t => t.Name, t => t.Name);
+            Mapper.Register<Size, SizeViewModel>();
+            Mapper.Register<Country, CountryViewModel>();
+            Mapper.Compile();
+
+            var srcAndDest = Functional.FieldsTestMap();
+
+            var bvm = Mapper.Map<Table, TableViewModel>(srcAndDest.Key);
+
+            Assert.AreEqual(bvm, srcAndDest.Value);
+        }
+
         [Test]
         public void MappingOrderLessTest()
         {