From 0da57da4883fb4452b40d6252b4b7843348be0a6 Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Fri, 27 Mar 2015 17:34:13 -0400
Subject: [PATCH] integrate new test project into build script

---
 Spring.build                                  |  4 ++
 .../Properties/AssemblyInfo.cs                | 34 +---------
 ...NestedTxSuspension.Integration.Tests.build | 67 +++++++++++++++++++
 3 files changed, 72 insertions(+), 33 deletions(-)
 create mode 100644 test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests.build

diff --git a/Spring.build b/Spring.build
index e010e2ad..9f389069 100644
--- a/Spring.build
+++ b/Spring.build
@@ -540,6 +540,7 @@ Commandline Examples:
     <nant buildfile="test/Spring/Spring.Data.NHibernate3.Integration.Tests/Spring.Data.NHibernate3.Integration.Tests.build" target="test" if="${build-data}"/>
     <nant buildfile="test/Spring/Spring.Data.NHibernate4.Tests/Spring.Data.NHibernate4.Tests.build" target="test" if="${build-data}"/>
     <nant buildfile="test/Spring/Spring.Data.NHibernate4.Integration.Tests/Spring.Data.NHibernate4.Integration.Tests.build" target="test" if="${build-data}"/>
+    <nant buildfile="test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests.build" target="test" if="${build-data and (nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5' )}"/>
 	
     <nant buildfile="test/Spring/Spring.Services.Tests/Spring.Services.Tests.build" target="test" if="${build-services}"/>
     <nant buildfile="test/Spring/Spring.Web.Tests/Spring.Web.Tests.build" target="test" if="${build-web}"/>
@@ -904,6 +905,8 @@ Commandline Examples:
         <delete dir="test/Spring/Spring.Data.NHibernate4.Tests/bin" failonerror="false"/>
         <delete dir="test/Spring/Spring.Data.NHibernate4.Integration.Tests/obj" failonerror="false"/>
         <delete dir="test/Spring/Spring.Data.NHibernate4.Integration.Tests/bin" failonerror="false"/>
+        <delete dir="test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/bin" failonerror="false"/>
+        <delete dir="test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/bin" failonerror="false"/>
         <delete dir="test/Spring/Spring.Services.Tests/obj" failonerror="false"/>
         <delete dir="test/Spring/Spring.Services.Tests/bin" failonerror="false"/>
         <delete dir="test/Spring/Spring.Messaging.Nms.Tests/obj" failonerror="false"/>
@@ -1858,6 +1861,7 @@ Commandline Examples:
       <include name="test/Spring/Spring.Data.NHibernate3.Integration.Tests/**"/>	  
 	  <include name="test/Spring/Spring.Data.NHibernate4.Tests/**"/>
       <include name="test/Spring/Spring.Data.NHibernate4.Integration.Tests/**"/>	  
+      <include name="test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/**"/>	  
       <include name="test/Spring/Spring.Messaging.Tests/**"/>
       <include name="test/Spring/Spring.Messaging.Nms.Tests/**"/>
       <include name="test/Spring/Spring.Messaging.Nms.Integration.Tests/**"/>
diff --git a/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Properties/AssemblyInfo.cs b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Properties/AssemblyInfo.cs
index 23ffdf32..c0677e1c 100644
--- a/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Properties/AssemblyInfo.cs
+++ b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Properties/AssemblyInfo.cs
@@ -1,36 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
-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.NestedTxSuspension.Integration.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("3f4ca2dc-e2e6-40cc-90d3-0fdda9912e50")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyDescription("Integration tests for HibernteTxScopeTransactionManager suspension of transactions")]
diff --git a/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests.build b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests.build
new file mode 100644
index 00000000..fde59f27
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests.build
@@ -0,0 +1,67 @@
+<?xml version="1.0" ?>
+<project name="Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+	Required properties:
+	  * current.bin.dir           - (path) root level to build to
+	  * current.build.debug       - (true|false) debug build?
+	  * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+ 
+ <include buildfile="${spring.basedir}/common-project.include" />
+ 
+	<target name="build">
+
+		<!-- build Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests -->
+		<csc target="library" define="${current.build.defines.csc}"
+				warnaserror="true"
+		        optimize="${build.optimize}"
+				debug="${current.build.debug}"
+				output="${current.bin.dir}/${project::get-name()}.dll"
+				doc="${current.bin.dir}/${project::get-name()}.xml"
+				nostdlib="true"
+				noconfig="true"
+				>
+			<nowarn>
+				<warning number="${nowarn.numbers.test}" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../CommonAssemblyInfo.cs" />
+			</sources>
+			<references>
+				<lib>
+					<include name="${nh4.lib.dir}"/>
+					<include name="${iesi4.lib.dir}"/>
+				</lib>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
+				<include name="System.Data.dll" />
+				<include name="System.EnterpriseServices.dll" />
+				<include name="${current.bin.dir}/*.dll" />
+				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+				<exclude name="${current.bin.dir}/Spring.Data.NHibernate3*.dll" />
+				<exclude name="${current.bin.dir}/Spring.Data.NHibernate*Tests*.dll" />
+				<exclude name="${current.bin.dir}/CloverRuntime.dll" />
+			</references>
+			<resources prefix="Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests" dynamicprefix="true" failonempty="true">
+				<include name="**/*.xml" />
+			</resources>
+		</csc>
+
+        <!--<copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
+              tofile="${current.bin.dir}/${project::get-name()}.dll.config"/> -->
+		
+		<copy file="${project::get-base-directory()}/app.config"
+              tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
+		
+
+	</target>
+	
+	<target name="test" depends="build">
+        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
+        <call target="common.run-tests" />
+    </target>
+
+</project>