[Dotnetmock-commits] dotnetmock/DotNetMock.Tests/Dynamic AbstractDynamicMockTests.cs,1.2,1.3 ExpectationMethodTests.cs,1.9,1.10

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

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

Modified Files:
	AbstractDynamicMockTests.cs ExpectationMethodTests.cs 
Log Message:
Provide name of argument that did not satisfy predicate in AssertionException.

Index: ExpectationMethodTests.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/Dynamic/ExpectationMethodTests.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ExpectationMethodTests.cs	17 Feb 2005 05:29:38 -0000	1.9
--- ExpectationMethodTests.cs	18 Feb 2005 02:16:08 -0000	1.10
***************
*** 55,59 ****
  		}
  		[Test]
! 		[ExpectedException(typeof(AssertionException), "Failed to satisfy 'value equals (1)' on argument 0 of method call Method2(3, 2, 1)")]
  		public void DecentErrorMessageWhenPredicateFails() 
  		{
--- 55,59 ----
  		}
  		[Test]
! 		[ExpectedException(typeof(AssertionException), "Failed to satisfy 'value equals (1)' on argument 0 (x) of method call Method2(3, 2, 1)")]
  		public void DecentErrorMessageWhenPredicateFails() 
  		{
***************
*** 63,67 ****
  		}
  		[Test]
! 		[ExpectedException(typeof(AssertionException), "Failed to satisfy 'value equals (2)' on argument 1 of method call Method2(1, 3, 2)")]
  		public void DecentErrorMessageWhenPredicateFailsOnSecondArgument() 
  		{
--- 63,67 ----
  		}
  		[Test]
! 		[ExpectedException(typeof(AssertionException), "Failed to satisfy 'value equals (2)' on argument 1 (y) of method call Method2(1, 3, 2)")]
  		public void DecentErrorMessageWhenPredicateFailsOnSecondArgument() 
  		{
***************
*** 85,88 ****
--- 85,112 ----
  			_expectedMethod.Verify();
  		}
+ 		[Test]
+ 		[ExpectedException(
+ 			 typeof(InvalidOperationException),
+ 			 "Method Method2 takes 3 arguments but received 2."
+ 			 )]
+ 		public void ArgumentCountontMatchMethodSignature() 
+ 		{
+ 			_expectedMethod = new ExpectationMethod(method2.Name, null, new object[] { 1, 2, 3 });
+ 			_expectedMethod.SetActualMethodCall(method2, 1, 3);
+ 			_expectedMethod.Verify();
+ 		}
+ 		/*
+ 		[Test]
+ 		[ExpectedException(
+ 			 typeof(AssertionException),
+ 			 "Expected 2 arguments but received 3 in method call Method2(1, 2, 3)."
+ 			 )]
+ 		public void ActualArgumentLengthDoesntMatchExpected() 
+ 		{
+ 			_expectedMethod = new ExpectationMethod(method2.Name, null, new object[] { 1, 2 });
+ 			_expectedMethod.SetActualMethodCall(method2, 1, 2, 3);
+ 			_expectedMethod.Verify();
+ 		}
+ 		*/
  	}
  }

Index: AbstractDynamicMockTests.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/Dynamic/AbstractDynamicMockTests.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AbstractDynamicMockTests.cs	12 Feb 2005 18:10:36 -0000	1.2
--- AbstractDynamicMockTests.cs	18 Feb 2005 02:16:08 -0000	1.3
***************
*** 22,25 ****
--- 22,27 ----
  		protected MethodInfo myMethod3;
  		protected MethodInfo anotherMethod;
+ 		protected MethodInfo method0;
+ 		protected MethodInfo method1;
  
  		/// <summary>
***************
*** 43,46 ****
--- 45,50 ----
  			void myMethod3();
  			void anotherMethod();
+ 			void Method0(object p0, object p1);
+ 			object Method1(object p0);
  		}
  
***************
*** 53,56 ****
--- 57,62 ----
  			myMethod3 = typeof(IBlah).GetMethod("myMethod3", new Type[0]);
  			anotherMethod = typeof(IBlah).GetMethod("anotherMethod", new Type[0]);
+ 			method0 = typeof(IBlah).GetMethod("Method0");
+ 			method1 = typeof(IBlah).GetMethod("Method1");
  		}
  
***************
*** 189,194 ****
  		public void CallToMethodWithParams() 
  		{
! 			mock.Expect("myMethod", new IsEqual("hello"), new IsAnything());
! 			mock.Call(myMethod, "hello", null);
  			mock.Verify();
  		}
--- 195,200 ----
  		public void CallToMethodWithParams() 
  		{
! 			mock.Expect("Method0", new IsEqual("hello"), new IsAnything());
! 			mock.Call(method0, "hello", null);
  			mock.Verify();
  		}
***************
*** 197,202 ****
  		public void CallToMethodWithInvalidParams() 
  		{
! 			mock.Expect("myMethod", new IsEqual("hello"), new IsAnything());
! 			mock.Call(myMethod, "world", null);
  		}
  
--- 203,208 ----
  		public void CallToMethodWithInvalidParams() 
  		{
! 			mock.Expect("Method0", new IsEqual("hello"), new IsAnything());
! 			mock.Call(method0, "world", null);
  		}
  
***************
*** 204,209 ****
  		public void CallToMethodWithParamsButNotCheckingValues() 
  		{
! 			mock.Expect("myMethod");
! 			mock.Call(myMethod, "world", null);
  			mock.Verify();
  		}
--- 210,215 ----
  		public void CallToMethodWithParamsButNotCheckingValues() 
  		{
! 			mock.Expect("Method0");
! 			mock.Call(method0, "world", null);
  			mock.Verify();
  		}
***************
*** 235,240 ****
  		{
  			object something = new object();
! 			mock.ExpectAndReturn("myMethod", something, new IsEqual("hello"));
! 			object result = mock.Call(myMethod, "hello");
  			mock.Verify();
  			Assert.AreEqual(something, result);
--- 241,246 ----
  		{
  			object something = new object();
! 			mock.ExpectAndReturn("Method1", something, new IsEqual("hello"));
! 			object result = mock.Call(method1, "hello");
  			mock.Verify();
  			Assert.AreEqual(something, result);
***************
*** 246,251 ****
  		{
  			object something = new object();
! 			mock.ExpectAndReturn("myMethod", something, new IsEqual("hello"));
! 			object result = mock.Call(myMethod, "bye");
  			mock.Verify();
  			Assert.AreEqual(something, result);
--- 252,257 ----
  		{
  			object something = new object();
! 			mock.ExpectAndReturn("Method1", something, new IsEqual("hello"));
! 			object result = mock.Call(method1, "bye");
  			mock.Verify();
  			Assert.AreEqual(something, result);
***************
*** 279,284 ****
  		{
  			object o = new object();
! 			mock.Expect("myMethod", o);
! 			mock.Call(myMethod, o);
  		}
  
--- 285,290 ----
  		{
  			object o = new object();
! 			mock.Expect("Method1", o);
! 			mock.Call(method1, o);
  		}
  
***************
*** 287,292 ****
  		public void DefaultEqualsPredicatesFailure() 
  		{
! 			mock.Expect("myMethod", new object());
! 			mock.Call(myMethod, new object());
  		}
  
--- 293,298 ----
  		public void DefaultEqualsPredicatesFailure() 
  		{
! 			mock.Expect("Method1", new object());
! 			mock.Call(method1, new object());
  		}
  
***************
*** 294,303 ****
  		public void DefaultAnythingPredicates() 
  		{
! 			mock.Expect("myMethod", null, null);
! 			mock.Expect("myMethod", null, "zzz");
! 			mock.Expect("myMethod", "zzz", null);
! 			mock.Call(myMethod, "???", "???");
! 			mock.Call(myMethod, "???", "zzz");
! 			mock.Call(myMethod, "zzz", "???");
  		}
  
--- 300,309 ----
  		public void DefaultAnythingPredicates() 
  		{
! 			mock.Expect("Method0", null, null);
! 			mock.Expect("Method0", null, "zzz");
! 			mock.Expect("Method0", "zzz", null);
! 			mock.Call(method0, "???", "???");
! 			mock.Call(method0, "???", "zzz");
! 			mock.Call(method0, "zzz", "???");
  		}