Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename test project to improve clarity of intent

Browse Source
This commit is contained in:
Steve Bohlen
2015-03-27 12:04:55 -04:00
parent fac1a98dc8
commit 92cfa7129c
16 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Spring.Net.2010.sln
View File

@@ -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

4
test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/App.config → test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/App.config
View File

@@ -15,8 +15,8 @@
<spring>
<context>
<resource uri="config://spring/objects"/>
<resource uri="assembly://Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Configuration.xml"/>
<resource uri="assembly://Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.NHibernate.xml"/>
<resource uri="assembly://Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Configuration.xml"/>
<resource uri="assembly://Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.NHibernate.xml"/>
</context>
<parsers>
<parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data"/>

2
test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Container.cs → test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Container.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace Spring.Data.NHibernate.TxPromotion.Integration.Tests
namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests
{
public class Container : IContainer
{

2
test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IContainer.cs → test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/IContainer.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace Spring.Data.NHibernate.TxPromotion.Integration.Tests
namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests
{
public interface IContainer
{

2
test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IService1.cs → test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/IService1.cs
View File

@@ -1,4 +1,4 @@
namespace Spring.Data.NHibernate.TxPromotion.Integration.Tests
namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests
{
public interface IService1
{

2
test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IService2.cs → test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/IService2.cs
View File

@@ -1,4 +1,4 @@
namespace Spring.Data.NHibernate.TxPromotion.Integration.Tests
namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests
{
public interface IService2
{

2
test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Mappings.hbm.xml → test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Mappings.hbm.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" default-lazy="true" assembly="Spring.Data.NHibernate.TxPromotion.Integration.Tests" namespace="Spring.Data.NHibernate.TxPromotion.Integration.Tests">
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" default-lazy="true" assembly="Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests" namespace="Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests">
<class name="Container" proxy="IContainer">
<id name="Id">

4
test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Properties/AssemblyInfo.cs → test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Properties/AssemblyInfo.cs
View File

@@ -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("")]

2
test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Service1.cs → test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Service1.cs
View File

@@ -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

2
test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Service2.cs → test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Service2.cs
View File

@@ -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

4
test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Configuration.xml → test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Configuration.xml
View File

@@ -26,11 +26,11 @@
</property>
</object>
<object id="IService1" type="Spring.Data.NHibernate.TxPromotion.Integration.Tests.Service1, Spring.Data.NHibernate.TxPromotion.Integration.Tests">
<object id="IService1" type="Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests.Service1, Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests">
<property name="HibernateTemplate" ref="Spring.Data.NHibernate.Generic.HibernateTemplate" />
</object>
<object id="IService2" type="Spring.Data.NHibernate.TxPromotion.Integration.Tests.Service2, Spring.Data.NHibernate.TxPromotion.Integration.Tests">
<object id="IService2" type="Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests.Service2, Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests">
<property name="HibernateTemplate" ref="Spring.Data.NHibernate.Generic.HibernateTemplate" />
</object>
</objects>

8
test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Data.NHibernate.TxPromotion.Integration.Tests.csproj → test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests.csproj
View File

@@ -7,8 +7,8 @@
<ProjectGuid>{DE276F7C-4564-49EC-AABC-B964EC3D1626}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Spring.Data.NHibernate.TxPromotion.Integration.Tests</RootNamespace>
<AssemblyName>Spring.Data.NHibernate.TxPromotion.Integration.Tests</AssemblyName>
<RootNamespace>Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests</RootNamespace>
<AssemblyName>Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
@@ -16,7 +16,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.TxPromotion.Integration.Tests\Debug\</OutputPath>
<OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NestedTxSuspension.Integration.Tests\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -24,7 +24,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.TxPromotion.Integration.Tests\Release\</OutputPath>
<OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NestedTxSuspension.Integration.Tests\Release\</OutputPath>
<DefineConstants>TRACE;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>

0
test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.HibernateTxScopeTransactionManager.xml → test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.HibernateTxScopeTransactionManager.xml
View File

2
test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.NHibernate.xml → test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.NHibernate.xml
View File

@@ -27,7 +27,7 @@
<property name="MappingResources">
<list>
<value>assembly://Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Mappings.hbm.xml</value>
<value>assembly://Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Mappings.hbm.xml</value>
</list>
</property>

49
test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/TestUsingHibernateTxScopeTransactionManager.cs Normal file
View File

@@ -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();
}
}
}

49
test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/TestUsingHibernateTxScopeTransactionManager.cs
View File

@@ -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();
}
}
}