diff --git a/test/Spring/Spring.Data.Integration.Tests/AssemblyInfo.cs b/test/Spring/Spring.Data.Integration.Tests/AssemblyInfo.cs
deleted file mode 100644
index 6263a7ed..00000000
--- a/test/Spring/Spring.Data.Integration.Tests/AssemblyInfo.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-//
-// 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.Integration Tests")]
-[assembly: AssemblyDescription("Integration tests for Spring.Data assembly")]
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2008.csproj b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2008.csproj
index 59ab0906..e1447247 100644
--- a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2008.csproj
+++ b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2008.csproj
@@ -117,7 +117,6 @@
-
@@ -179,6 +178,7 @@
+
Always
diff --git a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build
index 7a83d2b3..2c52bccd 100644
--- a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build
+++ b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build
@@ -1,44 +1,39 @@
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/Spring/Spring.Data.NHibernate20.Integration.Tests/AssemblyInfo.cs b/test/Spring/Spring.Data.NHibernate20.Integration.Tests/AssemblyInfo.cs
deleted file mode 100644
index 4efba8f7..00000000
--- a/test/Spring/Spring.Data.NHibernate20.Integration.Tests/AssemblyInfo.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-[assembly: AssemblyTitle("Spring.Data.NHibernate20 Integration Tests")]
-[assembly: AssemblyDescription("Integration tests for Spring.Data.NHibernate20 assembly")]
diff --git a/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Data/NHibernate/MultipleDbTests.xml b/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Data/NHibernate/MultipleDbTests.xml
index b8ed4265..c0899dc8 100644
--- a/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Data/NHibernate/MultipleDbTests.xml
+++ b/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Data/NHibernate/MultipleDbTests.xml
@@ -2,13 +2,13 @@
-
+
-
+
-
+
-
-
-
-
-
+
+
-
-
+
-
+
@@ -100,6 +100,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Data/NHibernate/templateTests.xml b/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Data/NHibernate/templateTests.xml
index 8566e6fb..0fdf7818 100644
--- a/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Data/NHibernate/templateTests.xml
+++ b/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Data/NHibernate/templateTests.xml
@@ -1,17 +1,17 @@
-
+
-
+
-
-
+
-
+
-
+ value="NHibernate.Driver.SqlClientDriver"/>
+
-
+
-
+
-
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate20.Integration.Tests/RecreateDatabases.sql b/test/Spring/Spring.Data.NHibernate20.Integration.Tests/RecreateDatabases.sql
new file mode 100644
index 00000000..347e8482
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate20.Integration.Tests/RecreateDatabases.sql
@@ -0,0 +1,29 @@
+IF EXISTS (SELECT name FROM sys.databases WHERE name = N'Spring')
+BEGIN
+ ALTER DATABASE Spring
+ SET SINGLE_USER
+ WITH ROLLBACK IMMEDIATE
+
+ DROP DATABASE Spring
+END
+GO
+
+IF EXISTS (SELECT * FROM sys.server_principals WHERE name = N'springqa2')
+ DROP LOGIN [springqa2]
+GO
+
+CREATE DATABASE Spring
+GO
+
+CREATE LOGIN [springqa2] WITH PASSWORD=N'springqa2', DEFAULT_DATABASE=[Spring], DEFAULT_LANGUAGE=[us_english]
+GO
+
+USE Spring
+CREATE USER [springqa2] FOR LOGIN [springqa2] WITH DEFAULT_SCHEMA=[dbo]
+EXEC sp_addrolemember 'db_owner', 'springqa2'
+GO
+
+-- ALTERNATIVELY JUST DROP ALL TABLES:
+-- EXEC sp_MSforeachtable 'ALTER TABLE ? NOCHECK CONSTRAINT ALL';
+-- EXEC sp_MSforeachtable 'ALTER TABLE ? DISABLE TRIGGER ALL';
+-- EXEC sp_MSForEachTable 'DROP TABLE ?';
diff --git a/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Setup.cs b/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Setup.cs
new file mode 100644
index 00000000..8a7556b6
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Setup.cs
@@ -0,0 +1,60 @@
+#region License
+
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#endregion
+
+using NUnit.Framework;
+using Spring.Core.IO;
+using Spring.Data.Common;
+using Spring.Data.Core;
+using Spring.Testing.Ado;
+
+namespace Spring
+{
+ ///
+ ///
+ /// Erich Eichinger
+ [SetUpFixture]
+ public class Setup
+ {
+ private const string DBConnection = "Data Source=SPRINGQA;Database=$DATABASE$;Trusted_Connection=False;User ID=springqa;Password=springqa";
+ private readonly IResourceLoader resourceLoader = new ConfigurableResourceLoader();
+
+ private IResource GetResource(object instance, string name)
+ {
+ string resourcePath = TestResourceLoader.GetAssemblyResourceUri(instance, name);
+ return resourceLoader.GetResource(resourcePath);
+ }
+
+ [SetUp]
+ public void InstallMSSQLDatabase()
+ {
+ IDbProvider dbProvider = DbProviderFactory.GetDbProvider("SqlServer-2.0");
+ AdoTemplate ado = new AdoTemplate(dbProvider);
+
+ // (re-)create database(s)
+ dbProvider.ConnectionString = DBConnection.Replace("$DATABASE$", "master");
+ SimpleAdoTestUtils.ExecuteSqlScript(ado, GetResource(this, "RecreateDatabases.sql"));
+
+ // create tables
+ dbProvider.ConnectionString = DBConnection.Replace("$DATABASE$", "Spring");
+ SimpleAdoTestUtils.ExecuteSqlScript(ado, GetResource(this, "Data.NHibernate/creditdebit.sql"));
+ SimpleAdoTestUtils.ExecuteSqlScript(ado, GetResource(this, "Data.NHibernate/testObject.sql"));
+ }
+ }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.2008.csproj b/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.2008.csproj
index 97a51205..2e0c87b5 100644
--- a/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.2008.csproj
+++ b/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.2008.csproj
@@ -2,9 +2,9 @@
Debug
AnyCPU
- 8.0.50727
+ 9.0.30729
2.0
- {4A07E150-ED90-407C-8CAD-4760444DDFD9}
+ {2F09404F-AC31-4AA8-BE8B-C5AF76797221}
Library
Properties
Spring
@@ -28,9 +28,13 @@
4
-
+
False
- ..\..\..\lib\NHibernate20\net\2.0\Castle.DynamicProxy.dll
+ ..\..\..\lib\NHibernate20\net\2.0\Castle.Core.dll
+
+
+ False
+ ..\..\..\lib\NHibernate20\net\2.0\Castle.DynamicProxy2.dll
False
@@ -114,12 +118,17 @@
Data\NHibernate\TestObject.cs
-
+
-
+
Data\NHibernate\creditdebit.sql
-
+
+
+
+ Data\NHibernate\testObject.sql
+
+
@@ -139,6 +148,14 @@
{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}
Spring.Data.2008
+
+ {ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}
+ Spring.Testing.NUnit.2008
+
+
+ {44B16BAA-6DF8-447C-9D7F-3AD3D854D904}
+ Spring.Core.Tests.2008
+
diff --git a/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.build b/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.build
index 6626a5a4..9900c00a 100644
--- a/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.build
@@ -3,13 +3,13 @@
-
-
+
@@ -19,22 +19,21 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
@@ -43,7 +42,7 @@
-
+
@@ -51,13 +50,13 @@
-
+
-
+
-
-
+
+
-
+
diff --git a/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.dll.config b/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.dll.config
index 12e5ecbf..f422be76 100644
--- a/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.dll.config
+++ b/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.dll.config
@@ -14,8 +14,7 @@
-
-
+
diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/MultipleDbTests.xml b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/MultipleDbTests.xml
index ea2d13b2..ab5c9279 100644
--- a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/MultipleDbTests.xml
+++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/MultipleDbTests.xml
@@ -2,13 +2,13 @@
-
+
-
+
-
+
-