Add test for #2608

Author: fredericDelaporte

src/NHibernate.Test/Async/NHSpecificTest/GH2608/Fixture.cs

@@ -0,0 +1,44 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.GH2608
+{
+	using System.Threading.Tasks;
+	[TestFixture]
+	public class FixtureAsync : BugTestCase
+	{
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.CreateQuery("delete from PersonalDetails").ExecuteUpdate();
+				session.CreateQuery("delete from System.Object").ExecuteUpdate();
+
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public async Task MergeBidiPrimaryKeyOneToOneAsync()
+		{
+			using (var s = OpenSession())
+			using (var tx = s.BeginTransaction())
+			{
+				var p = new Person { Name = "steve" };
+				p.Details = new PersonalDetails { SomePersonalDetail = "I have big feet", Person = p };
+				await (s.MergeAsync(p));
+				await (tx.CommitAsync());
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/GH2608/Fixture.cs

@@ -0,0 +1,33 @@
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.GH2608
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.CreateQuery("delete from PersonalDetails").ExecuteUpdate();
+				session.CreateQuery("delete from System.Object").ExecuteUpdate();
+
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public void MergeBidiPrimaryKeyOneToOne()
+		{
+			using (var s = OpenSession())
+			using (var tx = s.BeginTransaction())
+			{
+				var p = new Person { Name = "steve" };
+				p.Details = new PersonalDetails { SomePersonalDetail = "I have big feet", Person = p };
+				s.Merge(p);
+				tx.Commit();
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/GH2608/Mappings.hbm.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+                   assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.GH2608">
+
+  <class name="Person">
+    <id name="Id">
+      <generator class="native"/>
+    </id>
+    <property name="Name"/>
+    <one-to-one name="Details" class="PersonalDetails" cascade="all"/>
+  </class>
+
+  <class name="PersonalDetails">
+    <id name="Id">
+      <generator class="foreign">
+        <param name="property">Person</param>
+      </generator>
+    </id>
+    <property name="SomePersonalDetail"/>
+    <one-to-one name="Person" class="Person" constrained="true"/>
+  </class>
+
+</hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/GH2608/Person.cs

@@ -0,0 +1,9 @@
+namespace NHibernate.Test.NHSpecificTest.GH2608
+{
+	public class Person
+	{
+		public virtual long Id { get; set; }
+		public virtual string Name { get; set; }
+		public virtual PersonalDetails Details { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/GH2608/PersonalDetails.cs

@@ -0,0 +1,10 @@
+namespace NHibernate.Test.NHSpecificTest.GH2608
+{
+	public class PersonalDetails
+	{
+		public virtual long Id { get; set; }
+		public virtual string SomePersonalDetail { get; set; }
+
+		public virtual Person Person { get; set; }
+	}
+}