Add failing test cases for NH-2049.

Author: oskarb

src/NHibernate.Test/NHSpecificTest/NH2049/Fixture2049.cs

@@ -0,0 +1,77 @@
+using System.Collections.Generic;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH2049
+{
+	[TestFixture]
+	public class Fixture2049 : BugTestCase
+	{
+		protected override void OnSetUp()
+		{
+			base.OnSetUp();
+			using (ISession session = this.OpenSession())
+			using (var tx = session.BeginTransaction())
+			{
+				var p = new Person {Id = 1, Name = "Name"};
+				session.Save(p);
+				var ic = new IndividualCustomer {Deleted = false, Person = p, Id = 1};
+				session.Save(ic);
+
+				var deletedPerson = new Person {Id = 2, Name = "Name Deleted"};
+				session.Save(deletedPerson);
+				var deletedCustomer = new IndividualCustomer {Deleted = true, Person = deletedPerson, Id = 2};
+				session.Save(deletedCustomer);
+
+				tx.Commit();
+			}
+		}
+
+
+		protected override void OnTearDown()
+		{
+			base.OnTearDown();
+			using (ISession session = this.OpenSession())
+			{
+				session.Delete("from System.Object");
+				session.Flush();
+			}
+		}
+
+
+		[Test]
+		[Ignore("Known bug NH-2049.")]
+		public void CanCriteriaQueryWithFilterOnJoinClassBaseClassProperty()
+		{
+			using (ISession session = OpenSession())
+			{
+				session.EnableFilter("DeletedCustomer").SetParameter("deleted", false);
+				IList<Person> persons = session.CreateCriteria(typeof (Person)).List<Person>();
+
+				Assert.That(persons, Has.Count.EqualTo(1));
+				Assert.That(persons[0].Id, Is.EqualTo(1));
+				Assert.That(persons[0].IndividualCustomer, Is.Not.Null);
+				Assert.That(persons[0].IndividualCustomer.Id, Is.EqualTo(1));
+				Assert.That(persons[0].IndividualCustomer.Deleted, Is.False);
+			}
+		}
+
+
+		[Test]
+		[Ignore("Known bug NH-2049.")]
+		public void CanHqlQueryWithFilterOnJoinClassBaseClassProperty()
+		{
+			using (ISession session = OpenSession())
+			{
+				session.EnableFilter("DeletedCustomer").SetParameter("deleted", false);
+				var persons = session.CreateQuery("from Person as person left join person.IndividualCustomer as indCustomer")
+					.List<Person>();
+
+				Assert.That(persons, Has.Count.EqualTo(1));
+				Assert.That(persons[0].Id, Is.EqualTo(1));
+				Assert.That(persons[0].IndividualCustomer, Is.Not.Null);
+				Assert.That(persons[0].IndividualCustomer.Id, Is.EqualTo(1));
+				Assert.That(persons[0].IndividualCustomer.Deleted, Is.False);
+			}
+		}
+	}
+}

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

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.NH2049" default-lazy="false">
+
+    <class name="Customer" abstract="true">
+        <id name="Id">
+            <generator class="assigned" />
+        </id>
+        <property name="Deleted" type="Boolean" not-null="true" />
+        <filter name="DeletedCustomer" condition="Deleted = :deleted" />
+    </class>
+
+    <joined-subclass name="IndividualCustomer" extends="Customer">
+        <key column="IndividualCustomerID" />
+        <many-to-one name="Person" class="Person" column="PersonID" not-null="true" unique="true" />
+    </joined-subclass>
+
+    <class name="Person">
+        <id name="Id">
+            <generator class="assigned" />
+        </id>
+        <property name="Name" />
+        <one-to-one name="IndividualCustomer" class="IndividualCustomer" property-ref="Person" />
+    </class>
+
+    <filter-def name="DeletedCustomer">
+        <filter-param name="deleted" type="Boolean"/>
+    </filter-def>
+
+</hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/NH2049/Model.cs

@@ -0,0 +1,23 @@
+
+
+namespace NHibernate.Test.NHSpecificTest.NH2049
+{
+	public abstract class Customer
+	{
+		public int Id { get; set; }
+		public bool Deleted { get; set; }
+	}
+
+	public class IndividualCustomer : Customer
+	{
+		public Person Person { get; set; }
+	}
+
+	public class Person
+	{
+		public int Id { get; set; }
+		public string Name { get; set; }
+
+		public IndividualCustomer IndividualCustomer { get; set; }
+	}
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -677,6 +677,8 @@
     <Compile Include="NHSpecificTest\NH1882\Book.cs" />
     <Compile Include="NHSpecificTest\NH1882\Publisher.cs" />
     <Compile Include="NHSpecificTest\NH1882\TestCollectionInitializingDuringFlush.cs" />
+    <Compile Include="NHSpecificTest\NH2049\Model.cs" />
+    <Compile Include="NHSpecificTest\NH2049\Fixture2049.cs" />
     <Compile Include="NHSpecificTest\NH3614\Entity.cs" />
     <Compile Include="NHSpecificTest\NH3614\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3505\Student.cs" />
@@ -2914,6 +2916,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH1291AnonExample\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="NHSpecificTest\NH2049\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1863\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3614\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3505\Mappings.hbm.xml" />