[Springnet-commits] Spring.Net/test/Spring/Spring.Core.Tests/Context CommonTypes.cs, 1.20, 1.21

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Context
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3851/Context

Modified Files:
	CommonTypes.cs 
Log Message:
added Test for SPRNET-709
fix SPRNET-710 (moved MessageSourceAccessorTests to use Rhino instead DotNetMock)
set pessimistic default expectations on DotNetMock based MockMessageSource to catch missing expectations

Index: CommonTypes.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Context/CommonTypes.cs,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** CommonTypes.cs	8 Aug 2007 17:48:45 -0000	1.20
--- CommonTypes.cs	23 Aug 2007 14:31:18 -0000	1.21
***************
*** 44,56 ****
  		private ExpectationCounter _getMessageCalls = new ExpectationCounter("MockMessageSource.GetMessageCounter");
  		private ExpectationString _getMessageCode = new ExpectationString("MockMessageSource.GetMessageCode");
  		private ExpectationArray _getMessageArguments = new ExpectationArray("MockMessageSource.GetMessageArguments");
  
  		private string _getMessageReturn = null;
  
! 		public void SetExpectedGetMessageCalls(int calls)
  		{
  			_getMessageCalls.Expected = calls;
  		}
  
  		public void SetExpectedGetMessageArguments(object[] arguments)
  		{
--- 44,72 ----
  		private ExpectationCounter _getMessageCalls = new ExpectationCounter("MockMessageSource.GetMessageCounter");
  		private ExpectationString _getMessageCode = new ExpectationString("MockMessageSource.GetMessageCode");
+         private ExpectationString _getMessageDefaultMessage = new ExpectationString("MockMessageSource.GetMessageDefaultMessage");
  		private ExpectationArray _getMessageArguments = new ExpectationArray("MockMessageSource.GetMessageArguments");
  
  		private string _getMessageReturn = null;
  
! 
! 	    public MockMessageSource()
! 	    {
!             // this is to ensure, that no expectations may be violated
! 	        _getMessageCalls.Expected = -1;
! 	        _getMessageCode.Expected = "something very, very unlikely " + Guid.NewGuid();
! 	        _getMessageDefaultMessage.Expected = "something very, very unlikely " + Guid.NewGuid();
! 	        _getMessageArguments.Expected = new object[] { "something very, very unlikely " + Guid.NewGuid() };
! 	    }
! 
! 	    public void SetExpectedGetMessageCalls(int calls)
  		{
  			_getMessageCalls.Expected = calls;
  		}
  
+         public void SetExpectedGetMessageDefaultMessage(string defaultMessage)
+         {
+             _getMessageDefaultMessage.Expected = defaultMessage;
+         }
+ 
  		public void SetExpectedGetMessageArguments(object[] arguments)
  		{
***************
*** 104,107 ****
--- 120,124 ----
              _getMessageCalls.Inc();
              _getMessageCode.Actual = name;
+ 	        _getMessageDefaultMessage.Actual = defaultMessage;
              _getMessageArguments.Actual = arguments;
              return _getMessageReturn;