GH2201: Correct failing tests due to change in how objects are loaded.

Author: David Ellingsworth

src/NHibernate.Test/Async/Immutable/EntityWithMutableCollection/AbstractEntityWithOneToManyTest.cs

@@ -1234,7 +1234,6 @@ public virtual async Task OneToManyCollectionOptimisticLockingWithUpdateAsync()
 
 			s = OpenSession();
 			t = s.BeginTransaction();
-			c = await (s.CreateCriteria<Contract>().UniqueResultAsync<Contract>());
 			// If the entity uses a join mapping, DML queries require temp tables.
 			if (Dialect.SupportsTemporaryTables)
 				await (s.CreateQuery("delete from Party").ExecuteUpdateAsync());
@@ -1251,7 +1250,7 @@ public virtual async Task OneToManyCollectionOptimisticLockingWithUpdateAsync()
 				await (s.DeleteAsync(partyOrig));
 				await (s.DeleteAsync(newParty));
 			}
-
+			c = await (s.CreateCriteria<Contract>().UniqueResultAsync<Contract>());
 			await (s.DeleteAsync(c));
 			Assert.That(await (s.CreateCriteria<Contract>().SetProjection(Projections.RowCountInt64()).UniqueResultAsync<long>()), Is.EqualTo(0L));
 			Assert.That(await (s.CreateCriteria<Party>().SetProjection(Projections.RowCountInt64()).UniqueResultAsync<long>()), Is.EqualTo(0L));

src/NHibernate.Test/Immutable/EntityWithMutableCollection/AbstractEntityWithOneToManyTest.cs

@@ -1223,7 +1223,6 @@ public virtual void OneToManyCollectionOptimisticLockingWithUpdate()
 
 			s = OpenSession();
 			t = s.BeginTransaction();
-			c = s.CreateCriteria<Contract>().UniqueResult<Contract>();
 			// If the entity uses a join mapping, DML queries require temp tables.
 			if (Dialect.SupportsTemporaryTables)
 				s.CreateQuery("delete from Party").ExecuteUpdate();
@@ -1240,7 +1239,7 @@ public virtual void OneToManyCollectionOptimisticLockingWithUpdate()
 				s.Delete(partyOrig);
 				s.Delete(newParty);
 			}
-
+			c = s.CreateCriteria<Contract>().UniqueResult<Contract>();
 			s.Delete(c);
 			Assert.That(s.CreateCriteria<Contract>().SetProjection(Projections.RowCountInt64()).UniqueResult<long>(), Is.EqualTo(0L));
 			Assert.That(s.CreateCriteria<Party>().SetProjection(Projections.RowCountInt64()).UniqueResult<long>(), Is.EqualTo(0L));