[Nmock-general] nmock2/src/NMock2.AcceptanceTests ExpectationsAcceptanceTest.cs, 1.4, 1.5

[Richard A. H. I. <aci...@us...>]

Update of /cvsroot/nmock/nmock2/src/NMock2.AcceptanceTests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8420/src/NMock2.AcceptanceTests

Modified Files:
	ExpectationsAcceptanceTest.cs 
Log Message:
Fix Expectations so they can override stubs. Need to do quite a bit of refactoring here.

Index: ExpectationsAcceptanceTest.cs
===================================================================
RCS file: /cvsroot/nmock/nmock2/src/NMock2.AcceptanceTests/ExpectationsAcceptanceTest.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ExpectationsAcceptanceTest.cs	16 Aug 2007 15:14:50 -0000	1.4
--- ExpectationsAcceptanceTest.cs	24 Feb 2008 22:27:09 -0000	1.5
***************
*** 225,228 ****
--- 225,246 ----
  			helloWorld.Hello();
  		}
+ 
+ 		[Test]
+ 		public void ExpectationsCanOverrideStubs()
+ 		{
+ 			Mockery mocks = new Mockery();
+ 
+ 			IHelloWorld helloWorld = (IHelloWorld)mocks.NewMock(typeof(IHelloWorld));
+ 
+ 			Stub.On(helloWorld).Method("Ask").With("Name?").Will(Return.Value("Bill"));
+ 
+ 			Assert.AreEqual("Bill", helloWorld.Ask("Name?"));
+ 
+ 			Expect.Once.On(helloWorld).Method("Ask").With("Name?").Will(Return.Value("Steve"));
+ 
+ 			Assert.AreEqual("Steve", helloWorld.Ask("Name?"));
+ 
+ 			mocks.VerifyAllExpectationsHaveBeenMet();
+ 		}
  		
  		#region Really boring stuff