[Nhibernate-commit] SF.net SVN: nhibernate:[5747] trunk/nhibernate/src/NHibernate

[<fab...@us...>]

Revision: 5747
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5747&view=rev
Author:   fabiomaulo
Date:     2011-04-22 18:40:11 +0000 (Fri, 22 Apr 2011)

Log Message:
-----------
Fix add map property to a dynamic-component

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs
    trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/MapMapper.cs
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj

Added Paths:
-----------
    trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/MapPropertyOnDynamicCompoTests.cs

Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs	2011-04-22 18:31:43 UTC (rev 5746)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs	2011-04-22 18:40:11 UTC (rev 5747)
@@ -107,6 +107,19 @@
 			AddProperty(hbm);
 		}
 
+		public override void Map(MemberInfo property, Action<IMapPropertiesMapper> collectionMapping, Action<IMapKeyRelation> keyMapping, Action<ICollectionElementRelation> mapping)
+		{
+			var hbm = new HbmMap { name = property.Name };
+			System.Type propertyType = property.GetPropertyOrFieldType();
+			System.Type dictionaryKeyType = propertyType.DetermineDictionaryKeyType();
+			System.Type dictionaryValueType = propertyType.DetermineDictionaryValueType();
+
+			collectionMapping(new MapMapper(container, dictionaryKeyType, dictionaryValueType, new NoMemberPropertyMapper(), hbm, mapDoc));
+			keyMapping(new MapKeyRelation(dictionaryKeyType, hbm, mapDoc));
+			mapping(new CollectionElementRelation(dictionaryValueType, MapDoc, rel => hbm.Item1 = rel));
+			AddProperty(hbm);
+		}
+
 		protected override bool IsMemberSupportedByMappedContainer(MemberInfo property)
 		{
 			return true;

Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/MapMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/MapMapper.cs	2011-04-22 18:31:43 UTC (rev 5746)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/MapMapper.cs	2011-04-22 18:40:11 UTC (rev 5747)
@@ -16,6 +16,9 @@
 		private ICacheMapper cacheMapper;
 
 		public MapMapper(System.Type ownerType, System.Type keyType, System.Type valueType, HbmMap mapping, HbmMapping mapDoc)
+			: this(ownerType, keyType, valueType, new AccessorPropertyMapper(ownerType, mapping.Name, x => mapping.access = x), mapping, mapDoc) {}
+
+		public MapMapper(System.Type ownerType, System.Type keyType, System.Type valueType, IAccessorPropertyMapper accessorMapper, HbmMap mapping, HbmMapping mapDoc)
 		{
 			if (ownerType == null)
 			{
@@ -52,7 +55,7 @@
 			{
 				mapping.Item = new HbmMapKeyManyToMany {@class = KeyType.GetShortClassName(mapDoc)};
 			}
-			entityPropertyMapper = new AccessorPropertyMapper(ownerType, mapping.Name, x => mapping.access = x);
+			entityPropertyMapper = accessorMapper;
 		}
 
 		public System.Type OwnerType { get; private set; }

Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/MapPropertyOnDynamicCompoTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/MapPropertyOnDynamicCompoTests.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/MapPropertyOnDynamicCompoTests.cs	2011-04-22 18:40:11 UTC (rev 5747)
@@ -0,0 +1,64 @@
+using System.Collections;
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode;
+using NHibernate.Mapping.ByCode.Impl;
+using NUnit.Framework;
+using SharpTestsEx;
+using System.Collections.Generic;
+
+namespace NHibernate.Test.MappingByCode.MappersTests.DynamicComponentMapperTests
+{
+	public class MapPropertyOnDynamicCompoTests
+	{
+		private class Person
+		{
+			public int Id { get; set; }
+			private IDictionary info;
+			public IDictionary Info
+			{
+				get { return info; }
+			}
+		}
+
+		[Test]
+		public void WhenAddThenHas()
+		{
+			var mapdoc = new HbmMapping();
+			var component = new HbmDynamicComponent();
+			var mapper = new DynamicComponentMapper(component, For<Person>.Property(p => p.Info), mapdoc);
+			var propertyInfo = (new { A = (IDictionary<int, int>)null }).GetType().GetProperty("A");
+
+			mapper.Map(propertyInfo, x => { }, km => { }, rel => { });
+
+			component.Properties.Select(x => x.Name).Should().Have.SameSequenceAs("A");
+		}
+
+		[Test]
+		public void WhenCustomizeThenCallCustomizer()
+		{
+			var mapdoc = new HbmMapping();
+			var component = new HbmDynamicComponent();
+			var mapper = new DynamicComponentMapper(component, For<Person>.Property(p => p.Info), mapdoc);
+			var propertyInfo = (new { A = (IDictionary<int, int>)null }).GetType().GetProperty("A");
+
+			var called = false;
+			mapper.Map(propertyInfo, x => called = true, km => { }, rel => { });
+
+			called.Should().Be.True();
+		}
+
+		[Test]
+		public void WhenCustomizeAccessorThenIgnore()
+		{
+			var mapdoc = new HbmMapping();
+			var component = new HbmDynamicComponent();
+			var mapper = new DynamicComponentMapper(component, For<Person>.Property(p => p.Info), mapdoc);
+			var propertyInfo = (new { A = (IDictionary<int, int>)null }).GetType().GetProperty("A");
+
+			mapper.Map(propertyInfo, x => x.Access(Accessor.Field), km => { }, rel => { });
+
+			component.Properties.OfType<HbmMap>().Single().Access.Should().Be.NullOrEmpty();
+		}		
+	}
+}
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2011-04-22 18:31:43 UTC (rev 5746)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2011-04-22 18:40:11 UTC (rev 5747)
@@ -558,6 +558,7 @@
     <Compile Include="MappingByCode\MappersTests\DynamicComponentMapperTests\DynComponentPropertyOnDynamicCompoTests.cs" />
     <Compile Include="MappingByCode\MappersTests\DynamicComponentMapperTests\ListPropertyOnDynamicCompoTests.cs" />
     <Compile Include="MappingByCode\MappersTests\DynamicComponentMapperTests\ManyToOnePropertyOnDynamicCompoTests.cs" />
+    <Compile Include="MappingByCode\MappersTests\DynamicComponentMapperTests\MapPropertyOnDynamicCompoTests.cs" />
     <Compile Include="MappingByCode\MappersTests\DynamicComponentMapperTests\OneToOnePropertyOnDynamicCompoTests.cs" />
     <Compile Include="MappingByCode\MappersTests\DynamicComponentMapperTests\SetPropertyOnDynamicCompoTests.cs" />
     <Compile Include="MappingByCode\MappersTests\DynamicComponentMapperTests\SimplePropertyOnDynamicCompoTests.cs" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.