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

Changing NHibernate tests to support NHibernate 2.0

Browse Source
This commit is contained in:
lahma
2008-06-28 23:00:47 +00:00
parent 5d5f27dce4
commit f949a91ca8
17 changed files with 605 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Config/AopConfiguration.cs
View File

@@ -22,8 +22,6 @@
using NUnit.Framework;
using Spring.Aop.Framework;
using Spring.Aop.Framework.DynamicProxy;
using Spring.Aop.Support;
using Spring.Context;
using Spring.Context.Support;
using Spring.Transaction;
@@ -44,8 +42,11 @@ namespace Spring.Data.NHibernate.Config
[SetUp]
public void Setup()
{
ctx =
new XmlApplicationContext("assembly://Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Config/AopConfiguration.xml");
#if NH_2_0
ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate.Config/AopConfiguration.xml");
#else
ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Config/AopConfiguration.xml");
#endif
}

7
test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/HibernateTransactionManagerTests.cs
View File

@@ -379,7 +379,11 @@ namespace Spring.Data.NHibernate
LastCall.On(session).Repeat.Twice();
transaction.Commit();
LastCall.On(transaction).Repeat.Once();
#if NH_2_0
Expect.Call(session.Close()).Return(null).Repeat.Once();
#else
Expect.Call(session.Close()).Return(null).Repeat.Twice();
#endif
//}
mocks.ReplayAll();
@@ -413,7 +417,10 @@ namespace Spring.Data.NHibernate
LastCall.IgnoreArguments();
session.FlushMode = FlushMode.Never;
Expect.Call(session.FlushMode).Return(FlushMode.Never);
#if NH_2_0
#else
Expect.Call(session.Close()).Return(null);
#endif
mocks.ReplayAll();

10
test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs
View File

@@ -47,14 +47,17 @@ namespace Spring.Data.NHibernate
LocalSessionFactoryObject sfo = new LocalSessionFactoryObject();
sfo.DbProvider = dbProvider;
IDictionary properties = new Hashtable();
properties.Add("hibernate.connection.driver_class", "NHibernate.Driver.SqlClientDriver");
properties.Add("hibernate.connection.provider", "NHibernate.Connection.DriverConnectionProvider");
properties.Add(Environment.Dialect, "NHibernate.Dialect.MsSql2000Dialect");
properties.Add(Environment.ConnectionDriver, "NHibernate.Driver.SqlClientDriver");
properties.Add(Environment.ConnectionProvider, "NHibernate.Connection.DriverConnectionProvider");
sfo.HibernateProperties = properties;
sfo.AfterPropertiesSet();
Assert.IsNotNull(sfo.Configuration);
Assert.AreEqual(sfo.Configuration.Properties[Environment.ConnectionProvider].ToString(),
Assert.AreEqual(sfo.Configuration.Properties[Environment.ConnectionProvider],
"NHibernate.Connection.DriverConnectionProvider");
Assert.AreEqual(sfo.Configuration.Properties[Environment.Dialect],
"NHibernate.Dialect.MsSql2000Dialect");
}
[Test]
@@ -73,6 +76,7 @@ namespace Spring.Data.NHibernate
{
LocalSessionFactoryObject sfo = new LocalSessionFactoryObject();
IDictionary properties = new Hashtable();
properties.Add(Environment.Dialect, "NHibernate.Dialect.MsSql2000Dialect");
properties.Add(Environment.ConnectionProvider, "myClass");
sfo.HibernateProperties = properties;
sfo.AfterPropertiesSet();

6
test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/TestObject.cs
View File

@@ -47,19 +47,19 @@ namespace Spring.Data.NHibernate
#region Properties
public int Age
public virtual int Age
{
get { return age; }
set { age = value; }
}
public string Name
public virtual string Name
{
get { return name; }
set { name = value; }
}
public int ObjectNumber
public virtual int ObjectNumber
{
get { return objectNumber; }
set { objectNumber = value; }