[Nhibernate-commit] nhibernate/src/NHibernate.Test/ExpressionTest BaseExpressionFixture.cs,1.2,1.3 JunctionFixture.cs,1.1,1.2

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11729/NHibernate.Test/ExpressionTest

Modified Files:
	BaseExpressionFixture.cs JunctionFixture.cs 
Log Message:
Added test for GetTypedValue
Made SetUp() in BaseExpressionFixture virtual.

Index: BaseExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/BaseExpressionFixture.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BaseExpressionFixture.cs	16 Apr 2004 14:04:58 -0000	1.2
--- BaseExpressionFixture.cs	28 Jun 2004 18:59:06 -0000	1.3
***************
*** 20,24 ****
  		
  		[SetUp]
! 		public void SetUp() 
  		{
  			Configuration cfg = new Configuration();
--- 20,24 ----
  		
  		[SetUp]
! 		public virtual void SetUp() 
  		{
  			Configuration cfg = new Configuration();

Index: JunctionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/JunctionFixture.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JunctionFixture.cs	20 Mar 2004 23:08:55 -0000	1.1
--- JunctionFixture.cs	28 Jun 2004 18:59:06 -0000	1.2
***************
*** 23,44 ****
  	public class JunctionFixture : BaseExpressionFixture
  	{
  		
! 		[Test]
! 		public void JunctionSqlStringTest()
  		{
! 			
! 			ISession session = factory.OpenSession();
! 			
! 			NExpression.Conjunction conjunction = NExpression.Expression.Conjunction();
! 			conjunction.Add(NExpression.Expression.IsNull("Address"))
  				.Add(NExpression.Expression.Between("Count", 5, 10));
  
! 			SqlString sqlString = conjunction.ToSqlString(factoryImpl, typeof(Simple), "simple_alias");
! 
  			string expectedSql = "(simple_alias.address IS NULL and simple_alias.count_ between :simple_alias.count__lo and :simple_alias.count__hi)";
  			
  			CompareSqlStrings(sqlString, expectedSql, 2);
  	
! 			session.Close();
  		}
  
--- 23,64 ----
  	public class JunctionFixture : BaseExpressionFixture
  	{
+ 		NExpression.Conjunction _conjunction;
  		
! 		[SetUp]
! 		public override void SetUp() 
  		{
! 			base.SetUp();
! 			_conjunction = NExpression.Expression.Conjunction();
! 			_conjunction.Add(NExpression.Expression.IsNull("Address"))
  				.Add(NExpression.Expression.Between("Count", 5, 10));
+ 		}
  
! 		[Test]
! 		public void SqlString()
! 		{
! 			SqlString sqlString = _conjunction.ToSqlString(factoryImpl, typeof(Simple), "simple_alias");
! 			
  			string expectedSql = "(simple_alias.address IS NULL and simple_alias.count_ between :simple_alias.count__lo and :simple_alias.count__hi)";
  			
  			CompareSqlStrings(sqlString, expectedSql, 2);
  	
! 		}
! 
! 		[Test]
! 		public void GetTypedValues() 
! 		{
! 			TypedValue[] typedValues = _conjunction.GetTypedValues( factoryImpl, typeof(Simple) );
! 
! 			TypedValue[] expectedTV = new TypedValue[2];
! 			expectedTV[0] = new TypedValue(Type.TypeFactory.GetInt32Type(), 5);
! 			expectedTV[1] = new TypedValue(Type.TypeFactory.GetInt32Type(), 10);
! 
! 			Assert.AreEqual(2, typedValues.Length);
! 
! 			for(int i=0; i<typedValues.Length; i++) 
! 			{
! 				Assert.AreEqual(expectedTV[i].Type, typedValues[i].Type);
! 				Assert.AreEqual(expectedTV[i].Value, typedValues[i].Value);
! 			}
  		}