|
From: Mike C. <mc...@us...> - 2007-08-16 15:14:50
|
Update of /cvsroot/nmock/nmock2/src/NMock2.AcceptanceTests In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27332/src/NMock2.AcceptanceTests Modified Files: NMock2.AcceptanceTests.csproj ExpectationsAcceptanceTest.cs Added Files: ArgumentMatchingAcceptanceTest.cs Log Message: Support mixing Matchers and non-Matchers in expected argument lists. Index: ExpectationsAcceptanceTest.cs =================================================================== RCS file: /cvsroot/nmock/nmock2/src/NMock2.AcceptanceTests/ExpectationsAcceptanceTest.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ExpectationsAcceptanceTest.cs 2 Feb 2006 17:36:10 -0000 1.3 --- ExpectationsAcceptanceTest.cs 16 Aug 2007 15:14:50 -0000 1.4 *************** *** 119,123 **** [Test] ! public void PassesTestIfMethodExpectedAtMostNTimesButCalledMoreThanNTimes() { Mockery mocks = new Mockery(); --- 119,123 ---- [Test] ! public void PassesTestIfMethodExpectedAtMostNTimesAndCalledLessThanNTimes() { Mockery mocks = new Mockery(); --- NEW FILE: ArgumentMatchingAcceptanceTest.cs --- using NUnit.Framework; namespace NMock2.AcceptanceTests { [TestFixture] public class ArgumentMatchingAcceptanceTest { public interface IDemanding { void Take(int foo, int bar, int baz); } [Test] public void CanMixMatcherAndNonMatcherExpectedArguments() { Mockery mocks = new Mockery(); IDemanding demanding = (IDemanding) mocks.NewMock(typeof(IDemanding)); Expect.Once.On(demanding).Method("Take").With(1, 2, 3); Expect.Once.On(demanding).Method("Take").With(Is.EqualTo(10), Is.AtLeast(11), Is.AtMost(12)); Expect.Once.On(demanding).Method("Take").With(20, Is.AtLeast(19), 22); demanding.Take(1, 2, 3); demanding.Take(10, 11, 12); demanding.Take(20, 21, 22); mocks.VerifyAllExpectationsHaveBeenMet(); } } } Index: NMock2.AcceptanceTests.csproj =================================================================== RCS file: /cvsroot/nmock/nmock2/src/NMock2.AcceptanceTests/NMock2.AcceptanceTests.csproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NMock2.AcceptanceTests.csproj 2 Feb 2006 22:37:41 -0000 1.2 --- NMock2.AcceptanceTests.csproj 16 Aug 2007 15:14:50 -0000 1.3 *************** *** 95,98 **** --- 95,103 ---- <Include> <File + RelPath = "ArgumentMatchingAcceptanceTest.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "AssemblyInfo.cs" SubType = "Code" |