[Nmock-general] nmock/test/NMock MockTest.cs,1.11,1.12

[<sm...@us...>]

Update of /cvsroot/nmock/nmock/test/NMock
In directory sc8-pr-cvs1:/tmp/cvs-serv22336/test/NMock

Modified Files:
	MockTest.cs 
Log Message:
Added better diagnostics for rejected constraint

Index: MockTest.cs
===================================================================
RCS file: /cvsroot/nmock/nmock/test/NMock/MockTest.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MockTest.cs	13 Aug 2003 21:19:58 -0000	1.11
--- MockTest.cs	29 Nov 2003 17:19:13 -0000	1.12
***************
*** 231,235 ****
  		}
  
- 		// , Ignore("NoCall does not currently work, but requires a biggish overhaul to fix.  No time right now to do it")]
  		[Test] public void ExpectNoCall_WithNoCall()
  		{
--- 231,234 ----
***************
*** 391,401 ****
  		[Test] public void IncorrectParameterConstraintMessage()
  		{
  			try 
  			{
! 				IMock Constraint = new DynamicMock(typeof(IConstraint));
! 				Constraint.SetupResult("Message", "wee woo");
! 				Constraint.SetupResult("Eval", false, typeof(object));
  				
! 				mock.Expect("x", new IsAnything(), (IConstraint)Constraint.MockInstance);
  				mock.Invoke("x", "hello", "world");
  				Assertion.Fail("Expected VerifyException");
--- 390,402 ----
  		[Test] public void IncorrectParameterConstraintMessage()
  		{
+ 			IMock mockConstraint = new DynamicMock(typeof(IConstraint));
  			try 
  			{
! 				mockConstraint.SetupResult("Message", "wee woo");
! 				mockConstraint.SetupResult("Eval", false, typeof(object));
  				
! 				mockConstraint.ExpectAndReturn("ExtractActualValue", "actual value", "world");
! 
! 				mock.Expect("x", new IsAnything(), (IConstraint)mockConstraint.MockInstance);
  				mock.Invoke("x", "hello", "world");
  				Assertion.Fail("Expected VerifyException");
***************
*** 405,410 ****
  				Assertion.AssertEquals("x() called with incorrect parameter (2)", e.Reason);
  				Assertion.AssertEquals("wee woo", e.Expected);
! 				Assertion.AssertEquals("world", e.Actual);
  			}
  		}
   
--- 406,413 ----
  				Assertion.AssertEquals("x() called with incorrect parameter (2)", e.Reason);
  				Assertion.AssertEquals("wee woo", e.Expected);
! 				Assertion.AssertEquals("actual value", e.Actual);
  			}
+ 
+ 			mockConstraint.Verify();
  		}