nhibernate-commit

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

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

Modified Files:
	SqlDeleteBuilderFixture.cs SqlInsertBuilderFixture.cs 
	SqlSelectBuilderFixture.cs SqlSimpleSelectBuilderFixture.cs 
	SqlStringParameterFixture.cs SqlUpdateBuilderFixture.cs 
Log Message:
Updated test with changes made to how IDbCommands are prepared.

Index: SqlDeleteBuilderFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlDeleteBuilderFixture.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SqlDeleteBuilderFixture.cs	30 Apr 2004 04:43:08 -0000	1.2
--- SqlDeleteBuilderFixture.cs	19 Jul 2004 03:25:25 -0000	1.3
***************
*** 52,66 ****
  
  			Parameter firstParam = new Parameter();
! 			firstParam.DbType = DbType.Decimal;
  			firstParam.Name = "decimalColumn";
  		
  			Parameter secondParam = new Parameter();
! 			secondParam.DbType = DbType.Int32;
  			secondParam.Name = "versionColumn";
  
! 			Assertion.AssertEquals("firstParam Type", firstParam.DbType, actualParams[0].DbType);
  			Assertion.AssertEquals("firstParam Name", firstParam.Name, actualParams[0].Name);
  
! 			Assertion.AssertEquals("secondParam Type", secondParam.DbType, actualParams[1].DbType);
  			Assertion.AssertEquals("secondParam Name", secondParam.Name, actualParams[1].Name);
  
--- 52,66 ----
  
  			Parameter firstParam = new Parameter();
! 			firstParam.SqlType = new SqlTypes.DecimalSqlType();
  			firstParam.Name = "decimalColumn";
  		
  			Parameter secondParam = new Parameter();
! 			secondParam.SqlType = new SqlTypes.Int32SqlType();
  			secondParam.Name = "versionColumn";
  
! 			Assertion.AssertEquals("firstParam Type", firstParam.SqlType.DbType, actualParams[0].SqlType.DbType);
  			Assertion.AssertEquals("firstParam Name", firstParam.Name, actualParams[0].Name);
  
! 			Assertion.AssertEquals("secondParam Type", secondParam.SqlType.DbType, actualParams[1].SqlType.DbType);
  			Assertion.AssertEquals("secondParam Name", secondParam.Name, actualParams[1].Name);
  

Index: SqlSimpleSelectBuilderFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlSimpleSelectBuilderFixture.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SqlSimpleSelectBuilderFixture.cs	20 Mar 2004 23:08:55 -0000	1.1
--- SqlSimpleSelectBuilderFixture.cs	19 Jul 2004 03:25:25 -0000	1.2
***************
*** 71,92 ****
  
  			Parameter firstParam = new Parameter();
! 			firstParam.DbType = DbType.Int64;
  			firstParam.Name = "identity_column";
  		
  			Parameter secondParam = new Parameter();
! 			secondParam.DbType = DbType.Int32;
  			secondParam.Name = "version_column";
  
  			Parameter thirdParam = new Parameter();
! 			thirdParam.DbType = DbType.Int32;
  			thirdParam.Name = "where_frag_column";
  
! 			Assertion.AssertEquals("First Parameter Type", firstParam.DbType, actualParams[0].DbType);
  			Assertion.AssertEquals("First Parameter Name", firstParam.Name, actualParams[0].Name);
  
! 			Assertion.AssertEquals("Second Parameter Type", secondParam.DbType, actualParams[1].DbType);
  			Assertion.AssertEquals("Second Parameter Name", secondParam.Name, actualParams[1].Name);
  		
! 			Assertion.AssertEquals("Third Parameter Type", thirdParam.DbType, actualParams[2].DbType);
  			Assertion.AssertEquals("Third Parameter Name", thirdParam.Name, actualParams[2].Name);
  			
--- 71,92 ----
  
  			Parameter firstParam = new Parameter();
! 			firstParam.SqlType = new SqlTypes.Int64SqlType();
  			firstParam.Name = "identity_column";
  		
  			Parameter secondParam = new Parameter();
! 			secondParam.SqlType = new SqlTypes.Int32SqlType();
  			secondParam.Name = "version_column";
  
  			Parameter thirdParam = new Parameter();
! 			thirdParam.SqlType = new SqlTypes.Int32SqlType();
  			thirdParam.Name = "where_frag_column";
  
! 			Assertion.AssertEquals("First Parameter Type", firstParam.SqlType.DbType, actualParams[0].SqlType.DbType);
  			Assertion.AssertEquals("First Parameter Name", firstParam.Name, actualParams[0].Name);
  
! 			Assertion.AssertEquals("Second Parameter Type", secondParam.SqlType.DbType, actualParams[1].SqlType.DbType);
  			Assertion.AssertEquals("Second Parameter Name", secondParam.Name, actualParams[1].Name);
  		
! 			Assertion.AssertEquals("Third Parameter Type", thirdParam.SqlType.DbType, actualParams[2].SqlType.DbType);
  			Assertion.AssertEquals("Third Parameter Name", thirdParam.Name, actualParams[2].Name);
  			

Index: SqlUpdateBuilderFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlUpdateBuilderFixture.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SqlUpdateBuilderFixture.cs	30 Apr 2004 04:43:08 -0000	1.2
--- SqlUpdateBuilderFixture.cs	19 Jul 2004 03:25:25 -0000	1.3
***************
*** 59,87 ****
  			
  			Parameter firstParam = new Parameter();
! 			firstParam.DbType = DbType.Int32;
  			firstParam.Name = "intColumn";
  		
  			Parameter secondParam = new Parameter();
! 			secondParam.DbType = DbType.Int64;
  			secondParam.Name = "longColumn";
  
  			Parameter thirdParam = new Parameter();
! 			thirdParam.DbType = DbType.Decimal;
  			thirdParam.Name = "decimalColumn";
  		
  			Parameter fourthParam = new Parameter();
! 			fourthParam.DbType = DbType.Int32;
  			fourthParam.Name = "versionColumn";
  
! 			Assertion.AssertEquals("firstParam Type", firstParam.DbType, actualParams[0].DbType);
  			Assertion.AssertEquals("firstParam Name", firstParam.Name, actualParams[0].Name);
  
! 			Assertion.AssertEquals("secondParam Type", secondParam.DbType, actualParams[1].DbType);
  			Assertion.AssertEquals("secondParam Name", secondParam.Name, actualParams[1].Name);
  
! 			Assertion.AssertEquals("thirdParam Type", thirdParam.DbType, actualParams[2].DbType);
  			Assertion.AssertEquals("thirdParam Name", thirdParam.Name, actualParams[2].Name);
  
! 			Assertion.AssertEquals("fourthParam Type", fourthParam.DbType, actualParams[3].DbType);
  			Assertion.AssertEquals("fourthParam Name", fourthParam.Name, actualParams[3].Name);
  		
--- 59,87 ----
  			
  			Parameter firstParam = new Parameter();
! 			firstParam.SqlType = new SqlTypes.Int32SqlType();
  			firstParam.Name = "intColumn";
  		
  			Parameter secondParam = new Parameter();
! 			secondParam.SqlType = new SqlTypes.Int64SqlType();
  			secondParam.Name = "longColumn";
  
  			Parameter thirdParam = new Parameter();
! 			thirdParam.SqlType = new SqlTypes.DecimalSqlType();
  			thirdParam.Name = "decimalColumn";
  		
  			Parameter fourthParam = new Parameter();
! 			fourthParam.SqlType = new SqlTypes.Int32SqlType();
  			fourthParam.Name = "versionColumn";
  
! 			Assertion.AssertEquals("firstParam Type", firstParam.SqlType.DbType, actualParams[0].SqlType.DbType);
  			Assertion.AssertEquals("firstParam Name", firstParam.Name, actualParams[0].Name);
  
! 			Assertion.AssertEquals("secondParam Type", secondParam.SqlType.DbType, actualParams[1].SqlType.DbType);
  			Assertion.AssertEquals("secondParam Name", secondParam.Name, actualParams[1].Name);
  
! 			Assertion.AssertEquals("thirdParam Type", thirdParam.SqlType.DbType, actualParams[2].SqlType.DbType);
  			Assertion.AssertEquals("thirdParam Name", thirdParam.Name, actualParams[2].Name);
  
! 			Assertion.AssertEquals("fourthParam Type", fourthParam.SqlType.DbType, actualParams[3].SqlType.DbType);
  			Assertion.AssertEquals("fourthParam Name", fourthParam.Name, actualParams[3].Name);
  		

Index: SqlStringParameterFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlStringParameterFixture.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SqlStringParameterFixture.cs	20 Mar 2004 23:08:55 -0000	1.1
--- SqlStringParameterFixture.cs	19 Jul 2004 03:25:25 -0000	1.2
***************
*** 23,27 ****
  			Parameter cloned = null;
  
! 			original.DbType = DbType.Int32;
  			original.Name = "originalName";
  			
--- 23,27 ----
  			Parameter cloned = null;
  
! 			original.SqlType = new SqlTypes.Int32SqlType();
  			original.Name = "originalName";
  			
***************
*** 29,41 ****
  
  			Assertion.Assert("Not the same object by ==", (original==cloned)==false);
! 			Assertion.AssertEquals("Same DbType", original.DbType, cloned.DbType);
  			Assertion.AssertEquals("Same Name", original.Name, cloned.Name);
  			
  			// change some of the values of the clone to ensure the original doesn't change
  
! 			cloned.DbType = DbType.String;
  			cloned.Name = "Cloned name";
  
! 			Assertion.Assert("Should not the same db type anymore",  cloned.DbType!=original.DbType);
  			Assertion.Assert("Should not the same name anymore",  cloned.Name!=original.Name);
  			
--- 29,41 ----
  
  			Assertion.Assert("Not the same object by ==", (original==cloned)==false);
! 			Assertion.AssertEquals("Same DbType", original.SqlType.DbType, cloned.SqlType.DbType);
  			Assertion.AssertEquals("Same Name", original.Name, cloned.Name);
  			
  			// change some of the values of the clone to ensure the original doesn't change
  
! 			cloned.SqlType = new SqlTypes.StringSqlType();
  			cloned.Name = "Cloned name";
  
! 			Assertion.Assert("Should not the same db type anymore",  cloned.SqlType.DbType!=original.SqlType.DbType);
  			Assertion.Assert("Should not the same name anymore",  cloned.Name!=original.Name);
  			
***************
*** 49,53 ****
  			ParameterLength cloned = null;
  
! 			original.DbType = DbType.String;
  			original.Name = "originalName";
  			original.Length = 275;
--- 49,53 ----
  			ParameterLength cloned = null;
  
! 			original.SqlType = new SqlTypes.StringSqlType(275);
  			original.Name = "originalName";
  			original.Length = 275;
***************
*** 56,60 ****
  
  			Assertion.Assert("Not the same object by ==", (original==cloned)==false);
! 			Assertion.AssertEquals("Same DbType", original.DbType, cloned.DbType);
  			Assertion.AssertEquals("Same Name", original.Name, cloned.Name);
  			Assertion.AssertEquals("Same Length", original.Length, cloned.Length);
--- 56,60 ----
  
  			Assertion.Assert("Not the same object by ==", (original==cloned)==false);
! 			Assertion.AssertEquals("Same DbType", original.SqlType.DbType, cloned.SqlType.DbType);
  			Assertion.AssertEquals("Same Name", original.Name, cloned.Name);
  			Assertion.AssertEquals("Same Length", original.Length, cloned.Length);
***************
*** 62,70 ****
  			// change some of the values of the clone to ensure the original doesn't change
  
! 			cloned.DbType = DbType.AnsiString;
  			cloned.Name = "Cloned name";
  			cloned.Length = 175;
  
! 			Assertion.Assert("Should not the same db type anymore",  cloned.DbType!=original.DbType);
  			Assertion.Assert("Should not the same name anymore",  cloned.Name!=original.Name);
  			Assertion.Assert("Should not the same length anymore",  cloned.Length!=original.Length);
--- 62,70 ----
  			// change some of the values of the clone to ensure the original doesn't change
  
! 			cloned.SqlType = new SqlTypes.AnsiStringSqlType(175);
  			cloned.Name = "Cloned name";
  			cloned.Length = 175;
  
! 			Assertion.Assert("Should not the same db type anymore",  cloned.SqlType.DbType!=original.SqlType.DbType);
  			Assertion.Assert("Should not the same name anymore",  cloned.Name!=original.Name);
  			Assertion.Assert("Should not the same length anymore",  cloned.Length!=original.Length);
***************
*** 78,82 ****
  			ParameterPrecisionScale cloned = null;
  
! 			original.DbType = DbType.Decimal;
  			original.Name = "originalName";
  			original.Precision = 19;
--- 78,82 ----
  			ParameterPrecisionScale cloned = null;
  
! 			original.SqlType = new SqlTypes.DecimalSqlType(19, 5);
  			original.Name = "originalName";
  			original.Precision = 19;
***************
*** 86,90 ****
  
  			Assertion.Assert("Not the same object by ==", (original==cloned)==false);
! 			Assertion.AssertEquals("Same DbType", original.DbType, cloned.DbType);
  			Assertion.AssertEquals("Same Name", original.Name, cloned.Name);
  			Assertion.AssertEquals("Same Precision", original.Precision, cloned.Precision);
--- 86,90 ----
  
  			Assertion.Assert("Not the same object by ==", (original==cloned)==false);
! 			Assertion.AssertEquals("Same DbType", original.SqlType.DbType, cloned.SqlType.DbType);
  			Assertion.AssertEquals("Same Name", original.Name, cloned.Name);
  			Assertion.AssertEquals("Same Precision", original.Precision, cloned.Precision);
***************
*** 95,104 ****
  			// I know AnsiString is not a precision based but for this example we just need
  			// to make sure the clonging is working...
! 			cloned.DbType = DbType.AnsiString;
  			cloned.Name = "Cloned name";
  			cloned.Precision = 15;
  			cloned.Scale = 4;
  
! 			Assertion.Assert("Should not the same db type anymore",  cloned.DbType!=original.DbType);
  			Assertion.Assert("Should not the same name anymore",  cloned.Name!=original.Name);
  			Assertion.Assert("Should not the same Precision anymore",  cloned.Precision!=original.Precision);
--- 95,104 ----
  			// I know AnsiString is not a precision based but for this example we just need
  			// to make sure the clonging is working...
! 			cloned.SqlType = new SqlTypes.AnsiStringSqlType();
  			cloned.Name = "Cloned name";
  			cloned.Precision = 15;
  			cloned.Scale = 4;
  
! 			Assertion.Assert("Should not the same db type anymore",  cloned.SqlType.DbType!=original.SqlType.DbType);
  			Assertion.Assert("Should not the same name anymore",  cloned.Name!=original.Name);
  			Assertion.Assert("Should not the same Precision anymore",  cloned.Precision!=original.Precision);
***************
*** 119,127 ****
  			
  			origParams[0] = new Parameter();
! 			origParams[0].DbType = DbType.Int32;
  			origParams[0].Name = "OP1";
  			
  			origParams[1] = new Parameter();
! 			origParams[1].DbType = DbType.Int64;
  			origParams[1].Name = "OP2";
  
--- 119,127 ----
  			
  			origParams[0] = new Parameter();
! 			origParams[0].SqlType = new SqlTypes.Int32SqlType();
  			origParams[0].Name = "OP1";
  			
  			origParams[1] = new Parameter();
! 			origParams[1].SqlType = new SqlTypes.Int64SqlType();
  			origParams[1].Name = "OP2";
  

Index: SqlSelectBuilderFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlSelectBuilderFixture.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SqlSelectBuilderFixture.cs	20 Mar 2004 23:08:55 -0000	1.1
--- SqlSelectBuilderFixture.cs	19 Jul 2004 03:25:25 -0000	1.2
***************
*** 66,74 ****
  
  			Parameter firstParam = new Parameter();
! 			firstParam.DbType = DbType.Int64;
  			firstParam.TableAlias = "select_test_alias";
  			firstParam.Name = "identity_column";
  
! 			Assertion.AssertEquals("First Parameter Type", firstParam.DbType, expectedParam.DbType);
  			Assertion.AssertEquals("First Parameter TableAlias", firstParam.TableAlias, expectedParam.TableAlias);
  			Assertion.AssertEquals("First Parameter Name", firstParam.Name, expectedParam.Name);
--- 66,74 ----
  
  			Parameter firstParam = new Parameter();
! 			firstParam.SqlType = new SqlTypes.Int64SqlType();
  			firstParam.TableAlias = "select_test_alias";
  			firstParam.Name = "identity_column";
  
! 			Assertion.AssertEquals("First Parameter Type", firstParam.SqlType.DbType, expectedParam.SqlType.DbType);
  			Assertion.AssertEquals("First Parameter TableAlias", firstParam.TableAlias, expectedParam.TableAlias);
  			Assertion.AssertEquals("First Parameter Name", firstParam.Name, expectedParam.Name);

Index: SqlInsertBuilderFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlInsertBuilderFixture.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SqlInsertBuilderFixture.cs	20 Mar 2004 23:08:55 -0000	1.1
--- SqlInsertBuilderFixture.cs	19 Jul 2004 03:25:25 -0000	1.2
***************
*** 53,67 ****
  
  			Parameter firstParam = new Parameter();
! 			firstParam.DbType = DbType.Int32;
  			firstParam.Name = "intColumn";
  		
  			Parameter secondParam = new Parameter();
! 			secondParam.DbType = DbType.Int64;
  			secondParam.Name = "longColumn";
  
! 			Assertion.AssertEquals("First Parameter Type", firstParam.DbType, actualParams[0].DbType);
  			Assertion.AssertEquals("First Parameter Name", firstParam.Name, actualParams[0].Name);
  
! 			Assertion.AssertEquals("Second Parameter Type", secondParam.DbType, actualParams[1].DbType);
  			Assertion.AssertEquals("Second Parameter Name", secondParam.Name, actualParams[1].Name);
  		
--- 53,67 ----
  
  			Parameter firstParam = new Parameter();
! 			firstParam.SqlType = new SqlTypes.Int32SqlType();
  			firstParam.Name = "intColumn";
  		
  			Parameter secondParam = new Parameter();
! 			secondParam.SqlType = new SqlTypes.Int64SqlType();
  			secondParam.Name = "longColumn";
  
! 			Assertion.AssertEquals("First Parameter Type", firstParam.SqlType.DbType, actualParams[0].SqlType.DbType);
  			Assertion.AssertEquals("First Parameter Name", firstParam.Name, actualParams[0].Name);
  
! 			Assertion.AssertEquals("Second Parameter Type", secondParam.SqlType.DbType, actualParams[1].SqlType.DbType);
  			Assertion.AssertEquals("Second Parameter Name", secondParam.Name, actualParams[1].Name);