[Nmock-general] nmock/test/NMock FastErrorHandlingTest.cs,1.1,1.2 DynamicMockTest.cs,1.5,1.6

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

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

Modified Files:
	FastErrorHandlingTest.cs DynamicMockTest.cs 
Log Message:
Stopped removing leading 'I' from interface names
Override getMethod() rather than Expect in DynamicMock


Index: FastErrorHandlingTest.cs
===================================================================
RCS file: /cvsroot/nmock/nmock/test/NMock/FastErrorHandlingTest.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FastErrorHandlingTest.cs	27 Feb 2003 22:45:51 -0000	1.1
--- FastErrorHandlingTest.cs	13 Mar 2003 21:54:59 -0000	1.2
***************
*** 42,46 ****
  
  		[Test]
! 		public void SetupResultWithNoMethod()
  		{
  			try 
--- 42,46 ----
  
  		[Test]
! 		public void ExpectWithMissingMethod()
  		{
  			try 
***************
*** 56,59 ****
--- 56,66 ----
  
  		[Test]
+ 		[ExpectedException(typeof(MissingMethodException))]
+ 		public void ExpectAndReturnWithMissingMethod()
+ 		{
+ 			full.ExpectAndReturn("xxx", null);
+ 		}
+ 
+ 		[Test]
  		public void SetupResultWithWrongType()
  		{
***************
*** 69,79 ****
  		}
  
- 		/// <summary>
- 		/// this is HUGE, I keep trying to mock non-virtual methods and wasting tons
- 		/// of time trying to figure 
- 		/// out why my tests are working :)
- 		/// </summary>
  		[Test]
! 		public void MethodNotVirtual() 
  		{
  			try 
--- 76,81 ----
  		}
  
  		[Test]
! 		public void FailWhenMockedMethodNotVirtual() 
  		{
  			try 
***************
*** 88,99 ****
  		}
  		
- 		[Test]
- 		[ExpectedException(typeof(ArgumentException))]
- 		[Ignore("Borked... tired want to commit and go home")]
- 		public void ArgExceptionThrowOnExpectAndReturn()
- 		{
- 			full.ExpectAndReturn("xxx", null);
- 		}
- 
  	}
  
--- 90,93 ----

Index: DynamicMockTest.cs
===================================================================
RCS file: /cvsroot/nmock/nmock/test/NMock/DynamicMockTest.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DynamicMockTest.cs	26 Feb 2003 07:47:17 -0000	1.5
--- DynamicMockTest.cs	13 Mar 2003 21:55:03 -0000	1.6
***************
*** 18,22 ****
  		{
  			IMock mock = new DynamicMock(typeof(IBlah));
! 			Assertion.AssertEquals("MockBlah", mock.Name);
  			
  			mock.ExpectAndReturn("DoStuff", "world", "hello");
--- 18,22 ----
  		{
  			IMock mock = new DynamicMock(typeof(IBlah));
! 			Assertion.AssertEquals("MockIBlah", mock.Name);
  			
  			mock.ExpectAndReturn("DoStuff", "world", "hello");
***************
*** 109,113 ****
  		{
  			IMock mock = new DynamicMock(typeof(IValueType));
! 			Assertion.AssertEquals("MockValueType", mock.Name);
  			ArrayList ret = new ArrayList();
  			DateTime date = DateTime.Now;
--- 109,113 ----
  		{
  			IMock mock = new DynamicMock(typeof(IValueType));
! 			Assertion.AssertEquals("MockIValueType", mock.Name);
  			ArrayList ret = new ArrayList();
  			DateTime date = DateTime.Now;