From: Michael D. <mik...@us...> - 2005-01-30 19:40:45
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SqlCommandTest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv536/NHibernate.Test/SqlCommandTest Modified Files: SqlDeleteBuilderFixture.cs SqlInsertBuilderFixture.cs SqlSelectBuilderFixture.cs SqlSimpleSelectBuilderFixture.cs SqlStringFixture.cs SqlStringParameterFixture.cs SqlUpdateBuilderFixture.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: SqlStringFixture.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlStringFixture.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SqlStringFixture.cs 13 Sep 2004 07:11:05 -0000 1.5 --- SqlStringFixture.cs 30 Jan 2005 19:39:52 -0000 1.6 *************** *** 48,54 **** { SqlStringBuilder builder = new SqlStringBuilder(); ! Parameter param = new Parameter(); ! param.Name = "id"; ! param.SqlType = new SqlTypes.Int32SqlType(); builder.Add("select from table "); --- 48,52 ---- { SqlStringBuilder builder = new SqlStringBuilder(); ! Parameter param = new Parameter( "id", new SqlTypes.Int32SqlType() ); builder.Add("select from table "); *************** *** 70,77 **** public void CompactWithNoString() { ! Parameter p1 = new Parameter(); ! Parameter p2 = new Parameter(); ! p1.Name = "p1"; ! p2.Name = "p2"; SqlString sql = new SqlString( new object[] {p1, p2} ); --- 68,73 ---- public void CompactWithNoString() { ! Parameter p1 = new Parameter( "p1" ); ! Parameter p2 = new Parameter( "p2" ); SqlString sql = new SqlString( new object[] {p1, p2} ); *************** *** 93,100 **** public void ContainsUntypedParameterWithParam() { ! Parameter p1 = new Parameter(); ! p1.SqlType = new SqlTypes.Int32SqlType(); ! p1.Name = "p1"; ! SqlString sql = new SqlString( new object[] {"select", " from table where a = ", p1} ); Assert.IsFalse( sql.ContainsUntypedParameter ); --- 89,94 ---- public void ContainsUntypedParameterWithParam() { ! Parameter p1 = new Parameter( "p1", new SqlTypes.Int32SqlType() ); ! SqlString sql = new SqlString( new object[] {"select", " from table where a = ", p1} ); Assert.IsFalse( sql.ContainsUntypedParameter ); *************** *** 105,109 **** { ! SqlString sql = new SqlString( new object[] {"select", " from table where a = ", new Parameter()} ); Assert.IsTrue( sql.ContainsUntypedParameter ); } --- 99,103 ---- { ! SqlString sql = new SqlString( new object[] {"select", " from table where a = ", new Parameter( "p1" )} ); Assert.IsTrue( sql.ContainsUntypedParameter ); } *************** *** 112,120 **** public void ContainsUntypedParameterWithMixedUntypedParam() { ! Parameter p1 = new Parameter(); ! p1.SqlType = new SqlTypes.Int32SqlType(); ! p1.Name = "p1"; ! ! SqlString sql = new SqlString( new object[] {"select", " from table where a = ", new Parameter(), " and b = " , p1} ); Assert.IsTrue( sql.ContainsUntypedParameter ); } --- 106,112 ---- public void ContainsUntypedParameterWithMixedUntypedParam() { ! Parameter p1 = new Parameter( "p1", new SqlTypes.Int32SqlType() ); ! ! SqlString sql = new SqlString( new object[] {"select", " from table where a = ", new Parameter( "p2" ), " and b = " , p1} ); Assert.IsTrue( sql.ContainsUntypedParameter ); } *************** *** 123,127 **** public void Count() { ! SqlString sql = new SqlString( new object[] {"select", " from table where a = ", new Parameter(), " and b = " , new Parameter() } ); Assert.AreEqual( 5, sql.Count, "Count with no nesting failed." ); --- 115,119 ---- public void Count() { ! SqlString sql = new SqlString( new object[] {"select", " from table where a = ", new Parameter( "p1" ), " and b = " , new Parameter( "p2" ) } ); Assert.AreEqual( 5, sql.Count, "Count with no nesting failed." ); *************** *** 155,159 **** public void EndsWithParameter() { ! SqlString sql = new SqlString( new object[] { "", "select", " from table where id = ", new Parameter() } ); Assert.IsFalse( sql.EndsWith("'") ); Assert.IsFalse( sql.EndsWith("") ); --- 147,151 ---- public void EndsWithParameter() { ! SqlString sql = new SqlString( new object[] { "", "select", " from table where id = ", new Parameter( "p1" ) } ); Assert.IsFalse( sql.EndsWith("'") ); Assert.IsFalse( sql.EndsWith("") ); *************** *** 171,178 **** public void ParameterIndexOneParam() { ! SqlString sql = new SqlString( new object[] {"select ", "from table ", "where a = ", new Parameter() } ); Assert.AreEqual( 1, sql.ParameterIndexes.Length ); ! Assert.AreEqual( 3, sql.ParameterIndexes[0] ); } --- 163,170 ---- public void ParameterIndexOneParam() { ! SqlString sql = new SqlString( new object[] {"select ", "from table ", "where a = ", new Parameter( "p1" ) } ); Assert.AreEqual( 1, sql.ParameterIndexes.Length ); ! Assert.AreEqual( 3, sql.ParameterIndexes[0], "the first param should be at index 3" ); } *************** *** 181,189 **** public void ParameterIndexManyParam() { ! SqlString sql = new SqlString( new object[] {"select ", "from table ", "where a = ", new Parameter(), " and c = ", new Parameter() } ); Assert.AreEqual( 2, sql.ParameterIndexes.Length ); ! Assert.AreEqual( 3, sql.ParameterIndexes[0] ); ! Assert.AreEqual( 5, sql.ParameterIndexes[1] ); } --- 173,181 ---- public void ParameterIndexManyParam() { ! SqlString sql = new SqlString( new object[] {"select ", "from table ", "where a = ", new Parameter( "p1" ), " and c = ", new Parameter( "p2" ) } ); Assert.AreEqual( 2, sql.ParameterIndexes.Length ); ! Assert.AreEqual( 3, sql.ParameterIndexes[0], "the first param should be at index 3" ); ! Assert.AreEqual( 5, sql.ParameterIndexes[1], "the second param should be at index 5" ); } *************** *** 191,195 **** public void Replace() { ! SqlString sql = new SqlString( new object[] {"select ", "from table ", "where a = ", new Parameter(), " and c = ", new Parameter() } ); SqlString replacedSql = sql.Replace( "table", "replacedTable" ); --- 183,187 ---- public void Replace() { ! SqlString sql = new SqlString( new object[] {"select ", "from table ", "where a = ", new Parameter( "p1" ), " and c = ", new Parameter( "p2" ) } ); SqlString replacedSql = sql.Replace( "table", "replacedTable" ); *************** *** 227,233 **** { SqlStringBuilder builder = new SqlStringBuilder(); ! Parameter p = new Parameter(); ! p.Name = "p1"; ! builder.Add(" select from table"); builder.Add(" where p = "); --- 219,224 ---- { SqlStringBuilder builder = new SqlStringBuilder(); ! Parameter p = new Parameter( "p1" ); ! builder.Add(" select from table"); builder.Add(" where p = "); *************** *** 255,261 **** public void TrimBeginParamEndString() { ! Parameter p1 = new Parameter(); ! p1.Name = "p1"; ! SqlString sql = new SqlString( new object[] {p1, " extra space "} ); sql = sql.Trim(); --- 246,251 ---- public void TrimBeginParamEndString() { ! Parameter p1 = new Parameter( "p1" ); ! SqlString sql = new SqlString( new object[] {p1, " extra space "} ); sql = sql.Trim(); *************** *** 267,273 **** public void TrimBeginStringEndParam() { ! Parameter p1 = new Parameter(); ! p1.Name = "p1"; ! SqlString sql = new SqlString( new object[] { " extra space ", p1 } ); sql = sql.Trim(); --- 257,262 ---- public void TrimBeginStringEndParam() { ! Parameter p1 = new Parameter( "p1" ); ! SqlString sql = new SqlString( new object[] { " extra space ", p1 } ); sql = sql.Trim(); *************** *** 279,286 **** public void TrimAllParam() { ! Parameter p1 = new Parameter(); ! p1.Name = "p1"; ! Parameter p2 = new Parameter(); ! p2.Name = "p2"; SqlString sql = new SqlString( new object[] { p1, p2 } ); --- 268,273 ---- public void TrimAllParam() { ! Parameter p1 = new Parameter( "p1" ); ! Parameter p2 = new Parameter( "p2" ); SqlString sql = new SqlString( new object[] { p1, p2 } ); Index: SqlDeleteBuilderFixture.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlDeleteBuilderFixture.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SqlDeleteBuilderFixture.cs 17 Jan 2005 03:40:53 -0000 1.5 --- SqlDeleteBuilderFixture.cs 30 Jan 2005 19:39:52 -0000 1.6 *************** *** 51,62 **** ! Parameter firstParam = new Parameter(); ! firstParam.SqlType = new SqlTypes.DecimalSqlType(); ! firstParam.Name = "decimalColumn"; ! ! Parameter secondParam = new Parameter(); ! secondParam.SqlType = new SqlTypes.Int32SqlType(); ! secondParam.Name = "versionColumn"; ! Assert.AreEqual(firstParam.SqlType.DbType, actualParams[0].SqlType.DbType, "firstParam Type"); Assert.AreEqual(firstParam.Name, actualParams[0].Name, "firstParam Name"); --- 51,58 ---- ! Parameter firstParam = new Parameter( "decimalColumn", new SqlTypes.DecimalSqlType() ); ! ! Parameter secondParam = new Parameter( "versionColumn", new SqlTypes.Int32SqlType()); ! Assert.AreEqual(firstParam.SqlType.DbType, actualParams[0].SqlType.DbType, "firstParam Type"); Assert.AreEqual(firstParam.Name, actualParams[0].Name, "firstParam Name"); Index: SqlSimpleSelectBuilderFixture.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlSimpleSelectBuilderFixture.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SqlSimpleSelectBuilderFixture.cs 17 Jan 2005 03:40:53 -0000 1.4 --- SqlSimpleSelectBuilderFixture.cs 30 Jan 2005 19:39:52 -0000 1.5 *************** *** 70,85 **** Assert.AreEqual(3, numOfParameters, "3 parameters"); ! 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"; ! Assert.AreEqual(firstParam.SqlType.DbType, actualParams[0].SqlType.DbType, "First Parameter Type"); Assert.AreEqual(firstParam.Name, actualParams[0].Name, "First Parameter Name"); --- 70,79 ---- Assert.AreEqual(3, numOfParameters, "3 parameters"); ! Parameter firstParam = new Parameter( "identity_column", new SqlTypes.Int64SqlType() ); ! ! Parameter secondParam = new Parameter( "version_column", new SqlTypes.Int32SqlType() ); ! ! Parameter thirdParam = new Parameter( "where_frag_column", new SqlTypes.Int32SqlType() ); ! Assert.AreEqual(firstParam.SqlType.DbType, actualParams[0].SqlType.DbType, "First Parameter Type"); Assert.AreEqual(firstParam.Name, actualParams[0].Name, "First Parameter Name"); Index: SqlUpdateBuilderFixture.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlUpdateBuilderFixture.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SqlUpdateBuilderFixture.cs 17 Jan 2005 03:40:53 -0000 1.5 --- SqlUpdateBuilderFixture.cs 30 Jan 2005 19:39:52 -0000 1.6 *************** *** 58,77 **** ! 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"; ! Assert.AreEqual(firstParam.SqlType.DbType, actualParams[0].SqlType.DbType, "firstParam Type"); Assert.AreEqual(firstParam.Name, actualParams[0].Name, "firstParam Name"); --- 58,69 ---- ! Parameter firstParam = new Parameter( "intColumn", new SqlTypes.Int32SqlType() ); ! ! Parameter secondParam = new Parameter( "longColumn", new SqlTypes.Int64SqlType() ); ! ! Parameter thirdParam = new Parameter( "decimalColumn", new SqlTypes.DecimalSqlType() ); ! ! Parameter fourthParam = new Parameter( "versionColumn", new SqlTypes.Int32SqlType() ); ! Assert.AreEqual(firstParam.SqlType.DbType, actualParams[0].SqlType.DbType, "firstParam Type"); Assert.AreEqual(firstParam.Name, actualParams[0].Name, "firstParam Name"); Index: SqlStringParameterFixture.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlStringParameterFixture.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SqlStringParameterFixture.cs 20 Sep 2004 17:46:01 -0000 1.3 --- SqlStringParameterFixture.cs 30 Jan 2005 19:39:52 -0000 1.4 *************** *** 16,44 **** public class SqlStringParameterFixture { ! [Test] ! public void TestParameterClone() { ! Parameter original = new Parameter(); ! Parameter cloned = null; ! original.SqlType = new SqlTypes.Int32SqlType(); ! original.Name = "originalName"; ! cloned = (Parameter)original.Clone(); ! Assert.IsTrue((original==cloned)==false, "Not the same object by =="); ! Assert.AreEqual(original.SqlType.DbType, cloned.SqlType.DbType, "Same DbType"); ! Assert.AreEqual(original.Name, cloned.Name, "Same 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"; ! Assert.IsTrue(cloned.SqlType.DbType!=original.SqlType.DbType, "Should not the same db type anymore"); ! Assert.IsTrue(cloned.Name!=original.Name, "Should not the same name anymore"); } --- 16,126 ---- public class SqlStringParameterFixture { ! /* ! * "The equals() method implements an equivalence relation: ! - It is reflexive: For any reference value x, x.equals(x) should return true ! - It is symmetric: For any reference values x and y, x.equals(y) should return ! true if and only if y.equals(x) returns true ! - It is transitive: For any reference values x, y, and z, if x.equals(y) returns ! true and y.equals(z) returns true, then x.equals(z) should return true ! - It is consistent: For any reference values x and y, multiple invocations of ! x.equals(y) consistently return true or consistently return false, provided no ! information used in equals comparisons on the object is modified ! - For any non-null reference value x, x.equals(null) should return false" ! */ ! [Test] ! public void EqualsSameType() { ! Parameter x = new Parameter( "name", "alias", new SqlTypes.Int32SqlType() ); ! Parameter y = new Parameter( "name", "alias", new SqlTypes.Int32SqlType() ); ! Parameter z = new Parameter( "name", "alias", new SqlTypes.Int32SqlType() ); ! ! Assert.IsTrue( x.Equals(y) ); ! Assert.IsTrue( y.Equals(x) ); ! Assert.IsTrue( y.Equals(z) ); ! Assert.IsTrue( x.Equals(z) ); ! Assert.IsFalse( x.Equals(null) ); ! y = new Parameter( "name2", "alias", new SqlTypes.Int32SqlType() ); ! ! Assert.IsFalse( x.Equals(y) ); ! Assert.IsFalse( y.Equals(x) ); ! } ! ! [Test] ! public void EqualsLengthType() ! { ! ParameterLength x = new ParameterLength( "name", "alias", new SqlTypes.AnsiStringSqlType(5) ); ! ParameterLength y = new ParameterLength( "name", "alias", new SqlTypes.AnsiStringSqlType(5) ); ! ParameterLength z = new ParameterLength( "name", "alias", new SqlTypes.AnsiStringSqlType(5) ); ! Assert.IsTrue( x.Equals(y) ); ! Assert.IsTrue( y.Equals(x) ); ! Assert.IsTrue( y.Equals(z) ); ! Assert.IsTrue( x.Equals(z) ); ! Assert.IsFalse( x.Equals(null) ); ! y = new ParameterLength( "name2", "alias", new SqlTypes.AnsiStringSqlType(5) ); ! ! Assert.IsFalse( x.Equals(y) ); ! Assert.IsFalse( y.Equals(x) ); ! } ! ! [Test] ! public void EqualsLengthDiffType() ! { ! Parameter x = new Parameter( "name", "alias", new SqlTypes.AnsiStringSqlType(5) ); ! ParameterLength y = new ParameterLength( "name", "alias", new SqlTypes.AnsiStringSqlType(5) ); ! // even though these contain the exact same values - they should not be ! // equal because they are different types ! Assert.IsFalse( x.Equals(y) ); ! Assert.IsFalse( y.Equals(x) ); ! } ! [Test] ! public void EqualsPrecisionDiffType() ! { ! Parameter x = new Parameter( "name", "alias", new SqlTypes.DecimalSqlType( 20, 4 ) ); ! ParameterPrecisionScale y = new ParameterPrecisionScale( "name", "alias", new SqlTypes.DecimalSqlType( 20, 4 ) ); ! ! // even though these contain the exact same values - they should not be ! // equal because they are different types ! Assert.IsFalse( x.Equals(y) ); ! Assert.IsFalse( y.Equals(x) ); ! } ! [Test] ! public void EqualsPrecisionType() ! { ! ParameterPrecisionScale x = new ParameterPrecisionScale( "name", "alias", new SqlTypes.DecimalSqlType( 20, 4 ) ); ! ParameterPrecisionScale y = new ParameterPrecisionScale( "name", "alias", new SqlTypes.DecimalSqlType( 20, 4 ) ); ! ParameterPrecisionScale z = new ParameterPrecisionScale( "name", "alias", new SqlTypes.DecimalSqlType( 20, 4 ) ); + Assert.IsTrue( x.Equals(y) ); + Assert.IsTrue( y.Equals(x) ); + Assert.IsTrue( y.Equals(z) ); + Assert.IsTrue( x.Equals(z) ); + Assert.IsFalse( x.Equals(null) ); + y = new ParameterPrecisionScale( "name2", "alias", new SqlTypes.DecimalSqlType( 20, 4 ) ); + + Assert.IsFalse( x.Equals(y) ); + Assert.IsFalse( y.Equals(x) ); + } + + + + [Test] + public void TestParameterClone() + { + Parameter original = new Parameter( "originalName", new SqlTypes.Int32SqlType() ); + Parameter cloned = null; + + cloned = (Parameter)original.Clone(); + + Assert.IsTrue((original==cloned)==false, "Not the same object by =="); + Assert.AreEqual(original.SqlType.DbType, cloned.SqlType.DbType, "Same DbType"); + Assert.AreEqual(original.Name, cloned.Name, "Same Name"); } *************** *** 46,56 **** public void TestParameterLengthClone() { ! ParameterLength original = new ParameterLength(); ParameterLength cloned = null; - original.SqlType = new SqlTypes.StringSqlType(275); - original.Name = "originalName"; - original.Length = 275; - cloned = (ParameterLength)original.Clone(); --- 128,134 ---- public void TestParameterLengthClone() { ! ParameterLength original = new ParameterLength( "originalName", new SqlTypes.StringSqlType(275) ); ParameterLength cloned = null; cloned = (ParameterLength)original.Clone(); *************** *** 59,73 **** Assert.AreEqual(original.Name, cloned.Name, "Same Name"); Assert.AreEqual(original.Length, cloned.Length, "Same Length"); - - // 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; - - Assert.IsTrue(cloned.SqlType.DbType!=original.SqlType.DbType, "Should not the same db type anymore"); - Assert.IsTrue(cloned.Name!=original.Name, "Should not the same name anymore"); - Assert.IsTrue(cloned.Length!=original.Length, "Should not the same length anymore"); - } --- 137,140 ---- *************** *** 75,86 **** public void TestParameterPrecisionClone() { ! ParameterPrecisionScale original = new ParameterPrecisionScale(); ParameterPrecisionScale cloned = null; - original.SqlType = new SqlTypes.DecimalSqlType(19, 5); - original.Name = "originalName"; - original.Precision = 19; - original.Scale = 5; - cloned = (ParameterPrecisionScale)original.Clone(); --- 142,148 ---- public void TestParameterPrecisionClone() { ! ParameterPrecisionScale original = new ParameterPrecisionScale( "originalName", new SqlTypes.DecimalSqlType(19, 5) ); ParameterPrecisionScale cloned = null; cloned = (ParameterPrecisionScale)original.Clone(); *************** *** 91,108 **** Assert.AreEqual(original.Scale, cloned.Scale, "Same Scale"); - // change some of the values of the clone to ensure the original doesn't change - - // 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; - - Assert.IsTrue(cloned.SqlType.DbType!=original.SqlType.DbType, "Should not the same db type anymore"); - Assert.IsTrue(cloned.Name!=original.Name, "Should not the same name anymore"); - Assert.IsTrue(cloned.Precision!=original.Precision, "Should not the same Precision anymore"); - Assert.IsTrue(cloned.Scale!=original.Scale, "Should not the same Scale anymore"); - } --- 153,156 ---- *************** *** 118,129 **** Parameter[] origParams = new Parameter[2]; ! 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"; - sqlBuilder.Add("UPDATE tablename set param0 = ") .Add(origParams[0]) --- 166,173 ---- Parameter[] origParams = new Parameter[2]; ! origParams[0] = new Parameter( "OP1", new SqlTypes.Int32SqlType() ); ! ! origParams[1] = new Parameter( "OP2", new SqlTypes.Int64SqlType() ); sqlBuilder.Add("UPDATE tablename set param0 = ") .Add(origParams[0]) *************** *** 145,150 **** // modify the first parameter of the clone to ensure they are not the same cloned.SqlParts[0] = "UPDATE changedtablename set param0 = "; ! Parameter lastParamPart = (Parameter)cloned.SqlParts[3]; ! lastParamPart.Name = "modifiedOP2"; Assert.IsTrue(cloned.ToString()!=original.ToString(), "Should not be the same ToString()"); --- 189,193 ---- // modify the first parameter of the clone to ensure they are not the same cloned.SqlParts[0] = "UPDATE changedtablename set param0 = "; ! cloned.SqlParts[3] = new Parameter( "modifiedOP2" ); Assert.IsTrue(cloned.ToString()!=original.ToString(), "Should not be the same ToString()"); Index: SqlSelectBuilderFixture.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlSelectBuilderFixture.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SqlSelectBuilderFixture.cs 17 Jan 2005 03:40:53 -0000 1.5 --- SqlSelectBuilderFixture.cs 30 Jan 2005 19:39:52 -0000 1.6 *************** *** 65,73 **** Assert.AreEqual(1, numOfParams, "One parameter"); ! Parameter firstParam = new Parameter(); ! firstParam.SqlType = new SqlTypes.Int64SqlType(); ! firstParam.TableAlias = "select_test_alias"; ! firstParam.Name = "identity_column"; ! Assert.AreEqual(firstParam.SqlType.DbType, expectedParam.SqlType.DbType, "First Parameter Type"); Assert.AreEqual(firstParam.TableAlias, expectedParam.TableAlias, "First Parameter TableAlias"); --- 65,69 ---- Assert.AreEqual(1, numOfParams, "One parameter"); ! Parameter firstParam = new Parameter( "identity_column", "select_test_alias", new SqlTypes.Int64SqlType() ); Assert.AreEqual(firstParam.SqlType.DbType, expectedParam.SqlType.DbType, "First Parameter Type"); Assert.AreEqual(firstParam.TableAlias, expectedParam.TableAlias, "First Parameter TableAlias"); Index: SqlInsertBuilderFixture.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlInsertBuilderFixture.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SqlInsertBuilderFixture.cs 17 Jan 2005 03:40:53 -0000 1.4 --- SqlInsertBuilderFixture.cs 30 Jan 2005 19:39:52 -0000 1.5 *************** *** 52,63 **** Assert.AreEqual(2, numOfParameters, "Two parameters"); ! Parameter firstParam = new Parameter(); ! firstParam.SqlType = new SqlTypes.Int32SqlType(); ! firstParam.Name = "intColumn"; ! ! Parameter secondParam = new Parameter(); ! secondParam.SqlType = new SqlTypes.Int64SqlType(); ! secondParam.Name = "longColumn"; ! Assert.AreEqual(firstParam.SqlType.DbType, actualParams[0].SqlType.DbType, "First Parameter Type"); Assert.AreEqual(firstParam.Name, actualParams[0].Name, "First Parameter Name"); --- 52,59 ---- Assert.AreEqual(2, numOfParameters, "Two parameters"); ! Parameter firstParam = new Parameter( "intColumn", new SqlTypes.Int32SqlType() ); ! ! Parameter secondParam = new Parameter( "longColumn", new SqlTypes.Int64SqlType() ); ! Assert.AreEqual(firstParam.SqlType.DbType, actualParams[0].SqlType.DbType, "First Parameter Type"); Assert.AreEqual(firstParam.Name, actualParams[0].Name, "First Parameter Name"); |