LazyFieldInterceptorTests: Rename existing test fixture and bring over the related NH3500 test case.

Author: oskarb

src/NHibernate.Test/DynamicProxyTests/LazyFieldInterceptorSerializable.cs renamed to src/NHibernate.Test/DynamicProxyTests/LazyFieldInterceptorTests.cs

@@ -6,12 +6,18 @@
 
 namespace NHibernate.Test.DynamicProxyTests
 {
-	public class LazyFieldInterceptorSerializable
+	public class LazyFieldInterceptorTests
 	{
 		[Serializable]
 		public class MyClass
 		{
 			public virtual int Id { get; set; }
+
+			public virtual void ThrowError()
+			{
+				// Use some specific exception type to avoid using the base class.
+				throw new FormatException("test");
+			}
 		}
 
 		[Test]
@@ -31,5 +37,16 @@ public void LazyFieldInterceptorIsBinarySerializable()
 
 			Assert.That(fieldInterceptionProxy, Is.BinarySerializable);
 		}
+
+
+		[Test]
+		public void DefaultDynamicLazyFieldInterceptorUnWrapsTIEExceptions()
+		{
+			var pf = new DefaultProxyFactory();
+			var propertyInfo = typeof(MyClass).GetProperty("Id");
+			pf.PostInstantiate("MyClass", typeof(MyClass), new HashSet<System.Type>(), propertyInfo.GetGetMethod(), propertyInfo.GetSetMethod(), null);
+			var myClassProxied = (MyClass)pf.GetFieldInterceptionProxy(new MyClass());
+			Assert.Throws<FormatException>(() => myClassProxied.ThrowError(), "test");
+		}
 	}
-}
+}

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

@@ -258,7 +258,7 @@
     <Compile Include="DynamicProxyTests\InterfaceProxySerializationTests\MyProxyImpl.cs" />
     <Compile Include="DynamicProxyTests\InterfaceProxySerializationTests\ProxyFixture.cs" />
     <Compile Include="DynamicProxyTests\InterfaceWithEqualsGethashcodeTests.cs" />
-    <Compile Include="DynamicProxyTests\LazyFieldInterceptorSerializable.cs" />
+    <Compile Include="DynamicProxyTests\LazyFieldInterceptorTests.cs" />
     <Compile Include="DynamicProxyTests\PassThroughInterceptor.cs" />
     <Compile Include="DynamicProxyTests\PeVerifier.cs" />
     <Compile Include="DynamicProxyTests\ProxiedMembers\Fixture.cs" />
@@ -731,7 +731,6 @@
     <Compile Include="NHSpecificTest\NH2931\Models.cs" />
     <Compile Include="NHSpecificTest\NH3046\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3046\Model.cs" />
-    <Compile Include="NHSpecificTest\NH3500\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3518\ClassWithXmlMember.cs" />
     <Compile Include="NHSpecificTest\NH3518\XmlColumnTest.cs" />
     <Compile Include="NHSpecificTest\NH3609\MappingEntity.cs" />