[Nmock-general] nmock/test/NMock DynamicMockTest.cs,1.14,1.15 MockTest.cs,1.10,1.11

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

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

Modified Files:
	DynamicMockTest.cs MockTest.cs 
Log Message:
Changed Call to Invoke

Index: DynamicMockTest.cs
===================================================================
RCS file: /cvsroot/nmock/nmock/test/NMock/DynamicMockTest.cs,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** DynamicMockTest.cs	8 Aug 2003 00:05:03 -0000	1.14
--- DynamicMockTest.cs	13 Aug 2003 21:19:58 -0000	1.15
***************
*** 24,28 ****
  			public CustomMock(Type t) : base(t) {}
  			
! 			public override object Call(string name, params object[] args)
  			{
  				return "CUSTOM";
--- 24,28 ----
  			public CustomMock(Type t) : base(t) {}
  			
! 			public override object Invoke(string name, params object[] args)
  			{
  				return "CUSTOM";
***************
*** 149,153 ****
  			
  			m2.Expect("y", thingy);
! 			m2.Call("y", thingy);
  			m2.Verify();
  		}
--- 149,153 ----
  			
  			m2.Expect("y", thingy);
! 			m2.Invoke("y", thingy);
  			m2.Verify();
  		}
***************
*** 160,164 ****
  			
  			m2.Expect("y", thingy);
! 			m2.Call("y", "something else");
  		}
  		
--- 160,164 ----
  			
  			m2.Expect("y", thingy);
! 			m2.Invoke("y", "something else");
  		}
  		

Index: MockTest.cs
===================================================================
RCS file: /cvsroot/nmock/nmock/test/NMock/MockTest.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MockTest.cs	13 Aug 2003 19:42:39 -0000	1.10
--- MockTest.cs	13 Aug 2003 21:19:58 -0000	1.11
***************
*** 29,33 ****
  		{
  			mock.Expect("myMethod");
! 			mock.Call("myMethod");
  			mock.Verify();
  		}
--- 29,33 ----
  		{
  			mock.Expect("myMethod");
! 			mock.Invoke("myMethod");
  			mock.Verify();
  		}
***************
*** 42,52 ****
  		{
  			mock.Expect("myMethod");
! 			mock.Call("myMethod");
! 			mock.Call("myMethod");
  		}
  
  		[Test] public void IgnoresUnexpectedCalls()
  		{
! 			mock.Call("myMethod");
  			mock.Verify();
  		}
--- 42,52 ----
  		{
  			mock.Expect("myMethod");
! 			mock.Invoke("myMethod");
! 			mock.Invoke("myMethod");
  		}
  
  		[Test] public void IgnoresUnexpectedCalls()
  		{
! 			mock.Invoke("myMethod");
  			mock.Verify();
  		}
***************
*** 57,63 ****
  			mock.Expect("myMethod");
  			mock.Expect("myMethod");
! 			mock.Call("myMethod");
! 			mock.Call("myMethod");
! 			mock.Call("myMethod");
  			mock.Verify();
  		}
--- 57,63 ----
  			mock.Expect("myMethod");
  			mock.Expect("myMethod");
! 			mock.Invoke("myMethod");
! 			mock.Invoke("myMethod");
! 			mock.Invoke("myMethod");
  			mock.Verify();
  		}
***************
*** 68,73 ****
  			mock.Expect("myMethod");
  			mock.Expect("myMethod");
! 			mock.Call("myMethod");
! 			mock.Call("myMethod");
  			mock.Verify();
  		}
--- 68,73 ----
  			mock.Expect("myMethod");
  			mock.Expect("myMethod");
! 			mock.Invoke("myMethod");
! 			mock.Invoke("myMethod");
  			mock.Verify();
  		}
***************
*** 76,80 ****
  		{
  			mock.Expect("myMethod", new IsEqual("hello"), new IsAnything());
! 			mock.Call("myMethod", "hello", null);
  			mock.Verify();
  		}
--- 76,80 ----
  		{
  			mock.Expect("myMethod", new IsEqual("hello"), new IsAnything());
! 			mock.Invoke("myMethod", "hello", null);
  			mock.Verify();
  		}
***************
*** 83,87 ****
  		{
  			mock.Expect("myMethod", new IsEqual("hello"), new IsAnything());
! 			mock.Call("myMethod", "world", null);
  		}
  
--- 83,87 ----
  		{
  			mock.Expect("myMethod", new IsEqual("hello"), new IsAnything());
! 			mock.Invoke("myMethod", "world", null);
  		}
  
***************
*** 89,93 ****
  		{
  			mock.Expect("myMethod");
! 			mock.Call("myMethod", "world", null);
  			mock.Verify();
  		}
--- 89,93 ----
  		{
  			mock.Expect("myMethod");
! 			mock.Invoke("myMethod", "world", null);
  			mock.Verify();
  		}
***************
*** 98,104 ****
  			mock.Expect("myMethod2");
  			mock.Expect("myMethod3");
! 			mock.Call("myMethod1");
! 			mock.Call("myMethod2");
! 			mock.Call("myMethod3");
  			mock.Verify();
  		}
--- 98,104 ----
  			mock.Expect("myMethod2");
  			mock.Expect("myMethod3");
! 			mock.Invoke("myMethod1");
! 			mock.Invoke("myMethod2");
! 			mock.Invoke("myMethod3");
  			mock.Verify();
  		}
***************
*** 109,115 ****
  			mock.Expect("myMethod2");
  			mock.Expect("myMethod3");
! 			mock.Call("myMethod3");
! 			mock.Call("myMethod1");
! 			mock.Call("myMethod2");
  			mock.Verify();
  		}
--- 109,115 ----
  			mock.Expect("myMethod2");
  			mock.Expect("myMethod3");
! 			mock.Invoke("myMethod3");
! 			mock.Invoke("myMethod1");
! 			mock.Invoke("myMethod2");
  			mock.Verify();
  		}
***************
*** 121,128 ****
  			mock.Expect("myMethod3");
  
! 			mock.Call("myMethod2");
! 			mock.Call("myMethod3");
! 			mock.Call("myMethod1");
! 			mock.Call("myMethod3");
  			mock.Verify();
  		}
--- 121,128 ----
  			mock.Expect("myMethod3");
  
! 			mock.Invoke("myMethod2");
! 			mock.Invoke("myMethod3");
! 			mock.Invoke("myMethod1");
! 			mock.Invoke("myMethod3");
  			mock.Verify();
  		}
***************
*** 132,136 ****
  			object something = new object();
  			mock.ExpectAndReturn("myMethod", something);
! 			object result = mock.Call("myMethod");
  			mock.Verify();
  			Assertion.AssertSame(something, result);
--- 132,136 ----
  			object something = new object();
  			mock.ExpectAndReturn("myMethod", something);
! 			object result = mock.Invoke("myMethod");
  			mock.Verify();
  			Assertion.AssertSame(something, result);
***************
*** 141,145 ****
  			object something = new object();
  			mock.ExpectAndReturn("myMethod", something, new IsEqual("hello"));
! 			object result = mock.Call("myMethod", "hello");
  			mock.Verify();
  			Assertion.AssertSame(something, result);
--- 141,145 ----
  			object something = new object();
  			mock.ExpectAndReturn("myMethod", something, new IsEqual("hello"));
! 			object result = mock.Invoke("myMethod", "hello");
  			mock.Verify();
  			Assertion.AssertSame(something, result);
***************
*** 150,154 ****
  			object something = new object();
  			mock.ExpectAndReturn("myMethod", something, new IsEqual("hello"));
! 			object result = mock.Call("myMethod", "bye");
  			mock.Verify();
  			Assertion.AssertSame(something, result);
--- 150,154 ----
  			object something = new object();
  			mock.ExpectAndReturn("myMethod", something, new IsEqual("hello"));
! 			object result = mock.Invoke("myMethod", "bye");
  			mock.Verify();
  			Assertion.AssertSame(something, result);
***************
*** 163,169 ****
  			mock.ExpectAndReturn("myMethod", anotherthing);
  			mock.ExpectAndReturn("myMethod", x);
! 			Assertion.AssertSame(something, mock.Call("myMethod"));
! 			Assertion.AssertSame(anotherthing, mock.Call("myMethod"));
! 			Assertion.AssertEquals(x, mock.Call("myMethod"));
  			mock.Verify();
  		}
--- 163,169 ----
  			mock.ExpectAndReturn("myMethod", anotherthing);
  			mock.ExpectAndReturn("myMethod", x);
! 			Assertion.AssertSame(something, mock.Invoke("myMethod"));
! 			Assertion.AssertSame(anotherthing, mock.Invoke("myMethod"));
! 			Assertion.AssertEquals(x, mock.Invoke("myMethod"));
  			mock.Verify();
  		}
***************
*** 172,176 ****
  		{
  			mock.ExpectAndReturn("myMethod", null);
! 			Assertion.AssertNull(mock.Call("myMethod"));
  			mock.Verify();
  		}
--- 172,176 ----
  		{
  			mock.ExpectAndReturn("myMethod", null);
! 			Assertion.AssertNull(mock.Invoke("myMethod"));
  			mock.Verify();
  		}
***************
*** 180,184 ****
  			object o = new object();
  			mock.Expect("myMethod", o);
! 			mock.Call("myMethod", o);
  		}
  
--- 180,184 ----
  			object o = new object();
  			mock.Expect("myMethod", o);
! 			mock.Invoke("myMethod", o);
  		}
  
***************
*** 186,190 ****
  		{
  			mock.Expect("myMethod", new object());
! 			mock.Call("myMethod", new object());
  		}
  
--- 186,190 ----
  		{
  			mock.Expect("myMethod", new object());
! 			mock.Invoke("myMethod", new object());
  		}
  
***************
*** 194,200 ****
  			mock.Expect("myMethod", null, "zzz");
  			mock.Expect("myMethod", "zzz", null);
! 			mock.Call("myMethod", "???", "???");
! 			mock.Call("myMethod", "???", "zzz");
! 			mock.Call("myMethod", "zzz", "???");
  		}
  
--- 194,200 ----
  			mock.Expect("myMethod", null, "zzz");
  			mock.Expect("myMethod", "zzz", null);
! 			mock.Invoke("myMethod", "???", "???");
! 			mock.Invoke("myMethod", "???", "zzz");
! 			mock.Invoke("myMethod", "zzz", "???");
  		}
  
***************
*** 203,219 ****
  			mock.SetupResult("myMethod", "hello");
  			mock.SetupResult("anotherMethod", "world");
! 			Assertion.AssertEquals("hello", mock.Call("myMethod"));
! 			Assertion.AssertEquals("hello", mock.Call("myMethod"));
! 			Assertion.AssertEquals("hello", mock.Call("myMethod"));
! 			Assertion.AssertEquals("hello", mock.Call("myMethod"));
! 			Assertion.AssertEquals("world", mock.Call("anotherMethod"));
! 			Assertion.AssertEquals("world", mock.Call("anotherMethod"));
  			mock.SetupResult("myMethod", "bye");
! 			Assertion.AssertEquals("bye", mock.Call("myMethod"));
! 			Assertion.AssertEquals("bye", mock.Call("myMethod"));
! 			Assertion.AssertEquals("world", mock.Call("anotherMethod"));
  			mock.SetupResult("myMethod", null);
! 			Assertion.AssertNull(mock.Call("myMethod"));
! 			Assertion.AssertNull(mock.Call("myMethod"));
  			mock.Verify();
  		}
--- 203,219 ----
  			mock.SetupResult("myMethod", "hello");
  			mock.SetupResult("anotherMethod", "world");
! 			Assertion.AssertEquals("hello", mock.Invoke("myMethod"));
! 			Assertion.AssertEquals("hello", mock.Invoke("myMethod"));
! 			Assertion.AssertEquals("hello", mock.Invoke("myMethod"));
! 			Assertion.AssertEquals("hello", mock.Invoke("myMethod"));
! 			Assertion.AssertEquals("world", mock.Invoke("anotherMethod"));
! 			Assertion.AssertEquals("world", mock.Invoke("anotherMethod"));
  			mock.SetupResult("myMethod", "bye");
! 			Assertion.AssertEquals("bye", mock.Invoke("myMethod"));
! 			Assertion.AssertEquals("bye", mock.Invoke("myMethod"));
! 			Assertion.AssertEquals("world", mock.Invoke("anotherMethod"));
  			mock.SetupResult("myMethod", null);
! 			Assertion.AssertNull(mock.Invoke("myMethod"));
! 			Assertion.AssertNull(mock.Invoke("myMethod"));
  			mock.Verify();
  		}
***************
*** 222,226 ****
  		{
  			mock.ExpectAndThrow("myMethod", new System.IO.IOException());
! 			mock.Call("myMethod");
  		}
  
--- 222,226 ----
  		{
  			mock.ExpectAndThrow("myMethod", new System.IO.IOException());
! 			mock.Invoke("myMethod");
  		}
  
***************
*** 228,232 ****
  		{
  			mock.ExpectNoCall("myMethod");
! 			mock.Call("myMethod");
  		}
  
--- 228,232 ----
  		{
  			mock.ExpectNoCall("myMethod");
! 			mock.Invoke("myMethod");
  		}
  
***************
*** 243,249 ****
  			mock.Expect("x");
  			mock.Expect("y");
! 			mock.Call("x");
! 			mock.Call("y");
! 			mock.Call("z");
  		}
  		
--- 243,249 ----
  			mock.Expect("x");
  			mock.Expect("y");
! 			mock.Invoke("x");
! 			mock.Invoke("y");
! 			mock.Invoke("z");
  		}
  		
***************
*** 253,257 ****
  			{
  				mock.ExpectNoCall("x");
! 				mock.Call("x"); 
  				Fail("Expected VerifyException");
  			}
--- 253,257 ----
  			{
  				mock.ExpectNoCall("x");
! 				mock.Invoke("x"); 
  				Fail("Expected VerifyException");
  			}
***************
*** 285,290 ****
  			{
  				mock.Expect("x");
! 				mock.Call("x");
! 				mock.Call("x");
  				mock.Verify();
  				Assertion.Fail("Expected VerifyException");
--- 285,290 ----
  			{
  				mock.Expect("x");
! 				mock.Invoke("x");
! 				mock.Invoke("x");
  				mock.Verify();
  				Assertion.Fail("Expected VerifyException");
***************
*** 321,325 ****
  				mock.Expect("x");
  				mock.Expect("x");
! 				mock.Call("x");
  				mock.Verify();
  				Assertion.Fail("Expected VerifyException");
--- 321,325 ----
  				mock.Expect("x");
  				mock.Expect("x");
! 				mock.Invoke("x");
  				mock.Verify();
  				Assertion.Fail("Expected VerifyException");
***************
*** 339,345 ****
  				mock.Expect("x");
  				mock.Expect("x");
! 				mock.Call("x");
! 				mock.Call("x");
! 				mock.Call("x");
  				mock.Verify();
  				Assertion.Fail("Expected VerifyException");
--- 339,345 ----
  				mock.Expect("x");
  				mock.Expect("x");
! 				mock.Invoke("x");
! 				mock.Invoke("x");
! 				mock.Invoke("x");
  				mock.Verify();
  				Assertion.Fail("Expected VerifyException");
***************
*** 360,365 ****
  				mock.Expect("x");
  				mock.Expect("x");
! 				mock.Call("x");
! 				mock.Call("x");
  				mock.Verify();
  				Assertion.Fail("Expected VerifyException");
--- 360,365 ----
  				mock.Expect("x");
  				mock.Expect("x");
! 				mock.Invoke("x");
! 				mock.Invoke("x");
  				mock.Verify();
  				Assertion.Fail("Expected VerifyException");
***************
*** 377,382 ****
  			try 
  			{
! 				mock.Expect("x", new object[] {1, 2, 3} );
! 				mock.Call("x", new object[] {2, 3});
  				Assertion.Fail("Expected VerifyException");
  			}
--- 377,382 ----
  			try 
  			{
! 				mock.Expect("x", 1, 2, 3 );
! 				mock.Invoke("x", 2, 3 );
  				Assertion.Fail("Expected VerifyException");
  			}
***************
*** 398,402 ****
  				
  				mock.Expect("x", new IsAnything(), (IConstraint)Constraint.MockInstance);
! 				mock.Call("x", "hello", "world");
  				Assertion.Fail("Expected VerifyException");
  			}
--- 398,402 ----
  				
  				mock.Expect("x", new IsAnything(), (IConstraint)Constraint.MockInstance);
! 				mock.Invoke("x", "hello", "world");
  				Assertion.Fail("Expected VerifyException");
  			}