NH-3850 - Amending test cases for polymorphic Linq query results aggregators failures: acknowledging cases which will not be fixed.

Author: fredericDelaporte

src/NHibernate.Test/Linq/ByMethod/SumTests.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using NUnit.Framework;
 
 namespace NHibernate.Test.Linq.ByMethod
@@ -14,7 +15,10 @@ public void EmptySumDecimal()
 				{
 					db.OrderLines.Where(ol => false).Sum(ol => ol.Discount);
 				},
-				Throws.InstanceOf<HibernateException>());
+				// Before NH-3850
+				Throws.InstanceOf<HibernateException>()
+				// After NH-3850
+				.Or.InstanceOf<InvalidOperationException>());
 		}
 
 		[Test]

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

@@ -1,7 +1,10 @@
 using System;
+using System.Collections.Generic;
+using System.Diagnostics;
 using System.Data;
 using System.Diagnostics;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using NHibernate.Dialect;
 using NHibernate.Driver;
@@ -395,14 +398,14 @@ public void AnyObject()
 		}
 
 		// Failing case till NH-3850 is fixed
-		[Test]
+		[Test, Ignore("Won't fix: requires reshaping the query")]
 		public void AverageBBase()
 		{
 			Average<DomainClassBExtendedByA>(1.5m);
 		}
 
-		// Non-reg case
-		[Test]
+		// Failing case till NH-3850 is fixed
+		[Test, Ignore("Won't fix: requires reshaping the query")]
 		public void AverageCBase()
 		{
 			Average<DomainClassCExtendedByD>(1.5m);
@@ -423,7 +426,7 @@ public void AverageF()
 		}
 
 		// Failing case till NH-3850 is fixed
-		[Test]
+		[Test, Ignore("Won't fix: requires reshaping the query")]
 		public void AverageGBase()
 		{
 			Average<DomainClassGExtendedByH>(2.5m);
@@ -452,14 +455,17 @@ private void Average<DC>(decimal? expectedResult) where DC : DomainClassBase
 				else
 				{
 					Assert.That(() => { dcQuery.Average(dc => dc.NonNullableDecimal); },
-						Throws.InnerException.InstanceOf<ArgumentNullException>(),
+						// After fix
+						Throws.InstanceOf<InvalidOperationException>()
+						// Before fix
+						.Or.InnerException.InstanceOf<ArgumentNullException>(),
 						"Non nullable decimal average has failed");
 				}
 			}
 		}
 
 		// Failing case till NH-3850 is fixed
-		[Test]
+		[Test, Ignore("Won't fix: requires reshaping the query")]
 		public void AverageObject()
 		{
 			using (var session = OpenSession())
@@ -945,7 +951,10 @@ private void Max<DC>(int? expectedResult) where DC : DomainClassBase
 				else
 				{
 					Assert.That(() => { dcQuery.Max(dc => dc.NonNullableDecimal); },
-						Throws.InnerException.InstanceOf<ArgumentNullException>(),
+						// After fix
+						Throws.InstanceOf<InvalidOperationException>()
+						// Before fix
+						.Or.InnerException.InstanceOf<ArgumentNullException>(),
 						"Non nullable decimal max has failed");
 				}
 			}
@@ -1026,7 +1035,10 @@ private void Min<DC>(int? expectedResult) where DC : DomainClassBase
 				else
 				{
 					Assert.That(() => { dcQuery.Min(dc => dc.NonNullableDecimal); },
-						Throws.InnerException.InstanceOf<ArgumentNullException>(),
+						// After fix
+						Throws.InstanceOf<InvalidOperationException>()
+						// Before fix
+						.Or.InnerException.InstanceOf<ArgumentNullException>(),
 						"Non nullable decimal min has failed");
 				}
 			}
@@ -1246,10 +1258,77 @@ private void Sum<DC>(int? expectedResult) where DC : DomainClassBase
 				else
 				{
 					Assert.That(() => { dcQuery.Sum(dc => dc.NonNullableDecimal); },
-						Throws.InnerException.InstanceOf<ArgumentNullException>(),
+						// After fix
+						Throws.InstanceOf<InvalidOperationException>()
+						// Before fix
+						.Or.InnerException.InstanceOf<ArgumentNullException>(),
 						"Non nullable decimal sum has failed");
 				}
 			}
 		}
+
+		[Test]
+		public void BadOverload()
+		{
+			var sumMethodTemplate = ReflectHelper.GetMethod(() => Queryable.Sum((IQueryable<int>)null));
+			Assert.Throws<InvalidOperationException>(() =>
+			{
+				ReflectHelper.GetMethodOverload(sumMethodTemplate, typeof(object));
+			});
+		}
+		
+		[Test, Explicit("Just a blunt perf comparison among some candidate overload reflection patterns, one being required for NH-3850")]
+		public void OverloadReflectionBluntPerfCompare()
+		{
+			var sumMethodTemplate = ReflectHelper.GetMethod(() => Queryable.Sum((IQueryable<int>)null));
+
+			var swNoSameParamsCheck = new Stopwatch();
+			swNoSameParamsCheck.Start();
+			for (var i = 0; i < 1000; i++)
+			{
+				var sumMethod = sumMethodTemplate.DeclaringType.GetMethod(sumMethodTemplate.Name,
+					(sumMethodTemplate.IsStatic ? BindingFlags.Static : BindingFlags.Instance) | BindingFlags.Public,
+					null, new[] { typeof(IQueryable<decimal>) }, null);
+				Trace.TraceInformation(sumMethod.ToString());
+			}
+			swNoSameParamsCheck.Stop();
+			
+			var swCurrentChoiceSameType = new Stopwatch();
+			swCurrentChoiceSameType.Start();
+			for (var i = 0; i < 1000; i++)
+			{
+				var sumMethod = ReflectHelper.GetMethodOverload(sumMethodTemplate, typeof(IQueryable<int>));
+				Trace.TraceInformation(sumMethod.ToString());
+			}
+			swCurrentChoiceSameType.Stop();
+
+			var swCurrentChoice = new Stopwatch();
+			swCurrentChoice.Start();
+			for (var i = 0; i < 1000; i++)
+			{
+				var sumMethod = ReflectHelper.GetMethodOverload(sumMethodTemplate, typeof(IQueryable<long>));
+				Trace.TraceInformation(sumMethod.ToString());
+			}
+			swCurrentChoice.Stop();
+
+			var swEnHlp = new Stopwatch();
+			swEnHlp.Start();
+			for (var i = 0; i < 1000; i++)
+			{
+				// Testing the obsolete helper perf. Disable obsolete warning. Remove this swEnHlp part of the test if this helper is to be removed.
+#pragma warning disable 0618
+				var sumMethod = EnumerableHelper.GetMethod("Sum", new[] { typeof(IEnumerable<int>) });
+#pragma warning restore 0618
+				Trace.TraceInformation(sumMethod.ToString());
+			}
+			swEnHlp.Stop();
+
+			Assert.Pass(@"Blunt perf timings:
+Direct reflection: {0}
+Current impl, same overload: {1}
+Current impl, other overload: {2}
+EnumerableHelper.GetMethod(non generic overload): {3}",
+				swNoSameParamsCheck.Elapsed, swCurrentChoiceSameType.Elapsed, swCurrentChoice.Elapsed, swEnHlp.Elapsed);
+		}
 	}
 }