Menu
▾
▴
[Dotnetmock-commits] dotnetmock/DotNetMock.Tests/Dynamic AbstractDynamicMockTests.cs,1.5,1.6 DynamicMockTests.cs,1.19,1.20 DynamicOrderedMockTests.cs,1.8,1.9 MethodCallTests.cs,1.5,1.6 PredicateTests.cs,1.15,1.16
|
From: Griffin C. <gc...@us...> - 2006-03-06 02:25:00
|
Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/Dynamic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10746/DotNetMock.Tests/Dynamic Modified Files: AbstractDynamicMockTests.cs DynamicMockTests.cs DynamicOrderedMockTests.cs MethodCallTests.cs PredicateTests.cs Log Message: - Merged in changes from Niklas Index: DynamicOrderedMockTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/Dynamic/DynamicOrderedMockTests.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** DynamicOrderedMockTests.cs 19 Feb 2005 21:47:56 -0000 1.8 --- DynamicOrderedMockTests.cs 6 Mar 2006 02:24:57 -0000 1.9 *************** *** 5,9 **** using System; using System.Reflection; - using DotNetMock.Dynamic.Predicates; using NUnit.Framework; using DotNetMock.Dynamic; --- 5,8 ---- *************** *** 35,39 **** public void CallMoreMethodsThanExpected() { ! mock.Expect("myMethod1"); mock.Expect("myMethod2"); mock.Call(myMethod1); --- 34,39 ---- public void CallMoreMethodsThanExpected() { ! IDynamicMock mock = newDynamicMock(typeof(IBlah)); ! mock.Expect("myMethod1"); mock.Expect("myMethod2"); mock.Call(myMethod1); *************** *** 47,51 **** public void CallMultipleMethodsInWrongOrder() { ! mock.Expect("myMethod1"); mock.Expect("myMethod2"); mock.Expect("myMethod3"); --- 47,52 ---- public void CallMultipleMethodsInWrongOrder() { ! IDynamicMock mock = newDynamicMock(typeof(IBlah)); ! mock.Expect("myMethod1"); mock.Expect("myMethod2"); mock.Expect("myMethod3"); Index: DynamicMockTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/Dynamic/DynamicMockTests.cs,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** DynamicMockTests.cs 12 Feb 2005 18:10:36 -0000 1.19 --- DynamicMockTests.cs 6 Mar 2006 02:24:57 -0000 1.20 *************** *** 8,12 **** using NUnit.Framework; - using DotNetMock.Dynamic.Predicates; #endregion --- 8,11 ---- *************** *** 32,42 **** public void CallMultipleMethodsInWrongOrder() { ! mock.Expect("myMethod1"); ! mock.Expect("myMethod2"); ! mock.Expect("myMethod3"); ! mock.Call(myMethod1); ! mock.Call(myMethod3); ! mock.Call(myMethod2); ! mock.Verify(); } --- 31,42 ---- public void CallMultipleMethodsInWrongOrder() { ! IDynamicMock mock2 = newDynamicMock(typeof(IBlah)); ! mock2.Expect("myMethod1"); ! mock2.Expect("myMethod2"); ! mock2.Expect("myMethod3"); ! mock2.Call(myMethod1); ! mock2.Call(myMethod3); ! mock2.Call(myMethod2); ! mock2.Verify(); } *************** *** 45,50 **** public void NoCallToVoidMethodWithReason() { ! mock.Expect("myMethod"); ! mock.Verify(); } --- 45,51 ---- public void NoCallToVoidMethodWithReason() { ! IDynamicMock mock2 = newDynamicMock(typeof(IBlah)); ! mock2.Expect("myMethod"); ! mock2.Verify(); } *************** *** 53,64 **** public void ThrowsIfUnexpectedMethodCalled() { ! IDynamicMock mock = newDynamicMock(typeof(IBlah)); ! IBlah blah = (IBlah) mock.Object; ! mock.Strict = true; ! mock.ExpectAndReturn("DoStuff", "world", "hello"); Assert.AreEqual("world", blah.DoStuff("hello")); blah.DoStuffWithParams("ID", "P1", "P2"); ! mock.Verify(); } --- 54,65 ---- public void ThrowsIfUnexpectedMethodCalled() { ! IDynamicMock mock2 = newDynamicMock(typeof(IBlah)); ! IBlah blah = (IBlah) mock2.Object; ! mock2.Strict = true; ! mock2.ExpectAndReturn("DoStuff", "world", "hello"); Assert.AreEqual("world", blah.DoStuff("hello")); blah.DoStuffWithParams("ID", "P1", "P2"); ! mock2.Verify(); } *************** *** 66,73 **** public void CustomDynamicMock() { ! IDynamicMock mock = new CustomMock(typeof(IBlah)); ! IBlah blah = (IBlah)mock.Object; Assert.AreEqual("CUSTOM", blah.DoStuff("hello")); ! mock.Verify(); } private class CustomMock : DynamicMock --- 67,74 ---- public void CustomDynamicMock() { ! IDynamicMock mock2 = new CustomMock(typeof(IBlah)); ! IBlah blah = (IBlah)mock2.Object; Assert.AreEqual("CUSTOM", blah.DoStuff("hello")); ! mock2.Verify(); } private class CustomMock : DynamicMock Index: PredicateTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/Dynamic/PredicateTests.cs,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** PredicateTests.cs 25 Apr 2005 00:14:47 -0000 1.15 --- PredicateTests.cs 6 Mar 2006 02:24:57 -0000 1.16 *************** *** 29,33 **** { Assert.AreEqual( ! "value is within 0.1 of 1", new IsCloseTo( 1, 0.1 ).ToString( ) ); --- 29,33 ---- { Assert.AreEqual( ! "value is within "+ 0.1 +" of 1", new IsCloseTo( 1, 0.1 ).ToString( ) ); *************** *** 73,77 **** { Assert.AreEqual( ! "value is in [1, 'two', 3.4]", new IsIn( 1, "two", 3.4 ).ToString( ) ); --- 73,77 ---- { Assert.AreEqual( ! "value is in [1, 'two', "+3.4+"]", new IsIn( 1, "two", 3.4 ).ToString( ) ); *************** *** 114,118 **** { Assert.AreEqual( ! "value is not in [1, 'two', 3.4]", new NotIn( 1, "two", 3.4 ).ToString( ) ); --- 114,118 ---- { Assert.AreEqual( ! "value is not in [1, 'two', "+3.4+"]", new NotIn( 1, "two", 3.4 ).ToString( ) ); Index: MethodCallTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/Dynamic/MethodCallTests.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MethodCallTests.cs 11 May 2005 04:08:31 -0000 1.5 --- MethodCallTests.cs 6 Mar 2006 02:24:57 -0000 1.6 *************** *** 81,85 **** { MethodCall mc = new MethodCall(method3, 1, "two", 3.4); ! Assert.AreEqual("Method3(x=1, y=\"two\", z=3.4)", mc.ToString()); mc = new MethodCall(method4); Assert.AreEqual("Method4()", mc.ToString()); --- 81,85 ---- { MethodCall mc = new MethodCall(method3, 1, "two", 3.4); ! Assert.AreEqual("Method3(x=1, y=\"two\", z="+3.4+")", mc.ToString()); mc = new MethodCall(method4); Assert.AreEqual("Method4()", mc.ToString()); Index: AbstractDynamicMockTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/Dynamic/AbstractDynamicMockTests.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AbstractDynamicMockTests.cs 11 May 2005 05:17:14 -0000 1.5 --- AbstractDynamicMockTests.cs 6 Mar 2006 02:24:57 -0000 1.6 *************** *** 13,17 **** namespace DotNetMock.Tests.Dynamic { ! [TestFixture] public abstract class AbstractDynamicMockTests { --- 13,17 ---- namespace DotNetMock.Tests.Dynamic { ! public abstract class AbstractDynamicMockTests { *************** *** 20,24 **** protected MethodInfo myMethod1; protected MethodInfo myMethod2; ! protected MethodInfo myMethod3; protected MethodInfo anotherMethod; protected MethodInfo method0; --- 20,25 ---- protected MethodInfo myMethod1; protected MethodInfo myMethod2; ! protected MethodInfo myMethod3; ! protected MethodInfo myEnumMethod; protected MethodInfo anotherMethod; protected MethodInfo method0; *************** *** 45,50 **** protected abstract IDynamicMock newDynamicMock(Type type); protected abstract IDynamicMock newDynamicMock(string name); ! ! protected interface IBlah { object DoStuff(string name); --- 46,51 ---- protected abstract IDynamicMock newDynamicMock(Type type); protected abstract IDynamicMock newDynamicMock(string name); ! public enum MyEnum { One, Two }; ! public interface IBlah { object DoStuff(string name); *************** *** 57,62 **** void myMethod1(); void myMethod2(); ! void myMethod3(); ! void anotherMethod(); void Method0(object p0, object p1); object Method1(object p0); --- 58,63 ---- void myMethod1(); void myMethod2(); ! void myMethod3(); ! void anotherMethod(); void Method0(object p0, object p1); object Method1(object p0); *************** *** 90,95 **** myMethod1 = typeof(IBlah).GetMethod("myMethod1", new Type[0]); myMethod2 = typeof(IBlah).GetMethod("myMethod2", new Type[0]); ! myMethod3 = typeof(IBlah).GetMethod("myMethod3", new Type[0]); ! anotherMethod = typeof(IBlah).GetMethod("anotherMethod", new Type[0]); method0 = typeof(IBlah).GetMethod("Method0"); method1 = typeof(IBlah).GetMethod("Method1"); --- 91,96 ---- myMethod1 = typeof(IBlah).GetMethod("myMethod1", new Type[0]); myMethod2 = typeof(IBlah).GetMethod("myMethod2", new Type[0]); ! myMethod3 = typeof(IBlah).GetMethod("myMethod3", new Type[0]); ! anotherMethod = typeof(IBlah).GetMethod("anotherMethod", new Type[0]); method0 = typeof(IBlah).GetMethod("Method0"); method1 = typeof(IBlah).GetMethod("Method1"); *************** *** 290,294 **** --- 291,324 ---- mock.Verify(); } + + + [Test] + public void NoCallExpectedToVoidMethod() + { + mock.ExpectNoCall("myMethod"); + mock.Verify(); + } + [Test] + public void MixedCallNoCallExpectedToVoidMethod() + { + mock.Expect("myMethod"); + mock.ExpectNoCall("myMethod1"); + mock.ExpectNoCall("myMethod1"); + mock.ExpectNoCall("myMethod2"); + mock.Call(myMethod); + mock.Verify(); + } + [Test] + [ExpectedException(typeof(AssertionException))] + public void NoCallExpectedButCalledToVoidMethod() + { + mock.ExpectNoCall("myMethod"); + mock.Call(myMethod); + mock.Verify(); + } + + + [Test] public void CallToMethodWithParams() |
