fixup! Failing test

Author: bahusoid

src/NHibernate.Test/Async/Linq/ConstantTest.cs

@@ -237,6 +237,7 @@ public async Task PlansAreCachedAsync()
 			}
 		}
 
+		[KnownBug("GH-2222")]
 		[Test]
 		public async Task DmlPlansAreCachedAsync()
 		{
@@ -252,9 +253,10 @@ public async Task DmlPlansAreCachedAsync()
 			{
 				await (db.Customers.Where(c => c.CustomerId == "UNKNOWN").UpdateAsync(x => new Customer {CompanyName = "Constant1"}));
 				await (db.Customers.Where(c => c.CustomerId == "ALFKI").UpdateAsync(x => new Customer {CompanyName = x.CompanyName}));
+				await (db.Customers.Where(c => c.CustomerId == "UNKNOWN").UpdateAsync(x => new Customer {ContactName = "Constant1"}));
 				Assert.That(
 					cache,
-					Has.Count.EqualTo(2),
+					Has.Count.EqualTo(3),
 					"Query plans should be cached.");
 
 				using (var spy = new LogSpy(queryPlanCacheType))
@@ -264,6 +266,7 @@ public async Task DmlPlansAreCachedAsync()
 					{
 						await (db.Customers.Where(c => c.CustomerId == "ANATR").UpdateAsync(x => new Customer {CompanyName = x.CompanyName}));
 						await (db.Customers.Where(c => c.CustomerId == "UNKNOWN").UpdateAsync(x => new Customer {CompanyName = "Constant2"}));
+						await (db.Customers.Where(c => c.CustomerId == "UNKNOWN").UpdateAsync(x => new Customer {ContactName = "Constant2"}));
 
 						var sqlEvents = sqlSpy.Appender.GetEvents();
 						Assert.That(
@@ -272,19 +275,25 @@ public async Task DmlPlansAreCachedAsync()
 							"Unexpected constant parameter value");
 						Assert.That(
 							sqlEvents[1].RenderedMessage,
-							Does.Contain("UNKNOWN").And.Contain("Constant2").And.Not.Contain("Constant1"),
+							Does.Contain("UNKNOWN").And.Contain("Constant2").And.Contain("CompanyName").IgnoreCase
+								.And.Not.Contain("Constant1"),
+							"Unexpected constant parameter value");
+						Assert.That(
+							sqlEvents[1].RenderedMessage,
+							Does.Contain("UNKNOWN").And.Contain("Constant2").And.Contain("ContactName").IgnoreCase
+								.And.Not.Contain("Constant1"),
 							"Unexpected constant parameter value");
 					}
 
-					Assert.That(cache, Has.Count.EqualTo(2), "Additional queries should not cause a plan to be cached.");
+					Assert.That(cache, Has.Count.EqualTo(3), "Additional queries should not cause a plan to be cached.");
 					Assert.That(
 						spy.GetWholeLog(),
 						Does
 							.Contain("located HQL query plan in cache")
 							.And.Not.Contain("unable to locate HQL query plan in cache"));
 
 					await (db.Customers.Where(c => c.CustomerId == "ANATR").UpdateAsync(x => new Customer {ContactName = x.ContactName}));
-					Assert.That(cache, Has.Count.EqualTo(3), "Query should be cached");
+					Assert.That(cache, Has.Count.EqualTo(4), "Query should be cached");
 				}
 			}
 		}

src/NHibernate.Test/Linq/ConstantTest.cs

@@ -258,6 +258,7 @@ public void PlansAreCached()
 			}
 		}
 
+		[KnownBug("GH-2222")]
 		[Test]
 		public void DmlPlansAreCached()
 		{
@@ -273,9 +274,10 @@ public void DmlPlansAreCached()
 			{
 				db.Customers.Where(c => c.CustomerId == "UNKNOWN").Update(x => new Customer {CompanyName = "Constant1"});
 				db.Customers.Where(c => c.CustomerId == "ALFKI").Update(x => new Customer {CompanyName = x.CompanyName});
+				db.Customers.Where(c => c.CustomerId == "UNKNOWN").Update(x => new Customer {ContactName = "Constant1"});
 				Assert.That(
 					cache,
-					Has.Count.EqualTo(2),
+					Has.Count.EqualTo(3),
 					"Query plans should be cached.");
 
 				using (var spy = new LogSpy(queryPlanCacheType))
@@ -285,6 +287,7 @@ public void DmlPlansAreCached()
 					{
 						db.Customers.Where(c => c.CustomerId == "ANATR").Update(x => new Customer {CompanyName = x.CompanyName});
 						db.Customers.Where(c => c.CustomerId == "UNKNOWN").Update(x => new Customer {CompanyName = "Constant2"});
+						db.Customers.Where(c => c.CustomerId == "UNKNOWN").Update(x => new Customer {ContactName = "Constant2"});
 
 						var sqlEvents = sqlSpy.Appender.GetEvents();
 						Assert.That(
@@ -293,19 +296,25 @@ public void DmlPlansAreCached()
 							"Unexpected constant parameter value");
 						Assert.That(
 							sqlEvents[1].RenderedMessage,
-							Does.Contain("UNKNOWN").And.Contain("Constant2").And.Not.Contain("Constant1"),
+							Does.Contain("UNKNOWN").And.Contain("Constant2").And.Contain("CompanyName").IgnoreCase
+								.And.Not.Contain("Constant1"),
+							"Unexpected constant parameter value");
+						Assert.That(
+							sqlEvents[1].RenderedMessage,
+							Does.Contain("UNKNOWN").And.Contain("Constant2").And.Contain("ContactName").IgnoreCase
+								.And.Not.Contain("Constant1"),
 							"Unexpected constant parameter value");
 					}
 
-					Assert.That(cache, Has.Count.EqualTo(2), "Additional queries should not cause a plan to be cached.");
+					Assert.That(cache, Has.Count.EqualTo(3), "Additional queries should not cause a plan to be cached.");
 					Assert.That(
 						spy.GetWholeLog(),
 						Does
 							.Contain("located HQL query plan in cache")
 							.And.Not.Contain("unable to locate HQL query plan in cache"));
 
 					db.Customers.Where(c => c.CustomerId == "ANATR").Update(x => new Customer {ContactName = x.ContactName});
-					Assert.That(cache, Has.Count.EqualTo(3), "Query should be cached");
+					Assert.That(cache, Has.Count.EqualTo(4), "Query should be cached");
 				}
 			}
 		}