diff --git a/Spring.Net.2010.sln b/Spring.Net.2010.sln index a4257dc0..1ee6b799 100644 --- a/Spring.Net.2010.sln +++ b/Spring.Net.2010.sln @@ -105,7 +105,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate4.Tes EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate4.Integration.Tests.2010", "test\Spring\Spring.Data.NHibernate4.Integration.Tests\Spring.Data.NHibernate4.Integration.Tests.2010.csproj", "{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate.TxPromotion.Integration.Tests", "test\Spring\Spring.Data.NHibernate.TxPromotion.Integration.Tests\Spring.Data.NHibernate.TxPromotion.Integration.Tests.csproj", "{DE276F7C-4564-49EC-AABC-B964EC3D1626}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests", "test\Spring\Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests\Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests.csproj", "{DE276F7C-4564-49EC-AABC-B964EC3D1626}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/App.config b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/App.config similarity index 86% rename from test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/App.config rename to test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/App.config index c9c3a2cb..9fb793b7 100644 --- a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/App.config +++ b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/App.config @@ -15,8 +15,8 @@ - - + + diff --git a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Container.cs b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Container.cs similarity index 68% rename from test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Container.cs rename to test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Container.cs index 12c37f89..0c03fe78 100644 --- a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Container.cs +++ b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Container.cs @@ -1,6 +1,6 @@ using System; -namespace Spring.Data.NHibernate.TxPromotion.Integration.Tests +namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests { public class Container : IContainer { diff --git a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IContainer.cs b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/IContainer.cs similarity index 65% rename from test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IContainer.cs rename to test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/IContainer.cs index fb722eba..a8fffcd0 100644 --- a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IContainer.cs +++ b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/IContainer.cs @@ -1,6 +1,6 @@ using System; -namespace Spring.Data.NHibernate.TxPromotion.Integration.Tests +namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests { public interface IContainer { diff --git a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IService1.cs b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/IService1.cs similarity index 79% rename from test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IService1.cs rename to test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/IService1.cs index f6513bf3..1954d7eb 100644 --- a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IService1.cs +++ b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/IService1.cs @@ -1,4 +1,4 @@ -namespace Spring.Data.NHibernate.TxPromotion.Integration.Tests +namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests { public interface IService1 { diff --git a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IService2.cs b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/IService2.cs similarity index 65% rename from test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IService2.cs rename to test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/IService2.cs index dcdcc723..9d47a7cb 100644 --- a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IService2.cs +++ b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/IService2.cs @@ -1,4 +1,4 @@ -namespace Spring.Data.NHibernate.TxPromotion.Integration.Tests +namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests { public interface IService2 { diff --git a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Mappings.hbm.xml b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Mappings.hbm.xml similarity index 64% rename from test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Mappings.hbm.xml rename to test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Mappings.hbm.xml index a90829b3..25d7f4bd 100644 --- a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Mappings.hbm.xml +++ b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Mappings.hbm.xml @@ -1,5 +1,5 @@  - + diff --git a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Properties/AssemblyInfo.cs b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Properties/AssemblyInfo.cs similarity index 87% rename from test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Properties/AssemblyInfo.cs rename to test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Properties/AssemblyInfo.cs index 2f3a8cd9..23ffdf32 100644 --- a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Properties/AssemblyInfo.cs +++ b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("Spring.Data.NHibernate.TxPromotion.Integration.Tests")] +[assembly: AssemblyTitle("Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Spring.Data.NHibernate.TxPromotion.Integration.Tests")] +[assembly: AssemblyProduct("Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests")] [assembly: AssemblyCopyright("Copyright © 2015")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Service1.cs b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Service1.cs similarity index 95% rename from test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Service1.cs rename to test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Service1.cs index 79c2c0b6..adf6317e 100644 --- a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Service1.cs +++ b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Service1.cs @@ -1,7 +1,7 @@ using Spring.Data.NHibernate.Generic; using Spring.Transaction; -namespace Spring.Data.NHibernate.TxPromotion.Integration.Tests +namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests { [Transaction.Interceptor.Transaction(TransactionPropagation.Supports, ReadOnly = true)] public class Service1 : IService1 diff --git a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Service2.cs b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Service2.cs similarity index 91% rename from test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Service2.cs rename to test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Service2.cs index b12e030e..d2052dbc 100644 --- a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Service2.cs +++ b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Service2.cs @@ -1,7 +1,7 @@ using Spring.Data.NHibernate.Generic; using Spring.Transaction; -namespace Spring.Data.NHibernate.TxPromotion.Integration.Tests +namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests { [Transaction.Interceptor.Transaction(TransactionPropagation.Supports, ReadOnly = true)] public class Service2 : IService2 diff --git a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Configuration.xml b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Configuration.xml similarity index 81% rename from test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Configuration.xml rename to test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Configuration.xml index fba8c755..ae42f85f 100644 --- a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Configuration.xml +++ b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Configuration.xml @@ -26,11 +26,11 @@ - + - + diff --git a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Data.NHibernate.TxPromotion.Integration.Tests.csproj b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests.csproj similarity index 92% rename from test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Data.NHibernate.TxPromotion.Integration.Tests.csproj rename to test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests.csproj index 5acd5252..b0ceb97d 100644 --- a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Data.NHibernate.TxPromotion.Integration.Tests.csproj +++ b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests.csproj @@ -7,8 +7,8 @@ {DE276F7C-4564-49EC-AABC-B964EC3D1626} Library Properties - Spring.Data.NHibernate.TxPromotion.Integration.Tests - Spring.Data.NHibernate.TxPromotion.Integration.Tests + Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests + Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests v4.5 512 @@ -16,7 +16,7 @@ true full false - ..\..\..\build\VS.Net.2010\Spring.Data.TxPromotion.Integration.Tests\Debug\ + ..\..\..\build\VS.Net.2010\Spring.Data.NestedTxSuspension.Integration.Tests\Debug\ TRACE;DEBUG;NET_4_0 prompt 4 @@ -24,7 +24,7 @@ pdbonly true - ..\..\..\build\VS.Net.2010\Spring.Data.TxPromotion.Integration.Tests\Release\ + ..\..\..\build\VS.Net.2010\Spring.Data.NestedTxSuspension.Integration.Tests\Release\ TRACE;NET_4_0 prompt 4 diff --git a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.HibernateTxScopeTransactionManager.xml b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.HibernateTxScopeTransactionManager.xml similarity index 100% rename from test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.HibernateTxScopeTransactionManager.xml rename to test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.HibernateTxScopeTransactionManager.xml diff --git a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.NHibernate.xml b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.NHibernate.xml similarity index 91% rename from test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.NHibernate.xml rename to test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.NHibernate.xml index 717ca8cc..6e31c2c7 100644 --- a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.NHibernate.xml +++ b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.NHibernate.xml @@ -27,7 +27,7 @@ - assembly://Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Mappings.hbm.xml + assembly://Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Mappings.hbm.xml diff --git a/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/TestUsingHibernateTxScopeTransactionManager.cs b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/TestUsingHibernateTxScopeTransactionManager.cs new file mode 100644 index 00000000..0ed8b232 --- /dev/null +++ b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/TestUsingHibernateTxScopeTransactionManager.cs @@ -0,0 +1,49 @@ +using NUnit.Framework; + +using Spring.Testing.NUnit; + +namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests +{ + [TestFixture] + public class TestUsingHibernateTxScopeTransactionManager : AbstractTransactionalSpringContextTests + { + #region DI + + public IService1 Service1 { get; set; } + public IService2 Service2 { get; set; } + + #endregion + + protected override string[] ConfigLocations + { + get + { + return new[] + { + "config://spring/objects", + "assembly://Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Configuration.xml", + "assembly://Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.NHibernate.xml", + "assembly://Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.HibernateTxScopeTransactionManager.xml" + }; + } + } + + [Test] + public void TestSuspendTransactionOnNotSupported() + { + Service1.ServiceMethodWithNotSupported1(); + } + + [Test] + public void TestSuspendTransactionOnNotSupportedWithNestedRequiresNew() + { + Service2.ServiceMethodWithNotSupported(); + } + + [Test] + public void TestSuspendTransactionOnNotSupportedWithNestedRequired() + { + Service1.ServiceMethodWithNotSupported3(); + } + } +} diff --git a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/TestUsingHibernateTxScopeTransactionManager.cs b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/TestUsingHibernateTxScopeTransactionManager.cs deleted file mode 100644 index e37d32a4..00000000 --- a/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/TestUsingHibernateTxScopeTransactionManager.cs +++ /dev/null @@ -1,49 +0,0 @@ -using NUnit.Framework; - -using Spring.Testing.NUnit; - -namespace Spring.Data.NHibernate.TxPromotion.Integration.Tests -{ - [TestFixture] - public class TestUsingHibernateTxScopeTransactionManager : AbstractTransactionalSpringContextTests - { - #region DI - - public IService1 Service1 { get; set; } - public IService2 Service2 { get; set; } - - #endregion - - protected override string[] ConfigLocations - { - get - { - return new[] - { - "config://spring/objects", - "assembly://Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Configuration.xml", - "assembly://Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.NHibernate.xml", - "assembly://Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.HibernateTxScopeTransactionManager.xml" - }; - } - } - - [Test(Description = "This is failing test case in my unit test with original NH TX Scope Manager, but not Custom TX Scope Manager, Not Supported -> Not Supported")] - public void TestSuspendTransactionOnNotSupported() - { - Service1.ServiceMethodWithNotSupported1(); - } - - [Test(Description = "This is also failing with NH TX Scope manager, but not with Custom TX Scope Manager, Not Supported -> Requires New")] - public void TestSuspendTransactionOnNotSupportedWithNestedRequiresNew() - { - Service2.ServiceMethodWithNotSupported(); - } - - [Test(Description = "This is failing test case in my unit test with Custom TX Scope Manager (this is the original bug reported), Not Supported -> Not Supported -> Required")] - public void TestSuspendTransactionOnNotSupportedWithNestedRequired() - { - Service1.ServiceMethodWithNotSupported3(); - } - } -}