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

[Peter S. <sz...@us...>]

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

Modified Files:
	BaseExpressionFixture.cs 
Log Message:
Removed obsolete method Assertion.*, replaced with Assert.*. Reordered asserts.


Index: BaseExpressionFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ExpressionTest/BaseExpressionFixture.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BaseExpressionFixture.cs	28 Jun 2004 18:59:06 -0000	1.3
--- BaseExpressionFixture.cs	20 Sep 2004 17:45:59 -0000	1.4
***************
*** 57,61 ****
  		protected void CompareSqlStrings(SqlString actualSqlString, string expectedString) 
  		{
! 			Assertion.AssertEquals("SqlString.ToString()", expectedString, actualSqlString.ToString());
  		}
  
--- 57,61 ----
  		protected void CompareSqlStrings(SqlString actualSqlString, string expectedString) 
  		{
! 			Assert.AreEqual(expectedString, actualSqlString.ToString(), "SqlString.ToString()");
  		}
  
***************
*** 66,71 ****
  
  			GetParameters(actualSqlString, ref actualParameters, ref numOfParameters);
! 			Assertion.AssertEquals("SqlString.ToString()", expectedString, actualSqlString.ToString());
! 			Assertion.AssertEquals("Num of Parameters", expectedNumOfParameters, numOfParameters);
  
  		}
--- 66,71 ----
  
  			GetParameters(actualSqlString, ref actualParameters, ref numOfParameters);
! 			Assert.AreEqual(expectedString, actualSqlString.ToString(), "SqlString.ToString()");
! 			Assert.AreEqual(expectedNumOfParameters, numOfParameters, "Num of Parameters");
  
  		}
***************
*** 78,88 ****
  			GetParameters(actualSqlString, ref actualParameters, ref numOfParameters);
  
! 			Assertion.AssertEquals("SqlString.ToString()", expectedString, actualSqlString.ToString());
! 			Assertion.AssertEquals("Num of Parameters", expectedParameters.Length, numOfParameters);
  
  
  			for(int i = 0; i < expectedParameters.Length; i++) 
  			{
! 				Assertion.AssertEquals("Parameter[" + i + "]", expectedParameters[i], actualParameters[i]);
  			}
  		}
--- 78,88 ----
  			GetParameters(actualSqlString, ref actualParameters, ref numOfParameters);
  
! 			Assert.AreEqual(expectedString, actualSqlString.ToString(), "SqlString.ToString()");
! 			Assert.AreEqual(expectedParameters.Length, numOfParameters, "Num of Parameters");
  
  
  			for(int i = 0; i < expectedParameters.Length; i++) 
  			{
! 				Assert.AreEqual(expectedParameters[i], actualParameters[i], "Parameter[" + i + "]");
  			}
  		}