NH-3260 - Add more tests.

Author: hazzik

src/NHibernate.Test/DynamicProxyTests/GenericMethodsTests/GenericMethodShouldBeProxied.cs

@@ -184,6 +184,38 @@ public void CanProxySelfCastingMethodWithGenericInterfaceBaseConstaint4()
 			c.AsInterfaceBase4<MyGenericClass<int>>().Should().Not.Be.Null();
 		}
 
+		[Test]
+		public void CanProxySelfCastingMethodWithGenericConstaint5()
+		{
+			var factory = new ProxyFactory();
+			var c = (MyGenericClass<int>)factory.CreateProxy(typeof(MyGenericClass<int>), new PassThroughInterceptor(new MyGenericClass<int>()), null);
+			c.As5<MyGenericClass<int>>().Should().Not.Be.Null();
+		}
+
+		[Test]
+		public void CanProxySelfCastingMethodWithGenericConstaintBase5()
+		{
+			var factory = new ProxyFactory();
+			var c = (MyGenericClass<int>)factory.CreateProxy(typeof(MyGenericClass<int>), new PassThroughInterceptor(new MyGenericClass<int>()), null);
+			c.AsBase5<MyGenericClass<int>>().Should().Not.Be.Null();
+		}
+
+		[Test]
+		public void CanProxySelfCastingMethodWithGenericInterfaceConstaint5()
+		{
+			var factory = new ProxyFactory();
+			var c = (MyGenericClass<int>)factory.CreateProxy(typeof(MyGenericClass<int>), new PassThroughInterceptor(new MyGenericClass<int>()), null);
+			c.AsInterface5<MyGenericClass<int>>().Should().Not.Be.Null();
+		}
+
+		[Test]
+		public void CanProxySelfCastingMethodWithGenericInterfaceBaseConstaint5()
+		{
+			var factory = new ProxyFactory();
+			var c = (MyGenericClass<int>)factory.CreateProxy(typeof(MyGenericClass<int>), new PassThroughInterceptor(new MyGenericClass<int>()), null);
+			c.AsInterfaceBase5<MyGenericClass<int>>().Should().Not.Be.Null();
+		}
+
 		[Test]
 		public void GenericTypeConstraint()
 		{

src/NHibernate.Test/DynamicProxyTests/GenericMethodsTests/MyGenericClass.cs

@@ -61,5 +61,25 @@ public virtual TRequestedType AsInterfaceBase<TRequestedType>() where TRequested
 		{
 			return new TRequestedType();
 		}
+
+		public override TRequestedType As5<TRequestedType>()
+		{
+			return base.As5<TRequestedType>();
+		}
+
+		public override TRequestedType AsBase5<TRequestedType>()
+		{
+			return base.AsBase5<TRequestedType>();
+		}
+
+		public override TRequestedType AsInterface5<TRequestedType>()
+		{
+			return base.AsInterface5<TRequestedType>();
+		}
+
+		public override TRequestedType AsInterfaceBase5<TRequestedType>()
+		{
+			return base.AsInterfaceBase5<TRequestedType>();
+		}
 	}
 }

src/NHibernate.Test/DynamicProxyTests/GenericMethodsTests/MyGenericClassBase.cs

@@ -7,7 +7,7 @@ public virtual TRequestedType As4<TRequestedType>() where TRequestedType : MyGen
 			return this as TRequestedType;
 		}
 
-		public virtual TRequestedType AsBase4<TRequestedType>() where TRequestedType : MyGenericClassBase<TId, int>
+		public virtual TRequestedType AsBase4<TRequestedType>() where TRequestedType : MyGenericClassBase<TId, T2>
 		{
 			return this as TRequestedType;
 		}
@@ -17,7 +17,27 @@ public virtual TRequestedType AsInterface4<TRequestedType>() where TRequestedTyp
 			return this as TRequestedType;
 		}
 
-		public virtual TRequestedType AsInterfaceBase4<TRequestedType>() where TRequestedType : class, IMyGenericInterface<TId>
+		public virtual TRequestedType AsInterfaceBase4<TRequestedType>() where TRequestedType : class, IMyGenericInterfaceBase<TId>
+		{
+			return this as TRequestedType;
+		}
+
+		public virtual TRequestedType As5<TRequestedType>() where TRequestedType : MyGenericClass<TId>
+		{
+			return this as TRequestedType;
+		}
+
+		public virtual TRequestedType AsBase5<TRequestedType>() where TRequestedType : MyGenericClassBase<TId, T2>
+		{
+			return this as TRequestedType;
+		}
+
+		public virtual TRequestedType AsInterface5<TRequestedType>() where TRequestedType : class, IMyGenericInterface<TId>
+		{
+			return this as TRequestedType;
+		}
+
+		public virtual TRequestedType AsInterfaceBase5<TRequestedType>() where TRequestedType : class, IMyGenericInterfaceBase<TId>
 		{
 			return this as TRequestedType;
 		}