Add tests to ensure query cache correctly caches 'is null' query parts.

Author: jlevitt

src/NHibernate.Test/NHSpecificTest/NH3634/FixtureByCode.cs

@@ -46,17 +46,29 @@ protected override void OnSetUp()
 					};
 				session.Save(e2);
 
-				var cachedConnection = new Connection
+				var cachedNullConnection = new Connection
 				{
 					Address = "test.com",
 					ConnectionType = "http",
 				};
-				var cachedPerson = new CachedPerson
+				var cachedNullConnectionPerson = new CachedPerson
 				{
-					Name = "Cached",
-					Connection = cachedConnection
+					Name = "CachedNull",
+					Connection = cachedNullConnection
 				};
-				session.Save(cachedPerson);
+				var cachedNotNullConnection = new Connection
+				{
+					Address = "test.com",
+					ConnectionType = "http",
+					PortName = "port"
+				};
+				var cachedNotNullConnectionPerson = new CachedPerson
+				{
+					Name = "CachedNotNull",
+					Connection = cachedNotNullConnection
+				};
+				session.Save(cachedNullConnectionPerson);
+				session.Save(cachedNotNullConnectionPerson);
 
 				session.Flush();
 				transaction.Commit();
@@ -145,6 +157,100 @@ public void QueryAgainstComponentWithANullPropertyUsingCriteria()
 			}
 		}
 
+		[Test]
+		public void CachedQueryMissesWithDifferentNotNullComponent()
+		{
+			var componentToCompare = new Connection
+				{
+					ConnectionType = "http",
+					Address = "test.com",
+					PortName = null
+				};
+
+			using (ISession session = OpenSession())
+			using (ITransaction tx = session.BeginTransaction())
+			{
+				var cached = session.CreateCriteria<CachedPerson>()
+								   .Add(Restrictions.Eq("Connection", componentToCompare))
+								   .SetCacheable(true)
+								   .UniqueResult<CachedPerson>();
+
+				Assert.That(cached.Name, Is.EqualTo("CachedNull"));
+				Assert.That(cached.Connection.PortName, Is.Null);
+
+				using (var dbCommand = session.Connection.CreateCommand())
+				{
+					dbCommand.CommandText = "DELETE FROM cachedpeople";
+					tx.Enlist(dbCommand);
+					dbCommand.ExecuteNonQuery();
+				}
+
+				tx.Commit();
+			}
+
+			componentToCompare.PortName = "port";
+			using (ISession session = OpenSession())
+			using (ITransaction tx = session.BeginTransaction())
+			{
+				//Cache should not return cached entity, because it no longer matches criteria
+				var cachedPeople = session.CreateCriteria<CachedPerson>()
+				                          .Add(Restrictions.Eq("Connection", componentToCompare))
+				                          .SetCacheable(true)
+				                          .List<CachedPerson>();
+
+				Assert.That(cachedPeople, Is.Empty);
+
+				tx.Commit();
+			}
+		}
+
+		[Test]
+		public void CachedQueryMissesWithDifferentNullComponent()
+		{
+			var componentToCompare = new Connection
+				{
+					ConnectionType = "http",
+					Address = "test.com",
+					PortName = "port"
+				};
+
+			using (ISession session = OpenSession())
+			using (ITransaction tx = session.BeginTransaction())
+			{
+				var cached = session.CreateCriteria<CachedPerson>()
+								   .Add(Restrictions.Eq("Connection", componentToCompare))
+								   .SetCacheable(true)
+								   .UniqueResult<CachedPerson>();
+
+				Assert.That(cached.Name, Is.EqualTo("CachedNotNull"));
+				Assert.That(cached.Connection.PortName, Is.Not.Null);
+
+				using (var dbCommand = session.Connection.CreateCommand())
+				{
+					dbCommand.CommandText = "DELETE FROM cachedpeople";
+					tx.Enlist(dbCommand);
+					dbCommand.ExecuteNonQuery();
+				}
+
+				tx.Commit();
+			}
+
+			componentToCompare.PortName = null;
+			using (ISession session = OpenSession())
+			using (ITransaction tx = session.BeginTransaction())
+			{
+				//Cache should not return cached entity, because it no longer matches criteria
+				var cachedPeople = session.CreateCriteria<CachedPerson>()
+				                          .Add(Restrictions.Eq("Connection", componentToCompare))
+				                          .SetCacheable(true)
+				                          .List<CachedPerson>();
+
+				Assert.That(cachedPeople, Is.Empty);
+
+				tx.Commit();
+			}
+		}
+
 		[Test]
 		public void CachedQueryAgainstComponentWithANullPropertyUsingCriteria()
 		{
@@ -163,7 +269,7 @@ public void CachedQueryAgainstComponentWithANullPropertyUsingCriteria()
 								   .SetCacheable(true)
 								   .UniqueResult<CachedPerson>();
 
-				Assert.That(cached.Name, Is.EqualTo("Cached"));
+				Assert.That(cached.Name, Is.EqualTo("CachedNull"));
 				Assert.That(cached.Connection.PortName, Is.Null);
 
 				using (var dbCommand = session.Connection.CreateCommand())
@@ -185,7 +291,7 @@ public void CachedQueryAgainstComponentWithANullPropertyUsingCriteria()
 								   .SetCacheable(true)
 								   .UniqueResult<CachedPerson>();
 
-				Assert.That(cached.Name, Is.EqualTo("Cached"));
+				Assert.That(cached.Name, Is.EqualTo("CachedNull"));
 				Assert.That(cached.Connection.PortName, Is.Null);
 
 				tx.Commit();