[Nhibernate-commit] nhibernate/src/NHibernate.Test/ExpressionTest BetweenExpressionFixture.cs,1.2,1.3 InExpressionFixture.cs,1.2,1.3 InsensitiveLikeExpressionFixture.cs,1.2,1.3 NotExpressionFixture.cs,1.2,1.3 SimpleExpressionFixture.cs,1.4,1.5 SQLExpressionFixture.cs,1.2,1.3

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

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

Modified Files:
	BetweenExpressionFixture.cs InExpressionFixture.cs 
	InsensitiveLikeExpressionFixture.cs NotExpressionFixture.cs 
	SimpleExpressionFixture.cs SQLExpressionFixture.cs 
Log Message:
Parameter classes are now immutable.  All values must be set in the ctor.
Added some test for Equals method of Parameter.

Index: BetweenExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/BetweenExpressionFixture.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BetweenExpressionFixture.cs	19 Jul 2004 03:25:25 -0000	1.2
--- BetweenExpressionFixture.cs	30 Jan 2005 19:39:52 -0000	1.3
***************
*** 31,44 ****
  			Parameter[] expectedParams = new Parameter[2];
  
! 			Parameter firstBetweenParam = new Parameter();
! 			firstBetweenParam.SqlType = new SqlTypes.Int32SqlType(); 
! 			firstBetweenParam.TableAlias = "simple_alias";
! 			firstBetweenParam.Name = "count__lo";
  			expectedParams[0] = firstBetweenParam;
  			
! 			Parameter secondBetweenParam = new Parameter();
! 			secondBetweenParam.SqlType = new SqlTypes.Int32SqlType();
! 			secondBetweenParam.TableAlias = "simple_alias";
! 			secondBetweenParam.Name = "count__hi";
  			expectedParams[1] = secondBetweenParam;
  
--- 31,38 ----
  			Parameter[] expectedParams = new Parameter[2];
  
! 			Parameter firstBetweenParam = new Parameter( "count__lo", "simple_alias", new SqlTypes.Int32SqlType() );
  			expectedParams[0] = firstBetweenParam;
  			
! 			Parameter secondBetweenParam = new Parameter( "count__hi", "simple_alias", new SqlTypes.Int32SqlType() );
  			expectedParams[1] = secondBetweenParam;
  

Index: InExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/InExpressionFixture.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InExpressionFixture.cs	19 Jul 2004 03:25:25 -0000	1.2
--- InExpressionFixture.cs	30 Jan 2005 19:39:52 -0000	1.3
***************
*** 35,42 ****
  			for(int i = 0 ; i < expectedParams.Length; i++) 
  			{
! 				Parameter param = new Parameter();
! 				param.SqlType = new SqlTypes.Int32SqlType();
! 				param.TableAlias = "simple_alias";
! 				param.Name = "count_" + "_" + i;
  				expectedParams[i] = param;
  			}
--- 35,39 ----
  			for(int i = 0 ; i < expectedParams.Length; i++) 
  			{
! 				Parameter param = new Parameter( "count_" + "_" + i, "simple_alias", new SqlTypes.Int32SqlType() );
  				expectedParams[i] = param;
  			}

Index: InsensitiveLikeExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/InsensitiveLikeExpressionFixture.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InsensitiveLikeExpressionFixture.cs	19 Jul 2004 03:25:25 -0000	1.2
--- InsensitiveLikeExpressionFixture.cs	30 Jan 2005 19:39:52 -0000	1.3
***************
*** 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;
  
--- 32,36 ----
  			Parameter[] expectedParams = new Parameter[1];
  
! 			Parameter firstParam = new Parameter( "address", "simple_alias", new SqlTypes.StringSqlType() );
  			expectedParams[0] = firstParam;
  

Index: SQLExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/SQLExpressionFixture.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SQLExpressionFixture.cs	17 Jan 2005 03:40:51 -0000	1.2
--- SQLExpressionFixture.cs	30 Jan 2005 19:39:52 -0000	1.3
***************
*** 57,63 ****
  			Parameter[] expectedParams = new Parameter[1];
  			
! 			Parameter firstAndParam = new Parameter();
! 			firstAndParam.SqlType = new SqlTypes.StringSqlType();
! 			firstAndParam.Name = "address";
  			expectedParams[0] = firstAndParam;
  
--- 57,61 ----
  			Parameter[] expectedParams = new Parameter[1];
  			
! 			Parameter firstAndParam = new Parameter( "address", new SqlTypes.StringSqlType() );
  			expectedParams[0] = firstAndParam;
  

Index: SimpleExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/SimpleExpressionFixture.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SimpleExpressionFixture.cs	18 Nov 2004 02:47:00 -0000	1.4
--- SimpleExpressionFixture.cs	30 Jan 2005 19:39:52 -0000	1.5
***************
*** 42,50 ****
  			// 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";
! 
  			expectedParams[0] = firstAndParam;
  
--- 42,46 ----
  			// type="String(200)" -> in the mapping file it is now defined as 
  			// type="String" length="200"
! 			Parameter firstAndParam = new Parameter( "address", "simple_alias", new SqlTypes.StringSqlType() );
  			expectedParams[0] = firstAndParam;
  
***************
*** 83,91 ****
  			Parameter[] expectedParams = new Parameter[1];
  			
! 			Parameter firstAndParam = new Parameter();
! 			firstAndParam.SqlType = new SqlTypes.DateTimeSqlType();
! 			firstAndParam.TableAlias = "simple_alias";
! 			firstAndParam.Name = "date_";
! 
  			expectedParams[0] = firstAndParam;
  
--- 79,83 ----
  			Parameter[] expectedParams = new Parameter[1];
  			
! 			Parameter firstAndParam = new Parameter( "date_", "simple_alias", new SqlTypes.DateTimeSqlType() );
  			expectedParams[0] = firstAndParam;
  

Index: NotExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/NotExpressionFixture.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NotExpressionFixture.cs	19 Jul 2004 03:25:25 -0000	1.2
--- NotExpressionFixture.cs	30 Jan 2005 19:39:52 -0000	1.3
***************
*** 30,38 ****
  			string expectedSql = "not simple_alias.address = :simple_alias.address";
  			
! 			Parameter firstParam = new Parameter();
! 			firstParam.SqlType = new SqlTypes.StringSqlType();
! 			firstParam.TableAlias = "simple_alias";
! 			firstParam.Name = "address";
! 
  			CompareSqlStrings(sqlString, expectedSql, new Parameter[] {firstParam});
  			
--- 30,34 ----
  			string expectedSql = "not simple_alias.address = :simple_alias.address";
  			
! 			Parameter firstParam = new Parameter( "address", "simple_alias", new SqlTypes.StringSqlType() );
  			CompareSqlStrings(sqlString, expectedSql, new Parameter[] {firstParam});