[Dotnetmock-commits] dotnetmock/DotNetMock.Tests/Dynamic ExpectationMethodTests.cs,1.13,1.14

[Choy R. <ch...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/Dynamic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11021/DotNetMock.Tests/Dynamic

Modified Files:
	ExpectationMethodTests.cs 
Log Message:
Make IMethodCallExpectation even more minimal.

Index: ExpectationMethodTests.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/Dynamic/ExpectationMethodTests.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ExpectationMethodTests.cs	20 Feb 2005 09:26:48 -0000	1.13
--- ExpectationMethodTests.cs	8 Apr 2005 00:05:08 -0000	1.14
***************
*** 39,44 ****
  		{
  			methodCallExpectation = new ExpectationMethod(method1.Name);
! 			methodCallExpectation.ActualMethodCall = new MethodCall(method1);
! 			methodCallExpectation.Verify();
  		}
  		[Test]
--- 39,46 ----
  		{
  			methodCallExpectation = new ExpectationMethod(method1.Name);
! 			MethodCall call = new MethodCall(method1);
! 			object returnValue =
! 				methodCallExpectation.CheckCallAndSendResponse(call);
! 			Assert.IsNull(returnValue);
  		}
  		[Test]
***************
*** 53,58 ****
  		{
  			methodCallExpectation = new ExpectationMethod(method1.Name, true );
! 			methodCallExpectation.ActualMethodCall = new MethodCall(method1);
! 			Assert.IsTrue((bool)methodCallExpectation.ReturnValue);
  			methodCallExpectation.Verify();
  		}
--- 55,61 ----
  		{
  			methodCallExpectation = new ExpectationMethod(method1.Name, true );
! 			MethodCall call = new MethodCall(method1);
! 			object returnValue = methodCallExpectation.CheckCallAndSendResponse(call);
! 			Assert.IsTrue((bool) returnValue);
  			methodCallExpectation.Verify();
  		}
***************
*** 73,77 ****
  				new object[] { complexPredicate, 2, 3 }
  				);
! 			methodCallExpectation.ActualMethodCall = new MethodCall(method2, 3, 2, 1);
  			methodCallExpectation.Verify();
  		}
--- 76,81 ----
  				new object[] { complexPredicate, 2, 3 }
  				);
! 			MethodCall call = new MethodCall(method2, 3, 2, 1);
! 			object returnValue = methodCallExpectation.CheckCallAndSendResponse(call);
  			methodCallExpectation.Verify();
  		}
***************
*** 84,88 ****
  		{
  			methodCallExpectation = new ExpectationMethod(method2.Name, null, new object[] { 1, 2, 3 });
! 			methodCallExpectation.ActualMethodCall = new MethodCall(method2, 3, 2, 1);
  			methodCallExpectation.Verify();
  		}
--- 88,93 ----
  		{
  			methodCallExpectation = new ExpectationMethod(method2.Name, null, new object[] { 1, 2, 3 });
! 			MethodCall call = new MethodCall(method2, 3, 2, 1);
! 			object returnValue = methodCallExpectation.CheckCallAndSendResponse(call);
  			methodCallExpectation.Verify();
  		}
***************
*** 95,99 ****
  		{
  			methodCallExpectation = new ExpectationMethod(method2.Name, null, new object[] { 1, 2, 3 });
! 			methodCallExpectation.ActualMethodCall = new MethodCall(method2, 1, 3, 2);
  			methodCallExpectation.Verify();
  		}
--- 100,105 ----
  		{
  			methodCallExpectation = new ExpectationMethod(method2.Name, null, new object[] { 1, 2, 3 });
! 			MethodCall call = new MethodCall(method2, 1, 3, 2);
! 			object returnValue = methodCallExpectation.CheckCallAndSendResponse(call);
  			methodCallExpectation.Verify();
  		}
***************
*** 110,114 ****
  		{
  			methodCallExpectation = new ExpectationMethod(method1.Name);
! 			methodCallExpectation.ActualMethodCall = new MethodCall(method3);
  			methodCallExpectation.Verify();
  		}
--- 116,121 ----
  		{
  			methodCallExpectation = new ExpectationMethod(method1.Name);
! 			MethodCall call = new MethodCall(method3);
! 			object returnValue = methodCallExpectation.CheckCallAndSendResponse(call);
  			methodCallExpectation.Verify();
  		}
***************
*** 121,125 ****
  		{
  			methodCallExpectation = new ExpectationMethod(method2.Name, null, new object[] { 1, 2, 3 });
! 			methodCallExpectation.ActualMethodCall = new MethodCall(method2, 1, 3);
  			methodCallExpectation.Verify();
  		}
--- 128,133 ----
  		{
  			methodCallExpectation = new ExpectationMethod(method2.Name, null, new object[] { 1, 2, 3 });
! 			MethodCall call = new MethodCall(method2, 1, 3);
! 			object returnValue = methodCallExpectation.CheckCallAndSendResponse(call);
  			methodCallExpectation.Verify();
  		}
***************
*** 136,140 ****
  				new object[] { 1, 2, 3, 4 }
  				);
! 			methodCallExpectation.ActualMethodCall = new MethodCall(method2, 1, 2, 3);
  			methodCallExpectation.Verify();
  		}
--- 144,149 ----
  				new object[] { 1, 2, 3, 4 }
  				);
! 			MethodCall call = new MethodCall(method2, 1, 2, 3);
! 			object returnValue = methodCallExpectation.CheckCallAndSendResponse(call);
  			methodCallExpectation.Verify();
  		}