NH-4034 - checking behavior with "grand-children".

Author: fredericDelaporte

src/NHibernate.Test/SystemTransactions/TransactionFixture.cs

@@ -45,21 +45,27 @@ public void FlushFromTransactionAppliesToDisposedSharingSession()
 					// The relationship is there for failing in case the flush ordering is not the expected one.
 					var p2 = new Person { Related = p1 };
 					var p3 = new Person { Related = p2 };
+					// If putting p3 here, adjust base tear-down.
+					var p4 = new Person { Related = p2 };
 
 					using (var s1 = builder.OpenSession())
 						s1.Save(p1);
 					using (var s2 = builder.OpenSession())
+					{
 						s2.Save(p2);
-					s.Save(p3);
+						using (var s3 = s2.SessionWithOptions().Connection().OpenSession())
+							s3.Save(p3);
+					}
+					s.Save(p4);
 					t.Complete();
 				}
 			}
 
 			using (var s = OpenSession())
 			using (var t = s.BeginTransaction())
 			{
-				Assert.That(s.Query<Person>().Count(), Is.EqualTo(3));
-				Assert.That(s.Query<Person>().Count(p => p.Related != null), Is.EqualTo(2));
+				Assert.That(s.Query<Person>().Count(), Is.EqualTo(4));
+				Assert.That(s.Query<Person>().Count(p => p.Related != null), Is.EqualTo(3));
 				t.Commit();
 			}
 		}
@@ -73,24 +79,28 @@ public void FlushFromTransactionAppliesToSharingSession()
 
 				using (var s1 = builder.OpenSession())
 				using (var s2 = builder.OpenSession())
+				using (var s3 = s2.SessionWithOptions().Connection().OpenSession())
 				using (var t = new TransactionScope())
 				{
 					var p1 = new Person();
 					// The relationship is there for failing in case the flush ordering is not the expected one.
 					var p2 = new Person { Related = p1 };
 					var p3 = new Person { Related = p2 };
+					// If putting p3 here, adjust base tear-down.
+					var p4 = new Person { Related = p2 };
 					s1.Save(p1);
 					s2.Save(p2);
-					s.Save(p3);
+					s3.Save(p3);
+					s.Save(p4);
 					t.Complete();
 				}
 			}
 
 			using (var s = OpenSession())
 			using (var t = s.BeginTransaction())
 			{
-				Assert.That(s.Query<Person>().Count(), Is.EqualTo(3));
-				Assert.That(s.Query<Person>().Count(p => p.Related != null), Is.EqualTo(2));
+				Assert.That(s.Query<Person>().Count(), Is.EqualTo(4));
+				Assert.That(s.Query<Person>().Count(p => p.Related != null), Is.EqualTo(3));
 				t.Commit();
 			}
 		}

src/NHibernate.Test/TransactionTest/TransactionFixture.cs

@@ -145,24 +145,28 @@ public void FlushFromTransactionAppliesToSharingSession()
 
 				using (var s1 = builder.OpenSession())
 				using (var s2 = builder.OpenSession())
+				using (var s3 = s1.SessionWithOptions().Connection().OpenSession())
 				using (var t = s.BeginTransaction())
 				{
 					var p1 = new Person();
 					// The relationship is there for failing in case the flush ordering is not the expected one.
 					var p2 = new Person { Related = p1 };
 					var p3 = new Person { Related = p2 };
+					// If putting p3 here, adjust base tear-down.
+					var p4 = new Person { Related = p2 };
 					s1.Save(p1);
 					s2.Save(p2);
-					s.Save(p3);
+					s3.Save(p3);
+					s.Save(p4);
 					t.Commit();
 				}
 			}
 
 			using (var s = OpenSession())
 			using (var t = s.BeginTransaction())
 			{
-				Assert.That(s.Query<Person>().Count(), Is.EqualTo(3));
-				Assert.That(s.Query<Person>().Count(p => p.Related != null), Is.EqualTo(2));
+				Assert.That(s.Query<Person>().Count(), Is.EqualTo(4));
+				Assert.That(s.Query<Person>().Count(p => p.Related != null), Is.EqualTo(3));
 				t.Commit();
 			}
 		}

src/NHibernate/AdoNet/ConnectionManager.cs

@@ -75,12 +75,12 @@ public ConnectionManager(
 			ownConnection = suppliedConnection == null;
 		}
 
-		public void AddSessionSharingManager(ISessionImplementor session)
+		public void AddDependentSession(ISessionImplementor session)
 		{
 			_dependentSessions.Add(session);
 		}
 
-		public void RemoveSessionSharingManager(ISessionImplementor session)
+		public void RemoveDependentSession(ISessionImplementor session)
 		{
 			_dependentSessions.Remove(session);
 		}

src/NHibernate/Impl/SessionImpl.cs

@@ -201,7 +201,7 @@ internal SessionImpl(SessionFactoryImpl factory, ISessionCreationOptions options
 					if (options.UserSuppliedConnection != null)
 						throw new SessionException("Cannot simultaneously share transaction context and specify connection");
 					connectionManager = sharedOptions.ConnectionManager;
-					connectionManager.AddSessionSharingManager(this);
+					connectionManager.AddDependentSession(this);
 				}
 				else
 				{
@@ -299,7 +299,7 @@ public DbConnection Close()
 				{
 					if (!_transactionCoordinatorShared)
 						return connectionManager.Close();
-					connectionManager.RemoveSessionSharingManager(this);
+					connectionManager.RemoveDependentSession(this);
 					return null;
 				}
 				finally