Implement SurrogateSelector (#1693)

- Supports System.Type, System.Reflection.MemberInfo and System.Delegate

Closes #1652

Author: hazzik

src/NHibernate.Test/Async/CfgTest/ConfigurationSerializationTests.cs

@@ -16,6 +16,7 @@
 using NHibernate.Driver;
 using NHibernate.Engine;
 using NHibernate.Tool.hbm2ddl;
+using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.CfgTest
@@ -28,8 +29,6 @@ public class ConfigurationSerializationTestsAsync
 		[Test]
 		public async Task Basic_CRUD_should_workAsync()
 		{
-			TestsContext.AssumeSystemTypeIsSerializable();
-
 			Assembly assembly = Assembly.Load("NHibernate.DomainModel");
 			var cfg = new Configuration();
 			if (TestConfigurationHelper.hibernateConfigFile != null)
@@ -38,7 +37,12 @@ public async Task Basic_CRUD_should_workAsync()
 			}
 			cfg.AddResource("NHibernate.DomainModel.ParentChild.hbm.xml", assembly);
 
-			var formatter = new BinaryFormatter();
+			var formatter = new BinaryFormatter
+			{
+#if !NETFX
+				SurrogateSelector = new SerializationHelper.SurrogateSelector()	
+#endif
+			};
 			var memoryStream = new MemoryStream();
 			formatter.Serialize(memoryStream, cfg);
 			memoryStream.Position = 0;

src/NHibernate.Test/Async/ConnectionTest/AggressiveReleaseTest.cs

@@ -58,8 +58,6 @@ protected override void Done()
 		[Test]
 		public async Task SerializationOnAfterStatementAggressiveReleaseAsync()
 		{
-			TestsContext.AssumeSystemTypeIsSerializable();
-
 			Prepare();
 			ISession s = GetSessionUnderTest();
 			Silly silly = new Silly("silly");
@@ -81,8 +79,6 @@ public async Task SerializationOnAfterStatementAggressiveReleaseAsync()
 		[Test]
 		public async Task SerializationFailsOnAfterStatementAggressiveReleaseWithOpenResourcesAsync()
 		{
-			TestsContext.AssumeSystemTypeIsSerializable();
-
 			Prepare();
 			ISession s = GetSessionUnderTest();
 

src/NHibernate.Test/Async/Criteria/CriteriaQueryTest.cs

@@ -475,8 +475,6 @@ public async Task CloningCriteria_AddCount_RemoveOrderingAsync()
 		[Test]
 		public async Task DetachedCriteriaTestAsync()
 		{
-			TestsContext.AssumeSystemTypeIsSerializable();
-
 			DetachedCriteria dc = DetachedCriteria.For(typeof(Student))
 				.Add(Property.ForName("Name").Eq("Gavin King"))
 				.AddOrder(Order.Asc("StudentNumber"))

src/NHibernate.Test/Async/Criteria/DetachedCriteriaSerializable.cs

@@ -50,8 +50,6 @@ public Task DetachedCriteriaItSelfAsync()
 		{
 			try
 			{
-				TestsContext.AssumeSystemTypeIsSerializable();
-
 				DetachedCriteria dc = DetachedCriteria.For(typeof(Student))
 				.Add(Expression.Eq("Name", "Gavin King"));
 				return SerializeAndListAsync(dc);
@@ -65,8 +63,6 @@ public Task DetachedCriteriaItSelfAsync()
 		[Test]
 		public async Task ExecutableCriteriaAsync()
 		{
-			TestsContext.AssumeSystemTypeIsSerializable();
-
 			// All query below don't have sense, are only to test if all needed classes are serializable
 
 			// Basic criterion

src/NHibernate.Test/Async/DynamicProxyTests/InterfaceProxySerializationTests/ProxyFixture.cs

@@ -13,6 +13,7 @@
 using System.IO;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
+using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.DynamicProxyTests.InterfaceProxySerializationTests
@@ -36,7 +37,12 @@ private void SerializeAndDeserialize(ref ISession s)
 			// Serialize the session
 			using (Stream stream = new MemoryStream())
 			{
-				IFormatter formatter = new BinaryFormatter();
+				var formatter = new BinaryFormatter
+				{
+#if !NETFX
+					SurrogateSelector = new SerializationHelper.SurrogateSelector()	
+#endif
+				};
 				formatter.Serialize(stream, s);
 
 				// Close the original session
@@ -106,8 +112,6 @@ public async Task ProxyAsync()
 		[Test]
 		public async Task ProxySerializeAsync()
 		{
-			TestsContext.AssumeSystemTypeIsSerializable();
-
 			ISession s = OpenSession();
 			IMyProxy ap = new MyProxyImpl {Id = 1, Name = "first proxy"};
 			await (s.SaveAsync(ap));
@@ -139,8 +143,6 @@ public async Task ProxySerializeAsync()
 		[Test]
 		public async Task SerializeNotFoundProxyAsync()
 		{
-			TestsContext.AssumeSystemTypeIsSerializable();
-
 			ISession s = OpenSession();
 			// this does not actually exists in db
 			var notThere = (IMyProxy) await (s.LoadAsync(typeof (MyProxyImpl), 5));

src/NHibernate.Test/Async/Legacy/FooBarTest.cs

@@ -2644,8 +2644,6 @@ public async Task NewFlushingAsync()
 		[Test]
 		public async Task PersistCollectionsAsync()
 		{
-			TestsContext.AssumeSystemTypeIsSerializable();
-
 			ISession s = OpenSession();
 			ITransaction txn = s.BeginTransaction();
 			IEnumerator enumer = (await (s.CreateQuery("select count(*) from b in class Bar").EnumerableAsync())).GetEnumerator();
@@ -2843,7 +2841,20 @@ public async Task PersistCollectionsAsync()
 
 			// serialize and then deserialize the session.
 			Stream stream = new MemoryStream();
-			IFormatter formatter = new BinaryFormatter();
+#if NETFX
+			var formatter = new BinaryFormatter();
+#else
+			var selector = new SurrogateSelector();
+			selector.AddSurrogate(
+				typeof(CultureInfo),
+				new StreamingContext(StreamingContextStates.All),
+				new CultureInfoSerializationSurrogate());
+			selector.ChainSelector(new SerializationHelper.SurrogateSelector());
+			var formatter = new BinaryFormatter
+			{
+				SurrogateSelector = selector
+			};
+#endif
 			formatter.Serialize(stream, s);
 
 			s.Close();
@@ -4659,8 +4670,6 @@ public async Task SaveDeleteAsync()
 		[Test]
 		public async Task ProxyArrayAsync()
 		{
-			TestsContext.AssumeSystemTypeIsSerializable();
-
 			ISession s = OpenSession();
 			GlarchProxy g = new Glarch();
 			Glarch g1 = new Glarch();
@@ -4697,7 +4706,12 @@ public async Task ProxyArrayAsync()
 
 			// serialize the session.
 			Stream stream = new MemoryStream();
-			IFormatter formatter = new BinaryFormatter();
+			var formatter = new BinaryFormatter()
+			{
+#if !NETFX
+				SurrogateSelector = new SerializationHelper.SurrogateSelector()	
+#endif
+			};
 			formatter.Serialize(stream, s);
 
 			// close the original session

src/NHibernate.Test/Async/Legacy/FumTest.cs

@@ -16,6 +16,7 @@
 using NHibernate.DomainModel;
 using NHibernate.Criterion;
 using NHibernate.Type;
+using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.Legacy
@@ -718,7 +719,12 @@ public async Task UnflushedSessionSerializationAsync()
 
 		private ISession SpoofSerialization(ISession session)
 		{
-			BinaryFormatter formatter = new BinaryFormatter();
+			var formatter = new BinaryFormatter
+			{
+#if !NETFX
+				SurrogateSelector = new SerializationHelper.SurrogateSelector()	
+#endif
+			};
 			MemoryStream stream = new MemoryStream();
 			formatter.Serialize(stream, session);
 

src/NHibernate.Test/Async/Legacy/MasterDetailTest.cs

@@ -18,6 +18,7 @@
 using NHibernate.Engine;
 using NHibernate.Criterion;
 using NHibernate.Mapping;
+using NHibernate.Util;
 using NUnit.Framework;
 using Single=NHibernate.DomainModel.Single;
 
@@ -643,8 +644,6 @@ public async Task NamedQueryAsync()
 		[Test]
 		public async Task SerializationAsync()
 		{
-			TestsContext.AssumeSystemTypeIsSerializable();
-
 			ISession s = OpenSession();
 			Master m = new Master();
 			Detail d1 = new Detail();
@@ -665,7 +664,12 @@ public async Task SerializationAsync()
 			await (s.FlushAsync());
 			s.Disconnect();
 			MemoryStream stream = new MemoryStream();
-			BinaryFormatter f = new BinaryFormatter();
+			var f = new BinaryFormatter
+			{
+#if !NETFX
+				SurrogateSelector = new SerializationHelper.SurrogateSelector()	
+#endif
+			};
 			f.Serialize(stream, s);
 			s.Close();
 			stream.Position = 0;

src/NHibernate.Test/Async/NHSpecificTest/Dates/DateTimeOffsetFixture.cs

@@ -16,6 +16,7 @@
 using System.Xml.Serialization;
 using NHibernate.Driver;
 using NHibernate.Type;
+using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.NHSpecificTest.Dates

src/NHibernate.Test/Async/NHSpecificTest/NH2773/Fixture.cs

@@ -11,6 +11,7 @@
 using System;
 using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
+using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.NHSpecificTest.NH2773 {
@@ -50,9 +51,7 @@ protected override void OnTearDown() {
       [Test]
       public async Task DeserializedSession_ProxyType_ShouldBeEqualToOriginalProxyTypeAsync()
       {
-         TestsContext.AssumeSystemTypeIsSerializable();
-
-         System.Type originalProxyType = null;
+	      System.Type originalProxyType = null;
          System.Type deserializedProxyType = null;
          ISession deserializedSession = null;
 
@@ -64,8 +63,14 @@ public async Task DeserializedSession_ProxyType_ShouldBeEqualToOriginalProxyType
             }
 
 
-            using (MemoryStream sessionMemoryStream = new MemoryStream()) {
-               BinaryFormatter formatter = new BinaryFormatter();
+            using (MemoryStream sessionMemoryStream = new MemoryStream())
+            {
+               var formatter = new BinaryFormatter
+               {
+#if !NETFX
+	               SurrogateSelector = new SerializationHelper.SurrogateSelector()	
+#endif
+               };
                formatter.Serialize(sessionMemoryStream, session);
 
                sessionMemoryStream.Seek(0, SeekOrigin.Begin);