Tests for NH3641

Author: PleasantD

src/NHibernate.Test/NHSpecificTest/NH3641/Domain.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NHibernate.Proxy;
+using NHibernate.Proxy.DynamicProxy;
+
+namespace NHibernate.Test.NHSpecificTest.NH3641
+{
+    public interface IEntity
+    {
+        int Id { get; set; }
+        bool Flag { get; set; }
+        Entity ChildConcrete { get; set; }
+        IEntity ChildInterface { get; set; }
+    }
+
+    public class Entity : IEntity
+    {
+        public virtual int Id { get; set; }
+        public virtual bool  Flag { get; set; }
+        public virtual Entity ChildConcrete { get; set; }
+        public virtual IEntity ChildInterface { get; set; }
+    }
+}

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+                   assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.NH3641">
+ 
+  <class name="Entity" table="Entity" lazy="true">
+    <id name="Id" access="property" column="Id" type="Int32" unsaved-value="0">
+      <generator class="assigned" />
+    </id>
+  
+    <property name="Flag" type="Boolean">
+      <column name="Flag" not-null="true" />
+    </property>
+  
+    <many-to-one name="ChildConcrete" access="property"  class="Entity" column="ChildConcreteId" lazy="proxy" />
+    <many-to-one name="ChildInterface" access="property" class="Entity" column="ChildInterfaceId" lazy="proxy" />
+  </class>
+ 
+</hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/NH3641/TestFixture.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using NHibernate.Linq;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH3641
+{
+    public class TestFixture : BugTestCase
+    {
+        protected override void OnSetUp()
+        {
+            using (var session = OpenSession())
+            using (var tx = session.BeginTransaction())
+            {
+                var child = new Entity { Id = 1, Flag = false };
+                var parent = new Entity { Id = 2, ChildInterface = child, ChildConcrete = child };
+
+                session.Save(child);
+                session.Save(parent);
+
+                tx.Commit();
+            }
+        }
+
+        protected override void OnTearDown()
+        {
+            using (var session = OpenSession())
+            using (var tx = session.BeginTransaction())
+            {
+                DeleteAll<Entity>(session);
+                tx.Commit();
+            }
+        }
+
+        private static void DeleteAll<T>(ISession session)
+        {
+            session.CreateQuery("delete from " + typeof(T).Name).ExecuteUpdate();
+        }
+
+        [Test]
+        public void TrueOrChildPropertyConcrete()
+        {
+            using (var session = OpenSession())
+            {
+                var result = session.Query<IEntity>().Where(x => true || x.ChildConcrete.Flag).ToList();
+                Assert.That(result, Has.Count.EqualTo(2));
+            }
+        }
+
+        [Test]
+        public void TrueOrChildPropertyInterface()
+        {
+            using (var session = OpenSession())
+            {
+                var result = session.Query<IEntity>().Where(x => true || ((Entity)x.ChildInterface).Flag).ToList();
+                Assert.That(result, Has.Count.EqualTo(2));
+            }
+        }
+    }
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -1033,6 +1033,8 @@
     <Compile Include="NHSpecificTest\NH3145\Model.cs" />
     <Compile Include="NHSpecificTest\NH2860\ClassA.cs" />
     <Compile Include="NHSpecificTest\NH2860\SampleTest.cs" />
+    <Compile Include="NHSpecificTest\NH3641\Domain.cs" />
+    <Compile Include="NHSpecificTest\NH3641\TestFixture.cs" />
     <Compile Include="NHSpecificTest\Properties\CompositePropertyRefTest.cs" />
     <Compile Include="NHSpecificTest\Properties\DynamicEntityTest.cs" />
     <Compile Include="NHSpecificTest\Properties\Model.cs" />
@@ -2883,6 +2885,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH1291AnonExample\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="NHSpecificTest\NH3641\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3408\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2408\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2297\MappingsNames.hbm.xml" />