Merge branch 'master' into NH-3944

Author: hazzik

src/NHibernate.Test/DebugSessionFactory.cs

@@ -2,6 +2,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Data.Common;
+using System.Linq;
 using System.Threading;
 using log4net;
 using NHibernate.Cache;
@@ -53,29 +54,41 @@ public bool CheckSessionsWereClosed()
 			var allClosed = true;
 			foreach (var session in _openedSessions)
 			{
-				if (session.IsOpen)
+				// Do not inverse, we want to close all of them.
+				allClosed = CheckSessionWasClosed(session) && allClosed;
+				// Catches only session opened from another one while sharing the connection. Those
+				// opened without sharing the connection stay un-monitored.
+				foreach (var dependentSession in session.ConnectionManager.DependentSessions.ToList())
 				{
-					if (session.TransactionContext?.ShouldCloseSessionOnDistributedTransactionCompleted ?? false)
-					{
-						// Delayed transactions not having completed and closed their sessions? Give them a chance to complete.
-						Thread.Sleep(100);
-						if (!session.IsOpen)
-						{
-							_log.Warn($"Test case had a delayed close of session {session.SessionId}.");
-							continue;
-						}
-					}
-
-					_log.Error($"Test case didn't close session {session.SessionId}, closing");
-					allClosed = false;
-					(session as ISession)?.Close();
-					(session as IStatelessSession)?.Close();
+					allClosed = CheckSessionWasClosed(dependentSession) && allClosed;
 				}
 			}
 
 			return allClosed;
 		}
 
+		private bool CheckSessionWasClosed(ISessionImplementor session)
+		{
+			if (!session.IsOpen)
+				return true;
+
+			if (session.TransactionContext?.ShouldCloseSessionOnDistributedTransactionCompleted ?? false)
+			{
+				// Delayed transactions not having completed and closed their sessions? Give them a chance to complete.
+				Thread.Sleep(100);
+				if (!session.IsOpen)
+				{
+					_log.Warn($"Test case had a delayed close of session {session.SessionId}.");
+					return true;
+				}
+			}
+
+			_log.Error($"Test case didn't close session {session.SessionId}, closing");
+			(session as ISession)?.Close();
+			(session as IStatelessSession)?.Close();
+			return false;
+		}
+
 		ISessionBuilder ISessionFactory.WithOptions()
 		{
 			return new SessionBuilder(ActualFactory.WithOptions(), this);

src/NHibernate.Test/NHibernate.Test.csproj

@@ -1467,6 +1467,8 @@
     <Compile Include="TestDialects\PostgreSQL83TestDialect.cs" />
     <Compile Include="TestDialects\SQLiteTestDialect.cs" />
     <Compile Include="Tools\hbm2ddl\SchemaExportTests\ExportToFileFixture.cs" />
+    <Compile Include="TransactionTest\Person.cs" />
+    <Compile Include="TransactionTest\TransactionFixtureBase.cs" />
     <Compile Include="TransformTests\ImplementationOfEqualityTests.cs" />
     <Compile Include="TypesTest\CharClass.cs" />
     <Compile Include="TypesTest\CharClassFixture.cs" />
@@ -3289,6 +3291,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH1291AnonExample\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="TransactionTest\Person.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2241\Mappings.hbm.xml" />
     <EmbeddedResource Include="Futures\Mappings.hbm.xml" />
     <EmbeddedResource Include="SessionBuilder\Mappings.hbm.xml" />

src/NHibernate.Test/SystemTransactions/TransactionFixture.cs

@@ -1,26 +1,23 @@
-using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
 using System.Transactions;
-using NHibernate.DomainModel;
+using NHibernate.Linq;
+using NHibernate.Test.TransactionTest;
 using NUnit.Framework;
 
 namespace NHibernate.Test.SystemTransactions
 {
 	[TestFixture]
-	public class TransactionFixture : TestCase
+	public class TransactionFixture : TransactionFixtureBase
 	{
-		protected override IList Mappings
-		{
-			get { return new string[] { "WZ.hbm.xml" }; }
-		}
-
 		[Test]
 		public void CanUseSystemTransactionsToCommit()
 		{
-			object identifier;
+			int identifier;
 			using(ISession session = Sfi.OpenSession())
 			using(TransactionScope tx = new TransactionScope())
 			{
-				W s = new W();
+				var s = new Person();
 				session.Save(s);
 				identifier = s.Id;
 				tx.Complete();
@@ -29,11 +26,84 @@ public void CanUseSystemTransactionsToCommit()
 			using (ISession session = Sfi.OpenSession())
 			using (TransactionScope tx = new TransactionScope())
 			{
-				W w = session.Get<W>(identifier);
+				var w = session.Get<Person>(identifier);
 				Assert.IsNotNull(w);
 				session.Delete(w);
 				tx.Complete();
 			}
 		}
+
+		[Test]
+		public void FlushFromTransactionAppliesToDisposedSharingSession()
+		{
+			var flushOrder = new List<int>();
+			using (var s = OpenSession(new TestInterceptor(0, flushOrder)))
+			{
+				var builder = s.SessionWithOptions().Connection();
+
+				using (var t = new TransactionScope())
+				{
+					var p1 = new Person();
+					var p2 = new Person();
+					var p3 = new Person();
+					var p4 = new Person();
+
+					using (var s1 = builder.Interceptor(new TestInterceptor(1, flushOrder)).OpenSession())
+						s1.Save(p1);
+					using (var s2 = builder.Interceptor(new TestInterceptor(2, flushOrder)).OpenSession())
+					{
+						s2.Save(p2);
+						using (var s3 = s2.SessionWithOptions().Connection().Interceptor(new TestInterceptor(3, flushOrder)).OpenSession())
+							s3.Save(p3);
+					}
+					s.Save(p4);
+					t.Complete();
+				}
+			}
+
+			Assert.That(flushOrder, Is.EqualTo(new[] { 0, 1, 2, 3 }));
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				Assert.That(s.Query<Person>().Count(), Is.EqualTo(4));
+				t.Commit();
+			}
+		}
+
+		[Test]
+		public void FlushFromTransactionAppliesToSharingSession()
+		{
+			var flushOrder = new List<int>();
+			using (var s = OpenSession(new TestInterceptor(0, flushOrder)))
+			{
+				var builder = s.SessionWithOptions().Connection();
+
+				using (var s1 = builder.Interceptor(new TestInterceptor(1, flushOrder)).OpenSession())
+				using (var s2 = builder.Interceptor(new TestInterceptor(2, flushOrder)).OpenSession())
+				using (var s3 = s2.SessionWithOptions().Connection().Interceptor(new TestInterceptor(3, flushOrder)).OpenSession())
+				using (var t = new TransactionScope())
+				{
+					var p1 = new Person();
+					var p2 = new Person();
+					var p3 = new Person();
+					var p4 = new Person();
+					s1.Save(p1);
+					s2.Save(p2);
+					s3.Save(p3);
+					s.Save(p4);
+					t.Complete();
+				}
+			}
+
+			Assert.That(flushOrder, Is.EqualTo(new[] { 0, 1, 2, 3 }));
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				Assert.That(s.Query<Person>().Count(), Is.EqualTo(4));
+				t.Commit();
+			}
+		}
 	}
 }

src/NHibernate.Test/TestCase.cs

@@ -276,7 +276,7 @@ protected virtual void CreateSchema()
 
 		protected virtual void DropSchema()
 		{
-			if (Sfi.ConnectionProvider.Driver is FirebirdClientDriver fbDriver)
+			if (Sfi?.ConnectionProvider.Driver is FirebirdClientDriver fbDriver)
 			{
 				// Firebird will pool each connection created during the test and will marked as used any table
 				// referenced by queries. It will at best delays those tables drop until connections are actually

src/NHibernate.Test/Tools/hbm2ddl/SchemaMetadataUpdaterTest/HeavyEntity.cs

@@ -7,5 +7,6 @@ public class Order
 		public string And { get; set; }
 		public string Column { get; set; }
 		public string Name { get; set; }
+		public string Abracadabra { get; set; }
 	}
 }

src/NHibernate.Test/Tools/hbm2ddl/SchemaMetadataUpdaterTest/HeavyEntity.hbm.xml

@@ -13,6 +13,7 @@
 		<property name="And"/>
 		<property name="Column"/>
 		<property name="Name"/>
+		<property name="Abracadabra"/>
 	</class>
 
 </hibernate-mapping>