From: Tim M. <ma...@us...> - 2003-04-11 13:18:54
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic In directory sc8-pr-cvs1:/tmp/cvs-serv19788/src/core/com/mockobjects/dynamic Modified Files: Tag: DynamicMockExperiment CallSet.java DefaultCallFactory.java CallStub.java CallFactory.java ExpectedCall.java CallMatch.java Added Files: Tag: DynamicMockExperiment OrderedMock.java Callable.java Removed Files: Tag: DynamicMockExperiment CallMocker.java Log Message: Renamed CallMocker to Callable - added expectAndReturn(String, Object, Object) --- NEW FILE: OrderedMock.java --- /* * Created on 11-Apr-2003 */ package com.mockobjects.dynamic; /** * @author Administrator */ public class OrderedMock extends Mock { public OrderedMock(Class mockedClass) { super(mockedClass); } public OrderedMock(Class mockedClass, String name) { super(mockedClass, name); } } --- NEW FILE: Callable.java --- /* * Created on 04-Apr-2003 */ package com.mockobjects.dynamic; import com.mockobjects.*; public interface Callable extends Verifiable { String getDescription(); Object call( Mock mock, String methodName, Object[] args ) throws Throwable; boolean matches(String methodName, Object[] args); } Index: CallSet.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Attic/CallSet.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- CallSet.java 10 Apr 2003 21:24:43 -0000 1.1.2.4 +++ CallSet.java 11 Apr 2003 13:18:43 -0000 1.1.2.5 @@ -13,7 +13,7 @@ /** * @author dev */ -public class CallSet implements CallMocker { +public class CallSet implements Callable { private List expectedCalls = new ArrayList(); private CallFactory callFactory; @@ -28,7 +28,7 @@ public Object call(Mock mock, String methodName, Object[] args) throws Throwable { for (Iterator call = expectedCalls.iterator(); call.hasNext();) { - CallMocker element = (CallMocker) call.next(); + Callable element = (Callable) call.next(); if(element.matches(methodName, args)) { return element.call(mock, methodName, args); } @@ -51,7 +51,7 @@ buf.append( "one of:\n" ); for( Iterator i = expectedCalls.iterator(); i.hasNext(); ) { - buf.append( ((CallMocker)i.next()).getDescription() ); + buf.append( ((Callable)i.next()).getDescription() ); buf.append( "\n" ); } @@ -61,19 +61,18 @@ public void verify() { for (Iterator call = expectedCalls.iterator(); call.hasNext();) { - CallMocker element = (CallMocker) call.next(); + Callable element = (Callable) call.next(); element.verify(); } } - public void add(CallMocker call) { + public void add(Callable call) { expectedCalls.add(call); } public void matchAndReturn( String methodName, Object equalArg, Object result ) { - add( callFactory.createCallMatch( methodName, C.args(C.eq(equalArg)), - callFactory.createReturnStub(result) ) ); + matchAndReturn(methodName, C.args(C.eq(equalArg)), result); } public void matchAndReturn( String methodName, Constraint[] args, Object result ) { @@ -86,10 +85,15 @@ callFactory.createThrowStub(throwable) ) ); } + + + public void expectAndReturn( String methodName, Object equalArg, Object result ) { + expectAndReturn(methodName, C.args(C.eq(equalArg)), result); + } + public void expectAndReturn( String methodName, Constraint[] args, Object result ) { add( callFactory.createExpectedCall( callFactory.createCallMatch( methodName, args, callFactory.createReturnStub(result)))); } - public void expectAndThrow( String methodName, Constraint[] args, Throwable exception ) { add( callFactory.createExpectedCall( callFactory.createCallMatch( methodName, args, callFactory.createThrowStub(exception)))); } Index: DefaultCallFactory.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Attic/DefaultCallFactory.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- DefaultCallFactory.java 7 Apr 2003 17:38:22 -0000 1.1.2.1 +++ DefaultCallFactory.java 11 Apr 2003 13:18:44 -0000 1.1.2.2 @@ -10,19 +10,19 @@ */ public class DefaultCallFactory implements CallFactory { - public CallMocker createReturnStub(Object result) { + public Callable createReturnStub(Object result) { return new ReturnStub(result); } - public CallMocker createThrowStub( Throwable exception ) { + public Callable createThrowStub( Throwable exception ) { return new ThrowStub(exception); } - public CallMocker createExpectedCall(CallMocker call) { + public Callable createExpectedCall(Callable call) { return new ExpectedCall(call); } - public CallMocker createCallMatch(String methodName, Constraint[] constraints, CallMocker call) { + public Callable createCallMatch(String methodName, Constraint[] constraints, Callable call) { return new CallMatch( methodName, constraints, call ); } Index: CallStub.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Attic/CallStub.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- CallStub.java 7 Apr 2003 14:26:54 -0000 1.1.2.1 +++ CallStub.java 11 Apr 2003 13:18:44 -0000 1.1.2.2 @@ -7,7 +7,7 @@ * @author dev */ public abstract class CallStub - implements CallMocker + implements Callable { public boolean matches(String methodName, Object[] args) { return true; Index: CallFactory.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Attic/CallFactory.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- CallFactory.java 7 Apr 2003 17:38:23 -0000 1.1.2.1 +++ CallFactory.java 11 Apr 2003 13:18:45 -0000 1.1.2.2 @@ -9,8 +9,8 @@ * @author dev */ public interface CallFactory { - CallMocker createReturnStub( Object result ); - CallMocker createThrowStub( Throwable throwable ); - CallMocker createExpectedCall( CallMocker call ); - CallMocker createCallMatch( String methodName, Constraint[] constraints, CallMocker call ); + Callable createReturnStub( Object result ); + Callable createThrowStub( Throwable throwable ); + Callable createExpectedCall( Callable call ); + Callable createCallMatch( String methodName, Constraint[] constraints, Callable call ); } Index: ExpectedCall.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Attic/ExpectedCall.java,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -r1.2.2.2 -r1.2.2.3 --- ExpectedCall.java 7 Apr 2003 17:38:22 -0000 1.2.2.2 +++ ExpectedCall.java 11 Apr 2003 13:18:45 -0000 1.2.2.3 @@ -8,11 +8,11 @@ /** * @author dev */ -public class ExpectedCall implements CallMocker { - private CallMocker decorated; +public class ExpectedCall implements Callable { + private Callable decorated; private boolean wasCalled = false; - public ExpectedCall( CallMocker decorated ) { + public ExpectedCall( Callable decorated ) { this.decorated = decorated; } Index: CallMatch.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Attic/CallMatch.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- CallMatch.java 7 Apr 2003 17:38:24 -0000 1.1.2.1 +++ CallMatch.java 11 Apr 2003 13:18:46 -0000 1.1.2.2 @@ -8,13 +8,13 @@ import com.mockobjects.constraint.*; import com.mockobjects.util.*; -public class CallMatch extends Assert implements CallMocker +public class CallMatch extends Assert implements Callable { private String methodName; private Constraint[] constraints; - private CallMocker decorated; + private Callable decorated; - public CallMatch( String methodName, Constraint[] constraints, CallMocker decorated ) { + public CallMatch( String methodName, Constraint[] constraints, Callable decorated ) { this.methodName = methodName; this.constraints = (Constraint[])constraints.clone(); this.decorated = decorated; --- CallMocker.java DELETED --- |