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

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

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

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

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

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

Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/AbstractBasePropertyContainerMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/AbstractBasePropertyContainerMapper.cs	2011-04-22 17:51:22 UTC (rev 5741)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/AbstractBasePropertyContainerMapper.cs	2011-04-22 18:04:20 UTC (rev 5742)
@@ -84,7 +84,7 @@
 			AddProperty(hbm);
 		}
 
-		public void Any(MemberInfo property, System.Type idTypeOfMetaType, Action<IAnyMapper> mapping)
+		public virtual void Any(MemberInfo property, System.Type idTypeOfMetaType, Action<IAnyMapper> mapping)
 		{
 			if (!IsMemberSupportedByMappedContainer(property))
 			{

Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/AnyMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/AnyMapper.cs	2011-04-22 17:51:22 UTC (rev 5741)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/AnyMapper.cs	2011-04-22 18:04:20 UTC (rev 5742)
@@ -20,6 +20,9 @@
 		private readonly MemberInfo member;
 
 		public AnyMapper(MemberInfo member, System.Type foreignIdType, HbmAny any, HbmMapping mapDoc)
+			: this(member, foreignIdType, new AccessorPropertyMapper(member.DeclaringType, member.Name, x => any.access = x), any, mapDoc) {}
+
+		public AnyMapper(MemberInfo member, System.Type foreignIdType, IAccessorPropertyMapper accessorMapper, HbmAny any, HbmMapping mapDoc)
 		{
 			this.member = member;
 			this.foreignIdType = foreignIdType;
@@ -29,14 +32,7 @@
 			{
 				this.any.access = "none";
 			}
-			if (member == null)
-			{
-				entityPropertyMapper = new NoMemberPropertyMapper();
-			}
-			else
-			{
-				entityPropertyMapper = new AccessorPropertyMapper(member.DeclaringType, member.Name, x => any.access = x);
-			}
+			entityPropertyMapper = member == null ? new NoMemberPropertyMapper() : accessorMapper;
 			if (foreignIdType == null)
 			{
 				throw new ArgumentNullException("foreignIdType");
@@ -53,7 +49,7 @@
 			var classHbmColumn = new HbmColumn();
 			string classColumnName = member == null ? DefaultMetaColumnNameWhenNoProperty : member.Name + "Class";
 			classColumnMapper = new ColumnMapper(classHbmColumn, classColumnName);
-			any.column = new[] {classHbmColumn, idHbmColumn};
+			any.column = new[] { classHbmColumn, idHbmColumn };
 		}
 
 		#region Implementation of IAccessorPropertyMapper

Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs	2011-04-22 17:51:22 UTC (rev 5741)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs	2011-04-22 18:04:20 UTC (rev 5742)
@@ -63,6 +63,13 @@
 			AddProperty(hbm);
 		}
 
+		public override void Any(MemberInfo property, System.Type idTypeOfMetaType, Action<IAnyMapper> mapping)
+		{
+			var hbm = new HbmAny { name = property.Name };
+			mapping(new AnyMapper(property, idTypeOfMetaType, new NoMemberPropertyMapper(), hbm, MapDoc));
+			AddProperty(hbm);
+		}
+
 		protected override bool IsMemberSupportedByMappedContainer(MemberInfo property)
 		{
 			return true;

Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/AnyPropertyOnDynamicCompoTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/AnyPropertyOnDynamicCompoTests.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/AnyPropertyOnDynamicCompoTests.cs	2011-04-22 18:04:20 UTC (rev 5742)
@@ -0,0 +1,63 @@
+using System.Collections;
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode;
+using NHibernate.Mapping.ByCode.Impl;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.MappingByCode.MappersTests.DynamicComponentMapperTests
+{
+	public class AnyPropertyOnDynamicCompoTests
+	{
+		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 = (object)null }).GetType().GetProperty("A");
+
+			mapper.Any(propertyInfo, typeof(int), x => { });
+
+			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 = (object)null }).GetType().GetProperty("A");
+
+			var called = false;
+			mapper.Any(propertyInfo, typeof(int), x => called = true);
+
+			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 = (object)null }).GetType().GetProperty("A");
+
+			mapper.Any(propertyInfo, typeof(int), x => x.Access(Accessor.Field));
+
+			component.Properties.OfType<HbmAny>().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 17:51:22 UTC (rev 5741)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2011-04-22 18:04:20 UTC (rev 5742)
@@ -551,6 +551,7 @@
     <Compile Include="MappingByCode\MappersTests\ClassMapperTests\SetPersisterTests.cs" />
     <Compile Include="MappingByCode\MappersTests\ClassMapperTests\TablesSincronizationTests.cs" />
     <Compile Include="MappingByCode\MappersTests\CollectionIdMapperTests.cs" />
+    <Compile Include="MappingByCode\MappersTests\DynamicComponentMapperTests\AnyPropertyOnDynamicCompoTests.cs" />
     <Compile Include="MappingByCode\MappersTests\DynamicComponentMapperTests\ComponentPropertyOnDynamicCompoTests.cs" />
     <Compile Include="MappingByCode\MappersTests\DynamicComponentMapperTests\DynCompAttributesSettingTest.cs" />
     <Compile Include="MappingByCode\MappersTests\DynamicComponentMapperTests\DynComponentPropertyOnDynamicCompoTests.cs" />


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