Added One To One with foreign key test

Author: seamus-hoban

src/NHibernate.Test/NHSpecificTest/GH1149/Classes.cs

@@ -25,4 +25,27 @@ public Address(Company company)
 		public virtual string AddressLine1 { get; set; }
 
 	}
+
+	public class CompanyO2O
+	{
+		public virtual int Id { get; set; }
+		public virtual string Name { get; set; }
+		public virtual AddressO2O Address { get; set; }
+	}
+
+	public class AddressO2O
+	{
+		public virtual int Id { get; set; }
+
+		public virtual CompanyO2O Company { get; set; }
+
+		public virtual string AddressLine1 { get; set; }
+
+		public virtual void SetCompany(CompanyO2O company)
+		{
+			Company = company;
+			company.Address = this;
+		}
+
+	}
 }

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

@@ -5,11 +5,26 @@ namespace NHibernate.Test.NHSpecificTest.GH1149
 	[TestFixture]
 	public class Fixture : BugTestCase
 	{
-		private int _companyId = 0;
+		protected override void OnTearDown()
+		{
+			using (ISession session = OpenSession())
+			using (ITransaction transaction = session.BeginTransaction())
+			{
+				session.Delete("from Address");
+				session.Delete("from Company");
+				session.Delete("from AddressO2O");
+				session.Delete("from CompanyO2O");
+				session.Flush();
+				transaction.Commit();
+			}
+		}
 
-		protected override void OnSetUp()
+		[Test]
+		public void StatelessSessionLoadsOneToOneRelatedObject_PropertyRef()
 		{
-			base.OnSetUp();
+			// Create and save company and address
+			var companyId = 0;
+
 			using (ISession session = OpenSession())
 			{
 				using (ITransaction tx = session.BeginTransaction())
@@ -18,38 +33,55 @@ protected override void OnSetUp()
 
 					company.Address = new Address(company) { AddressLine1 = "Company Address" };
 
-					_companyId = (int) session.Save(company);
+					companyId = (int) session.Save(company);
 
 					tx.Commit();
 				}
 			}
-		}
 
-		protected override void OnTearDown()
-		{
-			using (ISession session = OpenSession())
-			using (ITransaction transaction = session.BeginTransaction())
+			using (var stateless = Sfi.OpenStatelessSession())
 			{
-				session.Delete("from Address");
-				session.Delete("from Company");
-				session.Flush();
-				transaction.Commit();
+				var loadedCompany = stateless.Get<Company>(companyId);
+
+				Assert.That(loadedCompany, Is.Not.Null);
+				Assert.That(loadedCompany.Name, Is.Not.Null);
+				Assert.That(loadedCompany.Address, Is.Not.Null);
+				Assert.That(loadedCompany.Address.AddressLine1, Is.Not.Null);
 			}
 		}
 
 		[Test]
-		public void StatelessSessionLoadsOneToOneRelatedObject()
+		public void StatelessSessionLoadsOneToOneRelatedObject_WithoutPropertyRef()
 		{
+			var companyId = 0;
+
+			using (ISession session = OpenSession())
+			{
+				using (ITransaction tx = session.BeginTransaction())
+				{
+					var company = new CompanyO2O { Name = "Test Company" };
+					var address = new AddressO2O {AddressLine1 = "Company Address"};
+
+					address.SetCompany(company);
+
+					// Have to save the address to get the company to be saved as well
+					// Saving company doesn't save the address.
+					companyId = (int) session.Save(address);
+
+					tx.Commit();
+				}
+			}
+
+			
 			using (var stateless = Sfi.OpenStatelessSession())
 			{
-				var loadedCompany = stateless.Get<Company>(_companyId);
+				var loadedCompany = stateless.Get<CompanyO2O>(companyId);
 
 				Assert.That(loadedCompany, Is.Not.Null);
 				Assert.That(loadedCompany.Name, Is.Not.Null);
 				Assert.That(loadedCompany.Address, Is.Not.Null);
 				Assert.That(loadedCompany.Address.AddressLine1, Is.Not.Null);
 			}
 		}
-
 	}
 }

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

@@ -19,7 +19,28 @@
 		<property name="AddressLine1" />
 
 		<many-to-one name="Company" class="Company" column="CompanyId" unique="true" />
+	</class>
+
+	<class name="CompanyO2O" >
+		<id name="Id">
+			<generator class="native"/>
+		</id>
+		<property name="Name" />
+
+		<one-to-one name="Address"/>
+
+	</class>
+
+	<class name="AddressO2O">
+		<id name="Id" type="int">
+			<generator class="foreign">
+				<param name="property">Company</param>
+			</generator>
+		</id>
+
+		<property name="AddressLine1" />
 
+		<one-to-one name="Company" cascade="save-update" constrained="true"/>
 	</class>
 
 </hibernate-mapping>