Enable and fix merge on one to one test

Author: fredericDelaporte

src/NHibernate.Test/Async/Operations/MergeFixture.cs

@@ -50,6 +50,8 @@ protected override void OnTearDown()
 					await (s.DeleteAsync("from Competition", cancellationToken));
 
 					await (s.DeleteAsync("from Employer", cancellationToken));
+					await (s.DeleteAsync("from Address", cancellationToken));
+					await (s.DeleteAsync("from Person", cancellationToken));
 
 					await (tx.CommitAsync(cancellationToken));
 				}
@@ -76,6 +78,8 @@ private void Cleanup()
 					s.Delete("from Competition");
 
 					s.Delete("from Employer");
+					s.Delete("from Address");
+					s.Delete("from Person");
 
 					tx.Commit();
 				}
@@ -156,6 +160,41 @@ public async Task MergeBidiForeignKeyOneToOneAsync()
 			}
 		}
 
+		[Test]
+		public async Task MergeBidiPrimayKeyOneToOneAsync()
+		{
+			Person p;
+			using (ISession s = OpenSession())
+			using (ITransaction tx = s.BeginTransaction())
+			{
+				p = new Person {Name = "steve"};
+				new PersonalDetails {SomePersonalDetail = "I have big feet", Person = p};
+				await (s.PersistAsync(p));
+				await (tx.CommitAsync());
+			}
+
+			ClearCounts();
+
+			p.Details.SomePersonalDetail = p.Details.SomePersonalDetail + " and big hands too";
+			using (ISession s = OpenSession())
+			using (ITransaction tx = s.BeginTransaction())
+			{
+				p = (Person) await (s.MergeAsync(p));
+				await (tx.CommitAsync());
+			}
+
+			AssertInsertCount(0);
+			AssertUpdateCount(1);
+			AssertDeleteCount(0);
+
+			using (ISession s = OpenSession())
+			using (ITransaction tx = s.BeginTransaction())
+			{
+				await (s.DeleteAsync(p));
+				await (tx.CommitAsync());
+			}
+		}
+
 		[Test]
 		public async Task MergeDeepTreeAsync()
 		{

src/NHibernate.Test/Operations/MergeFixture.cs

@@ -38,6 +38,8 @@ private void Cleanup()
 					s.Delete("from Competition");
 
 					s.Delete("from Employer");
+					s.Delete("from Address");
+					s.Delete("from Person");
 
 					tx.Commit();
 				}
@@ -118,7 +120,7 @@ public void MergeBidiForeignKeyOneToOne()
 			}
 		}
 
-		[Test, Ignore("Need some more investigation about id sync.")]
+		[Test]
 		public void MergeBidiPrimayKeyOneToOne()
 		{
 			Person p;

src/NHibernate.Test/Operations/OneToOne.hbm.xml

@@ -32,10 +32,12 @@
 
 	<class name="PersonalDetails" table="OPS_PERS_DETAIL">
 		<id name="Id" column="ID" type="long">
-			<generator class="increment"/>
+			<generator class="foreign">
+				<param name="property">Person</param>
+			</generator>
 		</id>
 		<property name="SomePersonalDetail" column="SOME_DETAIL" type="string"/>
 		<one-to-one name="Person" class="Person" constrained="true" />
 	</class>
 
-</hibernate-mapping>
+</hibernate-mapping>