NH-2176 - Moving "DtcFailures" to system transactions tests, and doing complete non distributed tests.

Author: fredericDelaporte

src/NHibernate.Test/NHSpecificTest/DtcFailures/Person.cs

@@ -1448,6 +1448,9 @@
     <Compile Include="Stateless\TreeNode.cs" />
     <Compile Include="Subselect\ClassSubselectFixture.cs" />
     <Compile Include="Subselect\Domain.cs" />
+    <Compile Include="SystemTransactions\DistributedTransactionFixture.cs" />
+    <Compile Include="SystemTransactions\Person.cs" />
+    <Compile Include="SystemTransactions\TransactionFixtureBase.cs" />
     <Compile Include="TestCaseMappingByCode.cs" />
     <Compile Include="TestDialect.cs" />
     <Compile Include="TestDialects\MsSql2008TestDialect.cs" />
@@ -1594,8 +1597,6 @@
     <Compile Include="NHSpecificTest\NH1574\StatelessTest.cs" />
     <Compile Include="NHSpecificTest\NH1574\Team.cs" />
     <Compile Include="NHSpecificTest\Dates\TimeFixture.cs" />
-    <Compile Include="NHSpecificTest\DtcFailures\DtcFailuresFixture.cs" />
-    <Compile Include="NHSpecificTest\DtcFailures\Person.cs" />
     <Compile Include="NHSpecificTest\Futures\FallbackFixture.cs" />
     <Compile Include="NHSpecificTest\Futures\FutureFixture.cs" />
     <Compile Include="NHSpecificTest\Logs\LogsFixture.cs" />
@@ -3282,6 +3283,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH1291AnonExample\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="SystemTransactions\Person.hbm.xml" />
     <EmbeddedResource Include="SessionBuilder\Mappings.hbm.xml" />
     <EmbeddedResource Include="IdTest\IdentityClass.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1904\StructMappings.hbm.xml" />
@@ -3753,7 +3755,6 @@
     <EmbeddedResource Include="NHSpecificTest\NH1710\Defined.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1713\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1715\Mappings.hbm.xml" />
-    <EmbeddedResource Include="NHSpecificTest\DtcFailures\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1694\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1706\Mappings.hbm.xml" />
     <EmbeddedResource Include="Stateless\Naturalness.hbm.xml" />

src/NHibernate.Test/NHibernate.Test.csproj

@@ -1,71 +1,22 @@
 using System;
-using System.Collections;
 using System.Linq;
-using System.Reflection;
 using System.Threading;
 using System.Transactions;
 using log4net;
 using log4net.Repository.Hierarchy;
-using NHibernate.Cfg;
-using NHibernate.Cfg.MappingSchema;
 using NHibernate.Linq;
-using NHibernate.Tool.hbm2ddl;
 using NUnit.Framework;
 
-namespace NHibernate.Test.NHSpecificTest.DtcFailures
+namespace NHibernate.Test.SystemTransactions
 {
 	[TestFixture]
-	public class DtcFailuresFixture : TestCase
+	public class DistributedTransactionFixture : TransactionFixtureBase
 	{
-		private static readonly ILog _log = LogManager.GetLogger(typeof(DtcFailuresFixture));
-
-		protected override IList Mappings
-			=> new[] { "NHSpecificTest.DtcFailures.Mappings.hbm.xml" };
-
-		protected override string MappingsAssembly
-			=> "NHibernate.Test";
+		private static readonly ILog _log = LogManager.GetLogger(typeof(DistributedTransactionFixture));
 
 		protected override bool AppliesTo(Dialect.Dialect dialect)
 			=> dialect.SupportsDistributedTransactions;
 
-		protected override void CreateSchema()
-		{
-			// Copied from Configure method.
-			var config = new Configuration();
-			if (TestConfigurationHelper.hibernateConfigFile != null)
-				config.Configure(TestConfigurationHelper.hibernateConfigFile);
-
-			// Our override so we can set nullability on database column without NHibernate knowing about it.
-			config.BeforeBindMapping += BeforeBindMapping;
-
-			// Copied from AddMappings methods.
-			var assembly = Assembly.Load(MappingsAssembly);
-			foreach (var file in Mappings)
-				config.AddResource(MappingsAssembly + "." + file, assembly);
-
-			// Copied from CreateSchema method, but we use our own config.
-			new SchemaExport(config).Create(false, true);
-		}
-
-		protected override void OnTearDown()
-		{
-			DodgeTransactionCompletionDelayIfRequired();
-
-			using (var s = OpenSession())
-			using (var t = s.BeginTransaction())
-			{
-				s.CreateQuery("delete from System.Object").ExecuteUpdate();
-				t.Commit();
-			}
-		}
-
-		private void BeforeBindMapping(object sender, BindMappingEventArgs e)
-		{
-			var prop = e.Mapping.RootClasses[0].Properties.OfType<HbmProperty>().Single(p => p.Name == "NotNullData");
-			prop.notnull = true;
-			prop.notnullSpecified = true;
-		}
-
 		[Test]
 		public void SupportsEnlistingInDistributed()
 		{
@@ -108,7 +59,7 @@ public void SupportsPromotingToDistributed()
 		}
 
 		[Test]
-		public void WillNotCrashOnDtcPrepareFailure()
+		public void WillNotCrashOnPrepareFailure()
 		{
 			var tx = new TransactionScope();
 			var disposeCalled = false;
@@ -484,6 +435,74 @@ public void NH1744()
 			}
 		}
 
+		[Test]
+		public void CanUseSessionWithManyScopes([Values(false, true)] bool explicitFlush)
+		{
+			// Note that this fails with ConnectionReleaseMode.OnClose and SqlServer:
+			// System.Data.SqlClient.SqlException : Microsoft Distributed Transaction Coordinator (MS DTC) has stopped this transaction.
+			using (var s = OpenSession())
+			//using (var s = Sfi.WithOptions().ConnectionReleaseMode(ConnectionReleaseMode.OnClose).OpenSession())
+			{
+				using (var tx = new TransactionScope())
+				{
+					ForceEscalationToDistributedTx.Escalate();
+					// Acquire the connection
+					var count = s.Query<Person>().Count();
+					Assert.That(count, Is.EqualTo(0), "Unexpected initial entity count.");
+					tx.Complete();
+				}
+				// No dodge here please! Allow to check chaining usages do not fail.
+				using (var tx = new TransactionScope())
+				{
+					s.Save(new Person { CreatedAt = DateTime.Today });
+
+					ForceEscalationToDistributedTx.Escalate();
+
+					if (explicitFlush)
+						s.Flush();
+
+					tx.Complete();
+				}
+
+				DodgeTransactionCompletionDelayIfRequired();
+
+				using (var tx = new TransactionScope())
+				{
+					ForceEscalationToDistributedTx.Escalate();
+					var count = s.Query<Person>().Count();
+					Assert.That(count, Is.EqualTo(1), "Unexpected entity count after committed insert.");
+					tx.Complete();
+				}
+				using (new TransactionScope())
+				{
+					s.Save(new Person { CreatedAt = DateTime.Today });
+
+					ForceEscalationToDistributedTx.Escalate();
+
+					if (explicitFlush)
+						s.Flush();
+
+					// No complete for rollback-ing.
+				}
+
+				DodgeTransactionCompletionDelayIfRequired();
+
+				// Do not reuse the session after a rollback, its state does not allow it.
+				// http://nhibernate.info/doc/nhibernate-reference/manipulatingdata.html#manipulatingdata-endingsession-commit
+			}
+
+			using (var s = OpenSession())
+			{
+				using (var tx = new TransactionScope())
+				{
+					ForceEscalationToDistributedTx.Escalate();
+					var count = s.Query<Person>().Count();
+					Assert.That(count, Is.EqualTo(1), "Unexpected entity count after rollback-ed insert.");
+					tx.Complete();
+				}
+			}
+		}
+
 		[Test]
 		public void CanUseSessionOutsideOfScopeAfterScope([Values(false, true)] bool explicitFlush)
 		{
@@ -551,15 +570,6 @@ public void DelayedTransactionCompletion([Values(false, true)] bool explicitFlus
 			}
 		}
 
-		private void AssertNoPersons()
-		{
-			using (var s = OpenSession())
-			using (s.BeginTransaction())
-			{
-				Assert.AreEqual(0, s.Query<Person>().Count(), "Entities found in database.");
-			}
-		}
-
 		private void DodgeTransactionCompletionDelayIfRequired()
 		{
 			if (Sfi.ConnectionProvider.Driver.HasDelayedDistributedTransactionCompletion)

src/NHibernate.Test/NHSpecificTest/DtcFailures/DtcFailuresFixture.cs renamed to src/NHibernate.Test/SystemTransactions/DistributedTransactionFixture.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace NHibernate.Test.SystemTransactions
+{
+	public class Person
+	{
+        public virtual DateTime CreatedAt { get; set; }
+
+		public virtual int Id { get; set; }
+
+		public virtual string NotNullData { get; set; } = "not-null";
+	}
+}

src/NHibernate.Test/SystemTransactions/Person.cs

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
-				   namespace="NHibernate.Test.NHSpecificTest.DtcFailures"
+				   namespace="NHibernate.Test.SystemTransactions"
 				   assembly="NHibernate.Test">
 
 	<class name="Person">