[Dotnetmock-developer] dotnetmock/DotNetMock AbstractExpectationCollection.cs,1.8,1.9 ExpectationCounter.cs,1.9,1.10

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock
In directory sc8-pr-cvs1:/tmp/cvs-serv9344/DotNetMock

Modified Files:
	AbstractExpectationCollection.cs ExpectationCounter.cs 
Log Message:
1) Updated VS.NET Solution
2) Updated ExpectationCounter.cs
3) Updated MockDataParameterCOllection.cs


Index: AbstractExpectationCollection.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock/AbstractExpectationCollection.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AbstractExpectationCollection.cs	1 Apr 2003 01:43:56 -0000	1.8
--- AbstractExpectationCollection.cs	8 Apr 2003 04:27:10 -0000	1.9
***************
*** 193,200 ****
  		public override void Verify()
  		{
! 			NUnit.Framework.Assertion.AssertEquals("Expectation Count's do not equal.", this.ExpectedCollection.Count, this.ActualCollection.Count);
! 			for (int i = 0; i < this.ActualCollection.Count; i++)
  			{
! 				NUnit.Framework.Assertion.AssertEquals("Collection items not equal at index " + i, this.ExpectedCollection[i].ToString(), this.ActualCollection[i].ToString());
  			}
  		}
--- 193,203 ----
  		public override void Verify()
  		{
! 			if (this.HasExpectations) 
  			{
! 				NUnit.Framework.Assertion.AssertEquals("Expectation Count's do not equal.", this.ExpectedCollection.Count, this.ActualCollection.Count);
! 				for (int i = 0; i < this.ActualCollection.Count; i++)
! 				{
! 					NUnit.Framework.Assertion.AssertEquals("Collection items not equal at index " + i, this.ExpectedCollection[i].ToString(), this.ActualCollection[i].ToString());
! 				}
  			}
  		}

Index: ExpectationCounter.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock/ExpectationCounter.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ExpectationCounter.cs	1 Apr 2003 01:43:56 -0000	1.9
--- ExpectationCounter.cs	8 Apr 2003 04:27:11 -0000	1.10
***************
*** 91,96 ****
  		/// Verifies object.
  		/// </summary>
! 		public override void Verify() {
! 			Assertion.AssertEquals("Did not receive the expected Count for object " + this.name, this._expectedCalls, this._actualCalls);
  		}
  		/// <summary>
--- 91,100 ----
  		/// Verifies object.
  		/// </summary>
! 		public override void Verify() 
! 		{
! 			if (this.HasExpectations)
! 			{
! 				Assertion.AssertEquals("Did not receive the expected Count for object " + this.name, this._expectedCalls, this._actualCalls);
! 			}
  		}
  		/// <summary>