[Nhibernate-commit] nhibernate/src/NHibernate.Test/ExpressionTest BetweenExpressionFixture.cs,1.1,1.2 InExpressionFixture.cs,1.1,1.2 InsensitiveLikeExpressionFixture.cs,1.1,1.2 NotExpressionFixture.cs,1.1,1.2 SimpleExpressionFixture.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-serv15450/NHibernate.Test/ExpressionTest

Modified Files:
	BetweenExpressionFixture.cs InExpressionFixture.cs 
	InsensitiveLikeExpressionFixture.cs NotExpressionFixture.cs 
	SimpleExpressionFixture.cs 
Log Message:
Updated test with changes made to how IDbCommands are prepared.

Index: BetweenExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/BetweenExpressionFixture.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BetweenExpressionFixture.cs	20 Mar 2004 23:08:55 -0000	1.1
--- BetweenExpressionFixture.cs	19 Jul 2004 03:25:25 -0000	1.2
***************
*** 32,36 ****
  
  			Parameter firstBetweenParam = new Parameter();
! 			firstBetweenParam.DbType = DbType.Int32;
  			firstBetweenParam.TableAlias = "simple_alias";
  			firstBetweenParam.Name = "count__lo";
--- 32,36 ----
  
  			Parameter firstBetweenParam = new Parameter();
! 			firstBetweenParam.SqlType = new SqlTypes.Int32SqlType(); 
  			firstBetweenParam.TableAlias = "simple_alias";
  			firstBetweenParam.Name = "count__lo";
***************
*** 38,42 ****
  			
  			Parameter secondBetweenParam = new Parameter();
! 			secondBetweenParam.DbType = DbType.Int32;
  			secondBetweenParam.TableAlias = "simple_alias";
  			secondBetweenParam.Name = "count__hi";
--- 38,42 ----
  			
  			Parameter secondBetweenParam = new Parameter();
! 			secondBetweenParam.SqlType = new SqlTypes.Int32SqlType();
  			secondBetweenParam.TableAlias = "simple_alias";
  			secondBetweenParam.Name = "count__hi";

Index: SimpleExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/SimpleExpressionFixture.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SimpleExpressionFixture.cs	20 Mar 2004 23:08:55 -0000	1.1
--- SimpleExpressionFixture.cs	19 Jul 2004 03:25:25 -0000	1.2
***************
*** 27,31 ****
  		public void SimpleSqlStringTest() 
  		{
- 			
  			ISession session = factory.OpenSession();
  			
--- 27,30 ----
***************
*** 37,44 ****
  			Parameter[] expectedParams = new Parameter[1];
  			
! 			ParameterLength firstAndParam = new ParameterLength();
! 			firstAndParam.DbType = DbType.String;
  			firstAndParam.TableAlias = "simple_alias";
- 			firstAndParam.Length = 200;
  			firstAndParam.Name = "address";
  
--- 36,46 ----
  			Parameter[] expectedParams = new Parameter[1];
  			
! 			// even though a String parameter is a Size based Parameter it will not
! 			// be a ParameterLength unless in the mapping file it is defined as
! 			// type="String(200)" -> in the mapping file it is now defined as 
! 			// type="String" length="200"
! 			Parameter firstAndParam = new Parameter();
! 			firstAndParam.SqlType = new SqlTypes.StringSqlType();
  			firstAndParam.TableAlias = "simple_alias";
  			firstAndParam.Name = "address";
  

Index: InExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/InExpressionFixture.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InExpressionFixture.cs	20 Mar 2004 23:08:55 -0000	1.1
--- InExpressionFixture.cs	19 Jul 2004 03:25:25 -0000	1.2
***************
*** 36,40 ****
  			{
  				Parameter param = new Parameter();
! 				param.DbType = DbType.Int32;
  				param.TableAlias = "simple_alias";
  				param.Name = "count_" + "_" + i;
--- 36,40 ----
  			{
  				Parameter param = new Parameter();
! 				param.SqlType = new SqlTypes.Int32SqlType();
  				param.TableAlias = "simple_alias";
  				param.Name = "count_" + "_" + i;

Index: InsensitiveLikeExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/InsensitiveLikeExpressionFixture.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InsensitiveLikeExpressionFixture.cs	20 Mar 2004 23:08:55 -0000	1.1
--- InsensitiveLikeExpressionFixture.cs	19 Jul 2004 03:25:25 -0000	1.2
***************
*** 32,41 ****
  			Parameter[] expectedParams = new Parameter[1];
  
! 			ParameterLength firstParam = new ParameterLength();
! 			firstParam.DbType = DbType.String;
  			firstParam.TableAlias = "simple_alias";
  			firstParam.Name = "address";
! 			firstParam.Length = 200;
! 
  			expectedParams[0] = firstParam;
  
--- 32,40 ----
  			Parameter[] expectedParams = new Parameter[1];
  
! 			Parameter firstParam = new Parameter();
! 			firstParam.SqlType = new SqlTypes.StringSqlType();
  			firstParam.TableAlias = "simple_alias";
  			firstParam.Name = "address";
! 			
  			expectedParams[0] = firstParam;
  

Index: NotExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/NotExpressionFixture.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NotExpressionFixture.cs	20 Mar 2004 23:08:55 -0000	1.1
--- NotExpressionFixture.cs	19 Jul 2004 03:25:25 -0000	1.2
***************
*** 31,35 ****
  			
  			Parameter firstParam = new Parameter();
! 			firstParam.DbType = DbType.String;
  			firstParam.TableAlias = "simple_alias";
  			firstParam.Name = "address";
--- 31,35 ----
  			
  			Parameter firstParam = new Parameter();
! 			firstParam.SqlType = new SqlTypes.StringSqlType();
  			firstParam.TableAlias = "simple_alias";
  			firstParam.Name = "address";