|
From: Erich E. <oak...@us...> - 2007-08-23 14:31:25
|
Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Context/Support In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3851/Context/Support Modified Files: AbstractMessageSourceTests.cs MessageSourceAccessorTests.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: AbstractMessageSourceTests.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Context/Support/AbstractMessageSourceTests.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AbstractMessageSourceTests.cs 2 Jul 2007 21:24:48 -0000 1.5 --- AbstractMessageSourceTests.cs 23 Aug 2007 14:31:18 -0000 1.6 *************** *** 19,29 **** #endregion using System; using System.Globalization; using NUnit.Framework; namespace Spring.Context.Support { ! [TestFixture] public sealed class AbstractMessageSourceTests : AbstractMessageSource { --- 19,35 ---- #endregion + #region Imports + using System; using System.Globalization; using NUnit.Framework; + #endregion + namespace Spring.Context.Support { ! /// <author></author> ! /// <version>$Id$</version> ! [TestFixture] public sealed class AbstractMessageSourceTests : AbstractMessageSource { *************** *** 47,57 **** public void GetResolvableDefaultsToParentMessageSource() { MockMessageSource parentSource = new MockMessageSource(); parentSource.SetExpectedGetMessageCalls(1); parentSource.SetExpectedGetMessageReturn("MockMessageSource"); ParentMessageSource = parentSource; ! MockMessageResolvable res = new MockMessageResolvable(); ! res.SetExpectedCodesCalls(1); ! res.SetCode("nullCode"); Assert.AreEqual("MockMessageSource", GetMessage(res, CultureInfo.CurrentCulture), "My Message"); parentSource.Verify(); --- 53,72 ---- public void GetResolvableDefaultsToParentMessageSource() { + string MSGCODE = "nullCode"; + object[] MSGARGS = new object[] { "arg1", "arg2" }; + + MockMessageResolvable res = new MockMessageResolvable(); + res.SetExpectedCodesCalls(1); + res.SetArguments(MSGARGS); + res.SetCode(MSGCODE); + MockMessageSource parentSource = new MockMessageSource(); parentSource.SetExpectedGetMessageCalls(1); + parentSource.SetExpectedGetMessageCode(MSGCODE); + parentSource.SetExpectedGetMessageDefaultMessage(null); + parentSource.SetExpectedGetMessageArguments(res.GetArguments()); parentSource.SetExpectedGetMessageReturn("MockMessageSource"); ParentMessageSource = parentSource; ! Assert.AreEqual("MockMessageSource", GetMessage(res, CultureInfo.CurrentCulture), "My Message"); parentSource.Verify(); *************** *** 62,70 **** public void GetMessageParentMessageSource() { MockMessageSource parentSource = new MockMessageSource(); parentSource.SetExpectedGetMessageCalls(1); parentSource.SetExpectedGetMessageReturn("my parent message"); ParentMessageSource = parentSource; ! Assert.AreEqual("my parent message", GetMessage("null", CultureInfo.CurrentCulture, new object[] {"arguments"}), "message"); parentSource.Verify(); } --- 77,89 ---- public void GetMessageParentMessageSource() { + object[] args = new object[] {"arguments"}; MockMessageSource parentSource = new MockMessageSource(); parentSource.SetExpectedGetMessageCalls(1); + parentSource.SetExpectedGetMessageCode("null"); + parentSource.SetExpectedGetMessageDefaultMessage(null); + parentSource.SetExpectedGetMessageArguments(args); parentSource.SetExpectedGetMessageReturn("my parent message"); ParentMessageSource = parentSource; ! Assert.AreEqual("my parent message", GetMessage("null", "message", CultureInfo.CurrentCulture, args[0])); parentSource.Verify(); } Index: MessageSourceAccessorTests.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Context/Support/MessageSourceAccessorTests.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MessageSourceAccessorTests.cs 24 Jul 2007 17:26:40 -0000 1.5 --- MessageSourceAccessorTests.cs 23 Aug 2007 14:31:18 -0000 1.6 *************** *** 22,25 **** --- 22,26 ---- using NUnit.Framework; + using Rhino.Mocks; using Spring.Globalization; *************** *** 41,55 **** } [Test] ! public void DefaultsToCurrentUICulture() { ! MockMessageSource mockMsgSource = new MockMessageSource(); ! mockMsgSource.SetExpectedGetMessageCalls(1); ! mockMsgSource.SetExpectedGetMessageCode("code1"); ! mockMsgSource.SetExpectedGetMessageReturn("my message"); ! mockMsgSource.SetExpectedGetMessageArguments(new object[] { "argument1" }); MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource); ! Assert.AreEqual("my message", msgSourceAccessor.GetMessage("code1", CultureInfo.CurrentUICulture, new object[] { "argument1" })); ! mockMsgSource.Verify(); } --- 42,77 ---- } + private readonly string MSGCODE = "code1"; + private readonly CultureInfo MSGCULTURE = new CultureInfo("fr"); + private readonly object[] MSGARGS = new object[] { "argument1" }; + private readonly string MSGRESULT = "my message"; + + + private MockRepository mocks; + private IMessageSource mockMsgSource; + private IMessageSourceResolvable mockMsgSourceResolvable; + + [SetUp] + public void SetUp() + { + mocks = new MockRepository(); + mockMsgSource = (IMessageSource) mocks.CreateMock(typeof(IMessageSource)); + mockMsgSourceResolvable = (IMessageSourceResolvable) mocks.CreateMock(typeof(IMessageSourceResolvable)); + } + + [TearDown] + public void TearDown() + { + mocks.VerifyAll(); + } + [Test] ! public void GetMessageCodeCultureArgs() { ! Expect.Call(mockMsgSource.GetMessage(MSGCODE, MSGCULTURE, MSGARGS)).Return(MSGRESULT); ! mocks.ReplayAll(); ! MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource); ! Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(MSGCODE, MSGCULTURE, MSGARGS)); } *************** *** 57,93 **** public void GetMessageCodeArgs() { ! MockMessageSource mockMsgSource = new MockMessageSource(); ! mockMsgSource.SetExpectedGetMessageCalls(1); ! mockMsgSource.SetExpectedGetMessageCode("code1"); ! mockMsgSource.SetExpectedGetMessageReturn("my message"); ! mockMsgSource.SetExpectedGetMessageArguments(new object[] {"argument1"}); ! MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource, CultureInfo.CurrentUICulture); ! Assert.AreEqual("my message", msgSourceAccessor.GetMessage("code1", new object[] {"argument1"})); ! mockMsgSource.Verify(); } [Test] ! public void GetMessageCode() { ! MockMessageSource mockMsgSource = new MockMessageSource(); ! mockMsgSource.SetExpectedGetMessageCalls(1); ! mockMsgSource.SetExpectedGetMessageCode("code1"); ! mockMsgSource.SetExpectedGetMessageReturn("my message"); ! mockMsgSource.SetExpectedGetMessageArguments(null); MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource); ! Assert.AreEqual("my message", msgSourceAccessor.GetMessage("code1")); ! mockMsgSource.Verify(); } [Test] ! public void GetMessageResolvable() { ! MockMessageSource mockMsgSource = new MockMessageSource(); ! mockMsgSource.SetExpectedGetMessageCalls(1); ! mockMsgSource.SetExpectedGetMessageReturn("my message"); MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource); ! Assert.AreEqual("my message", msgSourceAccessor.GetMessage(new MockMessageResolvable())); ! mockMsgSource.Verify(); } } --- 79,137 ---- public void GetMessageCodeArgs() { ! Expect.Call(mockMsgSource.GetMessage(MSGCODE, MSGCULTURE, MSGARGS)).Return(MSGRESULT); ! mocks.ReplayAll(); ! ! MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource, MSGCULTURE); ! Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(MSGCODE, MSGARGS)); } [Test] ! public void GetMessageCodeArgsDefaultsToCurrentUICulture() { ! Expect.Call(mockMsgSource.GetMessage(MSGCODE, CultureInfo.CurrentUICulture, MSGARGS)).Return(MSGRESULT); ! mocks.ReplayAll(); ! MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource); ! Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(MSGCODE, MSGARGS)); } [Test] ! public void GetMessageCodeCulture() { ! Expect.Call(mockMsgSource.GetMessage(MSGCODE, MSGCULTURE)).Return(MSGRESULT); ! mocks.ReplayAll(); ! MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource); ! Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(MSGCODE, MSGCULTURE)); ! } ! ! [Test] ! public void GetMessageCodeDefaultsToCurrentUICulture() ! { ! Expect.Call(mockMsgSource.GetMessage(MSGCODE, CultureInfo.CurrentUICulture)).Return(MSGRESULT); ! mocks.ReplayAll(); ! ! MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource); ! Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(MSGCODE)); ! } ! ! [Test] ! public void GetMessageResolvableCulture() ! { ! Expect.Call(mockMsgSource.GetMessage(mockMsgSourceResolvable, MSGCULTURE)).Return(MSGRESULT); ! mocks.ReplayAll(); + MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource); + Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(mockMsgSourceResolvable, MSGCULTURE)); + } + + [Test] + public void GetMessageResolvableDefaultsToCurrentUICulture() + { + Expect.Call(mockMsgSource.GetMessage(mockMsgSourceResolvable, CultureInfo.CurrentUICulture)).Return(MSGRESULT); + mocks.ReplayAll(); + + MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource); + Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(mockMsgSourceResolvable)); } } |
