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

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

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

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

Modified Paths:
--------------
    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/DynComponentPropertyOnDynamicCompoTests.cs

Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs	2011-04-22 16:11:38 UTC (rev 5739)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs	2011-04-22 17:37:58 UTC (rev 5740)
@@ -10,10 +10,14 @@
 		private readonly HbmDynamicComponent component;
 		private readonly IAccessorPropertyMapper accessorPropertyMapper;
 
-		public DynamicComponentMapper(HbmDynamicComponent component, MemberInfo declaringTypeMember, HbmMapping mapDoc) : base(declaringTypeMember.DeclaringType, mapDoc)
+		public DynamicComponentMapper(HbmDynamicComponent component, MemberInfo declaringTypeMember, HbmMapping mapDoc)
+			: this(component, declaringTypeMember, new AccessorPropertyMapper(declaringTypeMember.DeclaringType, declaringTypeMember.Name, x => component.access = x), mapDoc) {}
+
+		private DynamicComponentMapper(HbmDynamicComponent component, MemberInfo declaringTypeMember, IAccessorPropertyMapper accessorMapper, HbmMapping mapDoc)
+			: base(declaringTypeMember.DeclaringType, mapDoc)
 		{
 			this.component = component;
-			accessorPropertyMapper = new AccessorPropertyMapper(declaringTypeMember.DeclaringType, declaringTypeMember.Name, x => component.access = x);
+			accessorPropertyMapper = accessorMapper;
 		}
 
 		protected override void AddProperty(object property)
@@ -45,6 +49,13 @@
 			AddProperty(hbm);
 		}
 
+		public override void Component(MemberInfo property, Action<IDynamicComponentMapper> mapping)
+		{
+			var hbm = new HbmDynamicComponent { name = property.Name };
+			mapping(new DynamicComponentMapper(hbm, property, new NoMemberPropertyMapper(), MapDoc));
+			AddProperty(hbm);
+		}
+
 		protected override bool IsMemberSupportedByMappedContainer(MemberInfo property)
 		{
 			return true;

Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/DynComponentPropertyOnDynamicCompoTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/DynComponentPropertyOnDynamicCompoTests.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/DynComponentPropertyOnDynamicCompoTests.cs	2011-04-22 17:37:58 UTC (rev 5740)
@@ -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 DynComponentPropertyOnDynamicCompoTests
+	{
+		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 = For<Person>.Property(p => p.Info);//just as another dyn-compo
+
+			mapper.Component(propertyInfo, (IDynamicComponentMapper x) => { });
+
+			component.Properties.Select(x => x.Name).Should().Have.SameSequenceAs("Info");
+		}
+
+		[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 = For<Person>.Property(p => p.Info);//just as another dyn-compo
+
+			var called = false;
+			mapper.Component(propertyInfo, (IDynamicComponentMapper 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 = For<Person>.Property(p => p.Info);//just as another dyn-compo
+
+			mapper.Component(propertyInfo, (IDynamicComponentMapper x) => x.Access(Accessor.Field));
+
+			component.Properties.OfType<HbmDynamicComponent>().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 16:11:38 UTC (rev 5739)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2011-04-22 17:37:58 UTC (rev 5740)
@@ -553,6 +553,7 @@
     <Compile Include="MappingByCode\MappersTests\CollectionIdMapperTests.cs" />
     <Compile Include="MappingByCode\MappersTests\DynamicComponentMapperTests\ComponentPropertyOnDynamicCompoTests.cs" />
     <Compile Include="MappingByCode\MappersTests\DynamicComponentMapperTests\DynCompAttributesSettingTest.cs" />
+    <Compile Include="MappingByCode\MappersTests\DynamicComponentMapperTests\DynComponentPropertyOnDynamicCompoTests.cs" />
     <Compile Include="MappingByCode\MappersTests\DynamicComponentMapperTests\SimplePropertyOnDynamicCompoTests.cs" />
     <Compile Include="MappingByCode\MappersTests\FakeUserCollectionType.cs" />
     <Compile Include="MappingByCode\MappersTests\IdBagMapperTest.cs" />


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