NH-4018 - Option for enlisting in system transaction.

Author: fredericDelaporte

src/NHibernate.Test/Async/DynamicProxyTests/PeVerifier.cs

@@ -0,0 +1,51 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using NUnit.Framework;
+
+namespace NHibernate.Test.DynamicProxyTests
+{
+	using System.Threading.Tasks;
+	
+	/// <content>
+	/// Contains generated async methods
+	/// </content>
+
+	public partial class PeVerifier
+	{
+
+		public async Task AssertIsValidAsync()
+		{
+			var process = new Process
+			{
+				StartInfo =
+				{
+					FileName = _peVerifyPath,
+					RedirectStandardOutput = true,
+					UseShellExecute = false,
+					Arguments = "\"" + _assemlyLocation + "\" /VERBOSE",
+					CreateNoWindow = true
+				}
+			};
+
+			process.Start();
+			var processOutput = await (process.StandardOutput.ReadToEndAsync());
+			process.WaitForExit();
+
+			var result = process.ExitCode + " code ";
+
+			if (process.ExitCode != 0)
+				Assert.Fail("PeVerify reported error(s): " + Environment.NewLine + processOutput, result);
+		}
+	}
+}

src/NHibernate.Test/Async/DynamicProxyTests/PeVerifyFixture.cs

@@ -0,0 +1,133 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using System;
+using System.IO;
+using System.Reflection;
+using System.Reflection.Emit;
+using NUnit.Framework;
+using NHibernate.Proxy.DynamicProxy;
+
+namespace NHibernate.Test.DynamicProxyTests
+{
+	using System.Threading.Tasks;
+	[TestFixture]
+	public class PeVerifyFixtureAsync
+	{
+		private static bool wasCalled;
+
+		private const string assemblyName = "peVerifyAssembly";
+		private const string assemblyFileName = "peVerifyAssembly.dll";
+
+		[Test]
+		public Task VerifyClassWithPublicConstructorAsync()
+		{
+			try
+			{
+				var factory = new ProxyFactory(new SavingProxyAssemblyBuilder(assemblyName));
+				var proxyType = factory.CreateProxyType(typeof(ClassWithPublicDefaultConstructor), null);
+
+				wasCalled = false;
+				Activator.CreateInstance(proxyType);
+
+				Assert.That(wasCalled);
+				return new PeVerifier(assemblyFileName).AssertIsValidAsync();
+			}
+			catch (Exception ex)
+			{
+				return Task.FromException<object>(ex);
+			}
+		}
+
+		[Test]
+		public Task VerifyClassWithProtectedConstructorAsync()
+		{
+			try
+			{
+				var factory = new ProxyFactory(new SavingProxyAssemblyBuilder(assemblyName));
+				var proxyType = factory.CreateProxyType(typeof(ClassWithProtectedDefaultConstructor), null);
+
+				wasCalled = false;
+				Activator.CreateInstance(proxyType);
+
+				Assert.That(wasCalled);
+				return new PeVerifier(assemblyFileName).AssertIsValidAsync();
+			}
+			catch (Exception ex)
+			{
+				return Task.FromException<object>(ex);
+			}
+		}
+
+		#region PeVerifyTypes
+
+		public class ClassWithPublicDefaultConstructor
+		{
+			public ClassWithPublicDefaultConstructor() { InitG<int>(1); }
+			public ClassWithPublicDefaultConstructor(int unused) { }
+			public virtual int Prop1 { get; set; }
+			public virtual void InitG<T>(T value) { Init((int)(object)value); }
+			public virtual void Init(int value) { Prop1 = value; if (Prop1 == 1) wasCalled = true; }
+		}
+
+		public class ClassWithProtectedDefaultConstructor
+		{
+			protected ClassWithProtectedDefaultConstructor() { wasCalled = true; }
+		}
+
+		public class ClassWithPrivateDefaultConstructor
+		{
+			private ClassWithPrivateDefaultConstructor() { wasCalled = true; }
+		}
+
+		public class ClassWithNoDefaultConstructor
+		{
+			public ClassWithNoDefaultConstructor(int unused) { wasCalled = true; }
+			public ClassWithNoDefaultConstructor(string unused) { wasCalled = true; }
+		}
+
+		public class ClassWithInternalConstructor
+		{
+			internal ClassWithInternalConstructor() { wasCalled = true; }
+		}
+
+		#endregion
+
+		#region ProxyFactory.IProxyAssemblyBuilder
+
+		public class SavingProxyAssemblyBuilder : IProxyAssemblyBuilder
+		{
+			private string assemblyName;
+
+			public SavingProxyAssemblyBuilder(string assemblyName)
+			{
+				this.assemblyName = assemblyName;
+			}
+
+			public AssemblyBuilder DefineDynamicAssembly(AppDomain appDomain, AssemblyName name)
+			{
+				AssemblyBuilderAccess access = AssemblyBuilderAccess.RunAndSave;
+				return appDomain.DefineDynamicAssembly(new AssemblyName(assemblyName), access, TestContext.CurrentContext.TestDirectory);
+			}
+
+			public ModuleBuilder DefineDynamicModule(AssemblyBuilder assemblyBuilder, string moduleName)
+			{
+				return assemblyBuilder.DefineDynamicModule(moduleName, string.Format("{0}.mod", assemblyName), true);
+			}
+
+			public void Save(AssemblyBuilder assemblyBuilder)
+			{
+				assemblyBuilder.Save(assemblyName + ".dll");
+			}
+		}
+
+		#endregion
+	}
+}

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

@@ -100,10 +100,11 @@ public async Task When_commiting_items_in_DTC_transaction_will_add_items_to_2nd_
 				//closing the connection to ensure we can't really use it.
 				var connection = await (Sfi.ConnectionProvider.GetConnectionAsync(CancellationToken.None));
 				Sfi.ConnectionProvider.CloseConnection(connection);
+
 				// The session is supposed to succeed because the second level cache should have the
 				// entity to load, allowing the session to not use the connection at all.
-				// Will fail if transaction manager tries to enlist user supplied connection, due
-				// to using a transaction scope below.
+				// Will fail if a transaction manager tries to enlist user supplied connection. Do
+				// not add a transaction scope below.
 				using (var s = Sfi.WithOptions().Connection(connection).OpenSession())
 				{
 					Nums nums = null;

src/NHibernate.Test/Async/SessionBuilder/Fixture.cs

@@ -24,7 +24,7 @@ public class FixtureAsync : TestCase
 	{
 		protected override string MappingsAssembly => "NHibernate.Test";
 
-		protected override IList Mappings => new [] { "SessionBuilder.Mappings.hbm.xml" };
+		protected override IList Mappings => new[] { "SessionBuilder.Mappings.hbm.xml" };
 
 		protected override void Configure(Configuration configuration)
 		{
@@ -37,12 +37,23 @@ private void CanSetAutoClose<T>(T sb) where T : ISessionBuilder<T>
 			var options = DebugSessionFactory.GetCreationOptions(sb);
 			CanSet(sb, sb.AutoClose, () => options.ShouldAutoClose,
 				sb is ISharedSessionBuilder ssb ? ssb.AutoClose : default(Func<ISharedSessionBuilder>),
-				// initial values
+				// initial value
 				false,
 				// values
 				true, false);
 		}
 
+		private void CanSetAutoJoinTransaction<T>(T sb) where T : ISessionBuilder<T>
+		{
+			var options = DebugSessionFactory.GetCreationOptions(sb);
+			CanSet(sb, sb.AutoJoinTransaction, () => options.ShouldAutoJoinTransaction,
+				sb is ISharedSessionBuilder ssb ? ssb.AutoJoinTransaction : default(Func<ISharedSessionBuilder>),
+				// initial value
+				true,
+				// values
+				false, true);
+		}
+
 		[Test]
 		public async Task CanSetConnectionAsync()
 		{
@@ -127,7 +138,7 @@ private void CanSetConnectionReleaseMode<T>(T sb) where T : ISessionBuilder<T>
 			var options = DebugSessionFactory.GetCreationOptions(sb);
 			CanSet(sb, sb.ConnectionReleaseMode, () => options.SessionConnectionReleaseMode,
 				sb is ISharedSessionBuilder ssb ? ssb.ConnectionReleaseMode : default(Func<ISharedSessionBuilder>),
-				// initial values
+				// initial value
 				Sfi.Settings.ConnectionReleaseMode,
 				// values
 				ConnectionReleaseMode.OnClose, ConnectionReleaseMode.AfterStatement, ConnectionReleaseMode.AfterTransaction);
@@ -138,7 +149,7 @@ private void CanSetFlushMode<T>(T sb) where T : ISessionBuilder<T>
 			var options = DebugSessionFactory.GetCreationOptions(sb);
 			CanSet(sb, sb.FlushMode, () => options.InitialSessionFlushMode,
 				sb is ISharedSessionBuilder ssb ? ssb.FlushMode : default(Func<ISharedSessionBuilder>),
-				// initial values
+				// initial value
 				Sfi.Settings.DefaultFlushMode,
 				// values
 				FlushMode.Always, FlushMode.Auto, FlushMode.Commit, FlushMode.Manual);

src/NHibernate.Test/Async/SystemTransactions/TransactionNotificationFixture.cs

@@ -8,23 +8,19 @@
 //------------------------------------------------------------------------------
 
 
-using System;
 using System.Collections;
-using System.Data.Common;
-using System.Threading;
 using System.Transactions;
 using NUnit.Framework;
 
 namespace NHibernate.Test.SystemTransactions
 {
 	using System.Threading.Tasks;
+	using System.Threading;
 	[TestFixture]
 	public class TransactionNotificationFixtureAsync : TestCase
 	{
 		protected override IList Mappings
-		{
-			get { return new string[] {}; }
-		}
+			=> new string[] { };
 
 		[Test]
 		public async Task TwoTransactionScopesInsideOneSessionAsync()

src/NHibernate.Test/DebugSessionFactory.cs

@@ -441,6 +441,12 @@ ISessionBuilder ISessionBuilder<ISessionBuilder>.AutoClose(bool autoClose)
 				return this;
 			}
 
+			ISessionBuilder ISessionBuilder<ISessionBuilder>.AutoJoinTransaction(bool autoJoinTransaction)
+			{
+				_actualBuilder.AutoJoinTransaction(autoJoinTransaction);
+				return this;
+			}
+
 			ISessionBuilder ISessionBuilder<ISessionBuilder>.FlushMode(FlushMode flushMode)
 			{
 				_actualBuilder.FlushMode(flushMode);
@@ -478,6 +484,12 @@ IStatelessSessionBuilder IStatelessSessionBuilder.Connection(DbConnection connec
 				return this;
 			}
 
+			IStatelessSessionBuilder IStatelessSessionBuilder.AutoJoinTransaction(bool autoJoinTransaction)
+			{
+				_actualBuilder.AutoJoinTransaction(autoJoinTransaction);
+				return this;
+			}
+
 			#endregion
 		}
 	}

src/NHibernate.Test/DynamicProxyTests/PeVerifier.cs

@@ -7,7 +7,7 @@ namespace NHibernate.Test.DynamicProxyTests
 {
 	// utility class to run PEVerify.exe against a saved-to-disk assembly, similar to:
 	// http://stackoverflow.com/questions/7290893/is-there-an-api-for-verifying-the-msil-of-a-dynamic-assembly-at-runtime
-	public class PeVerifier
+	public partial class PeVerifier
 	{
 		private string _assemlyLocation;
 		private string _peVerifyPath;

src/NHibernate.Test/NHSpecificTest/NH1054/DummyTransactionFactory.cs

@@ -22,6 +22,11 @@ public void EnlistInSystemTransactionIfNeeded(ISessionImplementor session)
 			throw new NotImplementedException();
 		}
 
+		public void ExplicitJoinSystemTransaction(ISessionImplementor session)
+		{
+			throw new NotImplementedException();
+		}
+
 		public bool IsInActiveSystemTransaction(ISessionImplementor session)
 		{
 			return false;

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

@@ -105,10 +105,11 @@ public void When_commiting_items_in_DTC_transaction_will_add_items_to_2nd_level_
 				//closing the connection to ensure we can't really use it.
 				var connection = Sfi.ConnectionProvider.GetConnection();
 				Sfi.ConnectionProvider.CloseConnection(connection);
+
 				// The session is supposed to succeed because the second level cache should have the
 				// entity to load, allowing the session to not use the connection at all.
-				// Will fail if transaction manager tries to enlist user supplied connection, due
-				// to using a transaction scope below.
+				// Will fail if a transaction manager tries to enlist user supplied connection. Do
+				// not add a transaction scope below.
 				using (var s = Sfi.WithOptions().Connection(connection).OpenSession())
 				{
 					Nums nums = null;