Test and fix for grandchild name part of child name

Author: geirsagberg

Slapper.AutoMapper.Tests/ComplexMapsParentsAndChlidTest.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Dynamic;
 using System.Linq;
 using System.Text;
 using NUnit.Framework;

Slapper.AutoMapper.Tests/MatchingChildNameTests.cs

@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+
+namespace Slapper.Tests
+{
+    public class MatchingChildNameTests
+    {
+        public class SubMember
+        {
+            public int Id { get; set; }
+        }
+
+        public class Member
+        {
+            public int Id { get; set; }
+            public IList<SubMember> SubMembers { get; set; }
+        }
+
+        public class Club
+        {
+            public int Id { get; set; }
+            public IList<Member> Members { get; set; }
+        }
+
+        [Test]
+        public void Can_map_grandchild_with_parts_of_same_name_as_child()
+        {
+            var data = new List<Dictionary<string, object>> {
+                new Dictionary<string, object> {
+                    {"Id", 1},
+                    {"Members_Id", 1},
+                    {"Members_SubMembers_Id", 1}
+                }
+            };
+
+            var club = AutoMapper.MapDynamic<Club>(data).Single();
+
+            Assert.That(club.Members.Count == 1);
+            Assert.NotNull(club.Members[0].SubMembers);
+            Assert.That(club.Members[0].SubMembers.Count == 1);
+        }
+    }
+}

Slapper.AutoMapper.Tests/Slapper.Tests.csproj

@@ -51,6 +51,7 @@
     <Compile Include="MappingToGuidTests.cs" />
     <Compile Include="MappingToNullableTypesTests.cs" />
     <Compile Include="MappingToEnumTests.cs" />
+    <Compile Include="MatchingChildNameTests.cs" />
     <Compile Include="NoIdentifierTests.cs" />
     <Compile Include="NullTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

Slapper.AutoMapper/Slapper.AutoMapper.InternalHelpers.cs

@@ -36,6 +36,7 @@ dynamic data into static types and populate complex nested child objects.
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Remoting.Messaging;
+using System.Text.RegularExpressions;
 
 namespace Slapper
 {
@@ -458,9 +459,9 @@ internal static object Map(IDictionary<string, object> dictionary, object instan
 
                                 continue;
                             }
-
-                            var newDictionary = nestedDictionary.ToDictionary(pair => pair.Key.ToLower()
-                                                      .Replace(memberName + "_", string.Empty), pair => pair.Value, StringComparer.OrdinalIgnoreCase);
+                            var regex = new Regex(Regex.Escape(memberName + "_"));
+                            var newDictionary = nestedDictionary.ToDictionary(pair => regex.Replace(pair.Key.ToLower(), string.Empty, 1),
+                                pair => pair.Value, StringComparer.OrdinalIgnoreCase);
 
                             // Try to get the value of the complex member. If the member
                             // hasn't been initialized, then this will return null.