Add contributed test with modifications for NH-2852 (Thanks to Daniel Guenter)

Author: hazzik

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

@@ -0,0 +1,78 @@
+using System.Linq;
+using NHibernate.Linq;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH2852
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		protected override void OnSetUp()
+		{
+			using (var session = OpenSession())
+			using (var transction = session.BeginTransaction())
+			{
+				var city = new City { Name = "London" };
+				session.Save(city);
+				var address = new Address {City = city, Name = "Tower"};
+				session.Save(address);
+				var person = new Person {Address = address, Name = "Bill"};
+				session.Save(person);
+				var child = new Person {Parent = person};
+				session.Save(child);
+				var grandChild = new Person {Parent = child};
+				session.Save(grandChild);
+
+				transction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transction = session.BeginTransaction())
+			{
+				session.Delete("from System.Object");
+				transction.Commit();
+			}
+		}
+		
+		[Test]
+		public void ThenFetchCanExecute()
+		{
+			using (var session = OpenSession())
+			{
+				var query = session.Query<Person>()
+					.Where(p => p.Address.City.Name == "London")
+					.Fetch(r => r.Address)
+					.ThenFetch(a => a.City);
+
+				var results = query.ToList();
+
+				session.Close();
+
+				Assert.True(NHibernateUtil.IsInitialized(results[0].Address));
+				Assert.True(NHibernateUtil.IsInitialized(results[0].Address.City));
+			}
+		}
+
+		[Test]
+		public void AlsoFails()
+		{
+			using (var session = OpenSession())
+			{
+				var query = session.Query<Person>()
+					.Where(p => p.Parent.Parent.Name == "Bill")
+					.Fetch(p => p.Parent)
+					.ThenFetch(p => p.Parent);
+
+				var results = query.ToList();
+
+				session.Close();
+
+				Assert.True(NHibernateUtil.IsInitialized(results[0].Parent));
+				Assert.True(NHibernateUtil.IsInitialized(results[0].Parent.Parent));
+			}
+		}
+	}
+}

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

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping
+	xmlns="urn:nhibernate-mapping-2.2"
+	namespace="NHibernate.Test.NHSpecificTest.NH2852"
+	assembly="NHibernate.Test">
+
+	<class name="Person" table="People">
+		<id name="Id">
+			<generator class="identity"/>
+		</id>
+    <property name="Name"/>
+    <many-to-one name="Address" column="AddressId" class="Address"/>
+    <many-to-one name="Parent" column="ParentId" class="Person"/>
+	</class>
+
+  <class name="Address" table="Addresses">
+    <id name="Id">
+      <generator class="identity"/>
+    </id>
+    <property name="Name"/>
+    <many-to-one name="City" column="CityId" class="City"/>
+  </class>
+
+  <class name="City" table="Cities">
+    <id name="Id">
+      <generator class="identity"/>
+    </id>
+    <property name="Name"/>
+  </class>
+</hibernate-mapping>

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

@@ -0,0 +1,29 @@
+namespace NHibernate.Test.NHSpecificTest.NH2852
+{
+	public class Person
+	{
+		public virtual int Id { get; set; }
+
+		public virtual string Name { get; set; }
+
+		public virtual Person Parent { get; set; }
+
+		public virtual Address Address { get; set; }
+	}
+
+	public class Address
+	{
+		public virtual int Id { get; set; }
+
+		public virtual string Name { get; set; }
+
+		public virtual City City { get; set; }
+	}
+
+	public class City
+	{
+		public virtual int Id { get; set; }
+
+		public virtual string Name { get; set; }
+	}
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -1001,6 +1001,8 @@
     <Compile Include="NHSpecificTest\NH3132\Product.cs" />
     <Compile Include="NHSpecificTest\NH3139\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3139\Product.cs" />
+    <Compile Include="NHSpecificTest\NH2852\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH2852\Person.cs" />
     <Compile Include="NHSpecificTest\Properties\CompositePropertyRefTest.cs" />
     <Compile Include="NHSpecificTest\Properties\DynamicEntityTest.cs" />
     <Compile Include="NHSpecificTest\Properties\Model.cs" />
@@ -2851,6 +2853,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH1291AnonExample\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="NHSpecificTest\NH2852\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2898\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2808\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3121\Mappings.hbm.xml" />