[Nmock-general] nmock/test/NMock DynamicMockTest.cs,1.16,1.17

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

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

Modified Files:
	DynamicMockTest.cs 
Log Message:
Some reorg. 

Index: DynamicMockTest.cs
===================================================================
RCS file: /cvsroot/nmock/nmock/test/NMock/DynamicMockTest.cs,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** DynamicMockTest.cs	16 Oct 2003 13:49:13 -0000	1.16
--- DynamicMockTest.cs	7 Nov 2003 23:28:39 -0000	1.17
***************
*** 70,73 ****
--- 70,81 ----
  			string Name { get; set; }
  		}
+ 		class WithNonVirtualMethod
+ 		{
+ 			public void NonVirtualMethod() { }
+ 		}
+ 		interface WithDifferentTypesOfParameters
+ 		{
+ 			void SomeParametersMethod(string p1, string p2);
+ 		}
  		#endregion
  
***************
*** 153,157 ****
  		}
  
! 		[Test] [ExpectedException(typeof(VerifyException))] public void ExpectationWillFailIfValueDoesntMatchMockInstance() 
  		{
  			DynamicMock m1 = new DynamicMock(typeof(Thingy));
--- 161,165 ----
  		}
  
! 		[Test] public void InvocationFailsIfParamaterValueIsIncorrect() 
  		{
  			DynamicMock m1 = new DynamicMock(typeof(Thingy));
***************
*** 160,164 ****
  			
  			m2.Expect("y", thingy);
! 			m2.Invoke("y", "something else");
  		}
  		
--- 168,180 ----
  			
  			m2.Expect("y", thingy);
! 			try 
! 			{
! 				m2.Invoke("y", "something else");
! 			} 
! 			catch (VerifyException)
! 			{
! 				return;
! 			}
! 			Fail("Should have thrown VerifyException");
  		}
  		
***************
*** 195,206 ****
  			mock.Verify();
  		}
! 		[Test] [ExpectedException(typeof(MissingMethodException))] public void CannotYetMockMembersWithOnlyAParamsArgument() 
  		{
  			IMock mock = new DynamicMock(typeof(IWithParams));
! 			mock.Expect("WithoutLeadingParameter", new Object[] {1, 2, 3});
! 		
! 			IWithParams p = (IWithParams)mock.MockInstance;
! 			p.WithoutLeadingParameter(1, 2, 3);
! 			mock.Verify();
  		}
  		[Test] public void CanMockOverloadedMethods()
--- 211,235 ----
  			mock.Verify();
  		}
! 		[Test] public void CannotYetMockMembersWithOnlyAParamsArgument() 
  		{
  			IMock mock = new DynamicMock(typeof(IWithParams));
! 			try 
! 			{
! 				mock.Expect("WithoutLeadingParameter", new Object[] {1, 2, 3});
! 				Fail("Should have thrown MissingMethodException");
! 			} 
! 			catch (MissingMethodException)
! 			{}
! 		}
! 		[Test] public void CannotMockNonVirtualMethodsOfAClass() 
! 		{
! 			IMock mock = new DynamicMock(typeof(WithNonVirtualMethod));
! 			try 
! 			{
! 				mock.Expect("NonVirtualMethod");
! 				Fail("Should have thrown ArgumentException");
! 			} 
! 			catch (ArgumentException)
! 			{}
  		}
  		[Test] public void CanMockOverloadedMethods()
***************
*** 208,216 ****
  			IMock mock = new DynamicMock(typeof(IOverloadedMethods));
  			mock.Expect("DoStuff", "one", 2);
! 			mock.Expect("DoStuff", "one");
  
  			IOverloadedMethods instance = (IOverloadedMethods)mock.MockInstance;
  			instance.DoStuff("one", 2);
! 			instance.DoStuff("one");
  			mock.Verify();
  		}
--- 237,245 ----
  			IMock mock = new DynamicMock(typeof(IOverloadedMethods));
  			mock.Expect("DoStuff", "one", 2);
! 			mock.ExpectNoCall("DoStuff", typeof(string));
  
  			IOverloadedMethods instance = (IOverloadedMethods)mock.MockInstance;
  			instance.DoStuff("one", 2);
! 
  			mock.Verify();
  		}
***************
*** 228,235 ****
  			mock.Verify();
  		}
! 		[Test] [ExpectedException(typeof(NotSupportedException))] public void CannotCreateMockInstanceWithNonEmptyConstructor() 
  		{
  			IMock mock = new DynamicMock(typeof(WithNonEmptyConstructor));
! 			WithNonEmptyConstructor nonEmpty = (WithNonEmptyConstructor)mock.MockInstance;
  		}
  		
--- 257,269 ----
  			mock.Verify();
  		}
! 		[Test] public void CannotCreateMockInstanceWithNonEmptyConstructor() 
  		{
  			IMock mock = new DynamicMock(typeof(WithNonEmptyConstructor));
! 			try 
! 			{
! 				WithNonEmptyConstructor nonEmpty = (WithNonEmptyConstructor)mock.MockInstance;
! 				Fail("Should have thrown NotSupportedException");
! 			} 
! 			catch (NotSupportedException) {}
  		}
  		
***************
*** 248,252 ****
  		}
  
- 		[Ignore("SetupResult doesn't work for properties")] 
  		[Test] public void SetAndGetPropertiesDoesNotWorkWithSetupReturn() 
  		{
--- 282,285 ----
***************
*** 257,275 ****
  			mock.Expect("Name", "jim");
  
! 			AssertEquals("Should be property Name", "fred", withProperty.Name);
! 			withProperty.Name = "jim";
! 
! 			mock.Verify();
! 		}
  
! 		
! 		#region null parameter bug
! 		interface WithDifferentTypesOfParameters
! 		{
! 			void SomeParametersMethod(string p1, string p2);
  		}
  
! 		[Test] 
! 		public void TestNullParameterCanStillResolveCorrectMethod() 
  		{
  			DynamicMock mock = new DynamicMock(typeof(WithDifferentTypesOfParameters));
--- 290,308 ----
  			mock.Expect("Name", "jim");
  
! 			try 
! 			{
! 				AssertEquals("Should be property Name", "fred", withProperty.Name);
! 				withProperty.Name = "jim";
! 				mock.Verify();
! 			} 
! 			catch (VerifyException) 
! 			{
! 				return;
! 			}
  
! 			Fail("Should have thrown VerifyException");
  		}
  
! 		[Test] public void TestNullParameterCanStillResolveCorrectMethod() 
  		{
  			DynamicMock mock = new DynamicMock(typeof(WithDifferentTypesOfParameters));
***************
*** 287,292 ****
  		}
  
! 		[Test] 
! 		public void TestNullConstraintsCanStillResolveCorrectMethod() 
  		{
  			DynamicMock mock = new DynamicMock(typeof(WithDifferentTypesOfParameters));
--- 320,324 ----
  		}
  
! 		[Test] public void TestNullConstraintsCanStillResolveCorrectMethod() 
  		{
  			DynamicMock mock = new DynamicMock(typeof(WithDifferentTypesOfParameters));
***************
*** 304,310 ****
  		}
  
- 
- 		#endregion
- 		
  	}
  }
--- 336,339 ----