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

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

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

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

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

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

Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs	2011-04-22 18:04:20 UTC (rev 5742)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs	2011-04-22 18:10:28 UTC (rev 5743)
@@ -70,6 +70,13 @@
 			AddProperty(hbm);
 		}
 
+		public override void OneToOne(MemberInfo property, Action<IOneToOneMapper> mapping)
+		{
+			var hbm = new HbmOneToOne { name = property.Name };
+			mapping(new OneToOneMapper(property, new NoMemberPropertyMapper(), hbm));
+			AddProperty(hbm);
+		}
+
 		protected override bool IsMemberSupportedByMappedContainer(MemberInfo property)
 		{
 			return true;

Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/OneToOneMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/OneToOneMapper.cs	2011-04-22 18:04:20 UTC (rev 5742)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/OneToOneMapper.cs	2011-04-22 18:10:28 UTC (rev 5743)
@@ -11,6 +11,9 @@
 		private readonly HbmOneToOne oneToOne;
 
 		public OneToOneMapper(MemberInfo member, HbmOneToOne oneToOne)
+			: this(member, new AccessorPropertyMapper(member.DeclaringType, member.Name, x => oneToOne.access = x), oneToOne) {}
+
+		public OneToOneMapper(MemberInfo member, IAccessorPropertyMapper accessorMapper, HbmOneToOne oneToOne)
 		{
 			this.member = member;
 			this.oneToOne = oneToOne;
@@ -18,14 +21,7 @@
 			{
 				this.oneToOne.access = "none";
 			}
-			if (member == null)
-			{
-				entityPropertyMapper = new NoMemberPropertyMapper();
-			}
-			else
-			{
-				entityPropertyMapper = new AccessorPropertyMapper(member.DeclaringType, member.Name, x => oneToOne.access = x);
-			}
+			entityPropertyMapper = member == null ? new NoMemberPropertyMapper() : accessorMapper;
 		}
 
 		#region Implementation of IOneToOneMapper

Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/OneToOnePropertyOnDynamicCompoTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/OneToOnePropertyOnDynamicCompoTests.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/OneToOnePropertyOnDynamicCompoTests.cs	2011-04-22 18:10:28 UTC (rev 5743)
@@ -0,0 +1,67 @@
+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 OneToOnePropertyOnDynamicCompoTests
+	{
+		private class Person
+		{
+			public int Id { get; set; }
+			private IDictionary info;
+			public IDictionary Info
+			{
+				get { return info; }
+			}
+		}
+
+		private class MyClass
+		{
+			public int Id { get; set; }
+		}
+		[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 = (MyClass)null }).GetType().GetProperty("A");
+
+			mapper.OneToOne(propertyInfo, 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 = (MyClass)null }).GetType().GetProperty("A");
+
+			var called = false;
+			mapper.OneToOne(propertyInfo, 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 = (MyClass)null }).GetType().GetProperty("A");
+
+			mapper.OneToOne(propertyInfo, x => x.Access(Accessor.Field));
+
+			component.Properties.OfType<HbmOneToOne>().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:04:20 UTC (rev 5742)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2011-04-22 18:10:28 UTC (rev 5743)
@@ -556,6 +556,7 @@
     <Compile Include="MappingByCode\MappersTests\DynamicComponentMapperTests\DynCompAttributesSettingTest.cs" />
     <Compile Include="MappingByCode\MappersTests\DynamicComponentMapperTests\DynComponentPropertyOnDynamicCompoTests.cs" />
     <Compile Include="MappingByCode\MappersTests\DynamicComponentMapperTests\ManyToOnePropertyOnDynamicCompoTests.cs" />
+    <Compile Include="MappingByCode\MappersTests\DynamicComponentMapperTests\OneToOnePropertyOnDynamicCompoTests.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.