Make Cache public again && changed GetInstanceCache to internal + Add new test

Author: odelvalle

Slapper.AutoMapper.Tests/MapUniqueChildsIdTest.cs

@@ -0,0 +1,48 @@
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Dynamic;
+using System.Linq;
+using System.Text;
+
+namespace Slapper.Tests
+{
+    [TestFixture]
+    class MapUniqueChildsIdTest
+    {
+        public class NameValue
+        {
+            public int Id { get; set; }
+            public string Name { get; set; }
+
+            public IEnumerable<NameValue> Phones { get; set; }
+            public IEnumerable<NameValue> Emails { get; set; }
+        }
+
+        [Test]
+        public void Can_Map_DifferentsRows_to_Same_object()
+        {
+            dynamic dynamicCustomer = new ExpandoObject();
+            dynamicCustomer.Id = 1;
+            dynamicCustomer.Name = "Clark";
+            dynamicCustomer.Phones_Id = 1;
+            dynamicCustomer.Phones_Name = "88888";
+            dynamicCustomer.Emails_Id = "1";
+            dynamicCustomer.Emails_Name = "[email protected]";
+
+            dynamic dynamicCustomer2 = new ExpandoObject();
+            dynamicCustomer2.Id = 1;
+            dynamicCustomer2.Name = "Clark";
+            dynamicCustomer2.Phones_Id = 2;
+            dynamicCustomer2.Phones_Name = "99999";
+            dynamicCustomer2.Emails_Id = "2";
+            dynamicCustomer2.Emails_Name = "[email protected]";
+
+            var list = new List<dynamic> { dynamicCustomer, dynamicCustomer2 };
+            var customer = Slapper.AutoMapper.MapDynamic<NameValue>(list).FirstOrDefault();
+
+            Assert.NotNull(customer);
+            Assert.AreNotEqual(customer.Emails.FirstOrDefault(e => e.Id == 1).Name, customer.Phones.FirstOrDefault(p => p.Id == 1).Name);
+        }
+    }
+}

Slapper.AutoMapper.Tests/Slapper.Tests.csproj

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

Slapper.AutoMapper/Slapper.AutoMapper.Cache.cs

@@ -43,7 +43,7 @@ public static partial class AutoMapper
         /// <summary>
         /// Contains the methods and members responsible for this libraries caching concerns.
         /// </summary>
-        internal static class Cache
+        public static class Cache
         {
             /// <summary>
             /// The name of the instance cache stored in the logical call context.
@@ -115,7 +115,7 @@ public static void ClearInstanceCache()
             /// unique cache.
             /// </remarks>
             /// <returns>Instance Cache</returns>
-            public static Dictionary<InternalHelpers.InstanceKey,object> GetInstanceCache()
+            internal static Dictionary<InternalHelpers.InstanceKey,object> GetInstanceCache()
             {
                 var instanceCache = InternalHelpers.ContextStorage.Get<Dictionary<InternalHelpers.InstanceKey, object>>(InstanceCacheContextStorageKey);