Menu
▾
▴
[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects/dynamic Expectation.java,1.1,1.2 CoreMock.java,1.12,1.13 InvocationMatcher.java,1.2,1.3 Mock.java,1.41,1.42 InvocationMocker.java,1.3,1.4 C.java,1.6,1.7 InvokableFactory.java,1.6,1.7 DefaultInvokableFactory.java,1.8,1.9 ArgumentsMatcher.java,1.2,NONE FullArgumentsMatcher.java,1.2,NONE
|
From: Steve F. <sm...@us...> - 2003-10-14 20:26:23
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic In directory sc8-pr-cvs1:/tmp/cvs-serv22009/src/core/com/mockobjects/dynamic Modified Files: Expectation.java CoreMock.java InvocationMatcher.java Mock.java InvocationMocker.java C.java InvokableFactory.java DefaultInvokableFactory.java Removed Files: ArgumentsMatcher.java FullArgumentsMatcher.java Log Message: Converged ArgumentMatcher into InvocationMatcher.Arguments Index: Expectation.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Expectation.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Expectation.java 20 Aug 2003 21:47:58 -0000 1.1 +++ Expectation.java 14 Oct 2003 20:26:03 -0000 1.2 @@ -1,8 +1,5 @@ /* - * Created on 20-Aug-2003 - * - * To change the template for this generated file go to - * Window>Preferences>Java>Code Generation>Code and Comments + * Copyright mockobjects.com 20-Aug-2003 */ package com.mockobjects.dynamic; @@ -10,8 +7,6 @@ /** * An object that checks expectations of an Invokable object. - * - * @author montagu */ public interface Expectation extends Verifiable Index: CoreMock.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/CoreMock.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- CoreMock.java 2 Oct 2003 22:55:32 -0000 1.12 +++ CoreMock.java 14 Oct 2003 20:26:03 -0000 1.13 @@ -56,8 +56,8 @@ return this.name; } - public void add(Invokable invocationMatcher) { - invocationDispatcher.add(invocationMatcher); + public void add(Invokable invokable) { + invocationDispatcher.add(invokable); } public void reset() { Index: InvocationMatcher.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/InvocationMatcher.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- InvocationMatcher.java 5 Oct 2003 08:57:27 -0000 1.2 +++ InvocationMatcher.java 14 Oct 2003 20:26:03 -0000 1.3 @@ -27,7 +27,9 @@ } } - public class Arguments implements InvocationMatcher { + public class Arguments + implements InvocationMatcher + { private Constraint[] constraints; public Arguments(Constraint[] constraints) { @@ -46,6 +48,23 @@ } } return true; + } + + public Constraint[] getConstraints() { + return constraints; + } + + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("ArgumentMatcher: "); + for (int i = 0; i < constraints.length; ++i) { + result.append(constraints[i]).append(", "); + } + return result.toString(); + } + + public boolean equals(Object other) { + return other != null && toString().equals(other.toString()); } } Index: Mock.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Mock.java,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- Mock.java 4 Oct 2003 22:56:45 -0000 1.41 +++ Mock.java 14 Oct 2003 20:26:03 -0000 1.42 @@ -25,13 +25,13 @@ return coreMock.toString(); } - private ArgumentsMatcher createConstraintMatcher(Object constraintArg) { + private InvocationMatcher createConstraintMatcher(Object constraintArg) { // Can't overload this method as callee had an Object parameter, and java // doesn't do a secondary dispatch on the true underlying type if (constraintArg instanceof Constraint[]) { // to support possible legacy usage of new Contraint[] {...} - return new FullArgumentsMatcher((Constraint[])constraintArg); + return new InvocationMatcher.Arguments((Constraint[])constraintArg); } else if (constraintArg instanceof Constraint) { // to support usage of C.lt(5) type constraints return C.args((Constraint)constraintArg); @@ -41,27 +41,27 @@ } } - public void expect(String methodName, ArgumentsMatcher args) { + public void expect(String methodName, InvocationMatcher args) { coreMock.add(callableFactory.createVoidExpectation(methodName, args)); } - public void expectAndReturn(String methodName, ArgumentsMatcher args, Object result) { + public void expectAndReturn(String methodName, InvocationMatcher args, Object result) { coreMock.add(callableFactory.createReturnExpectation(methodName, args, result)); } - public void expectAndThrow(String methodName, ArgumentsMatcher args, Throwable throwable) { + public void expectAndThrow(String methodName, InvocationMatcher args, Throwable throwable) { coreMock.add(callableFactory.createThrowableExpectation(methodName, args, throwable)); } - public void match(String methodName, ArgumentsMatcher args) { + public void match(String methodName, InvocationMatcher args) { coreMock.add(callableFactory.createVoidStub(methodName, args)); } - public void matchAndReturn(String methodName, ArgumentsMatcher args, Object result) { + public void matchAndReturn(String methodName, InvocationMatcher args, Object result) { coreMock.add(callableFactory.createReturnStub(methodName, args, result)); } - public void matchAndThrow(String methodName, ArgumentsMatcher args, Throwable throwable) { + public void matchAndThrow(String methodName, InvocationMatcher args, Throwable throwable) { coreMock.add(callableFactory.createThrowableStub(methodName, args, throwable)); } @@ -101,11 +101,11 @@ expectAndReturn(methodName, singleEqualArg, new Integer(result)); } - public void expectAndReturn(String methodName, ArgumentsMatcher args, boolean result) { + public void expectAndReturn(String methodName, InvocationMatcher args, boolean result) { expectAndReturn(methodName, args, new Boolean(result)); } - public void expectAndReturn(String methodName, ArgumentsMatcher args, int result) { + public void expectAndReturn(String methodName, InvocationMatcher args, int result) { expectAndReturn(methodName, args, new Integer(result)); } @@ -165,11 +165,11 @@ matchAndReturn(methodName, singleEqualArg, new Integer(result)); } - public void matchAndReturn(String methodName, ArgumentsMatcher args, boolean result) { + public void matchAndReturn(String methodName, InvocationMatcher args, boolean result) { matchAndReturn(methodName, args, new Boolean(result)); } - public void matchAndReturn(String methodName, ArgumentsMatcher args, int result) { + public void matchAndReturn(String methodName, InvocationMatcher args, int result) { matchAndReturn(methodName, args, new Integer(result)); } @@ -191,7 +191,7 @@ /** @deprecated @see expect */ - public void expectVoid(String methodName, ArgumentsMatcher args) { + public void expectVoid(String methodName, InvocationMatcher args) { this.expect(methodName, args); } Index: InvocationMocker.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/InvocationMocker.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- InvocationMocker.java 5 Oct 2003 10:10:18 -0000 1.3 +++ InvocationMocker.java 14 Oct 2003 20:26:03 -0000 1.4 @@ -8,7 +8,7 @@ private InvocationMatcher[] matchers; private Stub stub; - public InvocationMocker(String methodName, InvocationMatcher.Arguments arguments, Stub stub) { + public InvocationMocker(String methodName, InvocationMatcher arguments, Stub stub) { this(new InvocationMatcher[] {new InvocationMatcher.MethodName(methodName), arguments}, stub); } Index: C.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/C.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- C.java 5 Oct 2003 09:28:16 -0000 1.6 +++ C.java 14 Oct 2003 20:26:03 -0000 1.7 @@ -19,16 +19,14 @@ public static final Constraint IS_ZERO = eq(new Integer(0)); public static final Constraint IS_NOT_ZERO = not(IS_ZERO); - public static final ArgumentsMatcher NO_ARGS = new FullArgumentsMatcher(new Constraint[0]); - public static final ArgumentsMatcher ANY_ARGS = - new ArgumentsMatcher() { - final Constraint anyArguments = new IsAnything() { - public String toString() { - return "Any Arguments"; - } - }; - public boolean matches(Object[] args) { return true; } - public Constraint[] getConstraints() { return new Constraint[] {anyArguments};} + public static final InvocationMatcher NO_ARGS = + new InvocationMatcher() { + public boolean matches(Invocation invocation) { return invocation.getParameterValues().isEmpty();} + }; + + public static final InvocationMatcher ANY_ARGS = + new InvocationMatcher() { + public boolean matches(Invocation invocation) { return true;} }; public static Constraint same( Object o ) { @@ -39,15 +37,15 @@ return new IsEqual(o); } - public static ArgumentsMatcher eq( Object arg0, Object arg1 ) { + public static InvocationMatcher eq( Object arg0, Object arg1 ) { return args(eq(arg0), eq(arg1)); } - public static ArgumentsMatcher eq( Object arg0, Object arg1, Object arg2 ) { + public static InvocationMatcher eq( Object arg0, Object arg1, Object arg2 ) { return args(eq(arg0), eq(arg1), eq(arg2)); } - public static ArgumentsMatcher eq( Object arg0, Object arg1, Object arg2, Object arg3 ) { + public static InvocationMatcher eq( Object arg0, Object arg1, Object arg2, Object arg3 ) { return args(eq(arg0), eq(arg1), eq(arg2), eq(arg3)); } @@ -116,32 +114,32 @@ /* Helper methods for succinctly constructing Constraint arrays */ - public static ArgumentsMatcher args() { + public static InvocationMatcher args() { return NO_ARGS; } - public static ArgumentsMatcher args(Constraint p) { - return new FullArgumentsMatcher(new Constraint[]{p}); + public static InvocationMatcher args(Constraint p) { + return new InvocationMatcher.Arguments(new Constraint[]{p}); } - public static ArgumentsMatcher args(Constraint p1, Constraint p2) { - return new FullArgumentsMatcher(new Constraint[]{p1, p2}); + public static InvocationMatcher args(Constraint p1, Constraint p2) { + return new InvocationMatcher.Arguments(new Constraint[]{p1, p2}); } - public static ArgumentsMatcher args(Constraint p1, Constraint p2, Constraint p3) { - return new FullArgumentsMatcher(new Constraint[]{p1, p2, p3}); + public static InvocationMatcher args(Constraint p1, Constraint p2, Constraint p3) { + return new InvocationMatcher.Arguments(new Constraint[]{p1, p2, p3}); } - public static ArgumentsMatcher args(Constraint p1, Constraint p2, Constraint p3, Constraint p4) { - return new FullArgumentsMatcher(new Constraint[]{p1, p2, p3, p4}); + public static InvocationMatcher args(Constraint p1, Constraint p2, Constraint p3, Constraint p4) { + return new InvocationMatcher.Arguments(new Constraint[]{p1, p2, p3, p4}); } - public static ArgumentsMatcher anyArgs( int argCount) { + public static InvocationMatcher anyArgs( int argCount) { Constraint[] constraints = new Constraint[argCount]; for (int i = 0; i < constraints.length; i++) { constraints[i] = new IsAnything(); } - return new FullArgumentsMatcher(constraints); + return new InvocationMatcher.Arguments(constraints); } } Index: InvokableFactory.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/InvokableFactory.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- InvokableFactory.java 4 Oct 2003 22:56:45 -0000 1.6 +++ InvokableFactory.java 14 Oct 2003 20:26:03 -0000 1.7 @@ -1,10 +1,10 @@ package com.mockobjects.dynamic; public interface InvokableFactory { - Invokable createReturnStub( String methodName, ArgumentsMatcher constraints, Object result ); - Invokable createReturnExpectation( String methodName, ArgumentsMatcher constraints, Object result ); - Invokable createThrowableStub( String methodName, ArgumentsMatcher constraints, Throwable throwable); - Invokable createThrowableExpectation( String methodName, ArgumentsMatcher constraints, Throwable throwable); - Invokable createVoidStub ( String methodName, ArgumentsMatcher constraints); - Invokable createVoidExpectation ( String methodName, ArgumentsMatcher constraints); + Invokable createReturnStub( String methodName, InvocationMatcher constraints, Object result ); + Invokable createReturnExpectation( String methodName, InvocationMatcher constraints, Object result ); + Invokable createThrowableStub( String methodName, InvocationMatcher constraints, Throwable throwable); + Invokable createThrowableExpectation( String methodName, InvocationMatcher constraints, Throwable throwable); + Invokable createVoidStub ( String methodName, InvocationMatcher constraints); + Invokable createVoidExpectation ( String methodName, InvocationMatcher constraints); } Index: DefaultInvokableFactory.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/DefaultInvokableFactory.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- DefaultInvokableFactory.java 8 Oct 2003 23:47:14 -0000 1.8 +++ DefaultInvokableFactory.java 14 Oct 2003 20:26:03 -0000 1.9 @@ -2,36 +2,24 @@ public class DefaultInvokableFactory implements InvokableFactory { - public Invokable createReturnStub(String methodName, ArgumentsMatcher arguments, Object result) { - return new InvocationMocker(methodName, - new InvocationMatcher.Arguments(arguments.getConstraints()), - new ReturnStub(result)); + public Invokable createReturnStub(String methodName, InvocationMatcher arguments, Object result) { + return new InvocationMocker(methodName, arguments, new ReturnStub(result)); } - public Invokable createReturnExpectation(String methodName, ArgumentsMatcher arguments, Object result) { - return new InvocationMocker(methodName, - new InvocationMatcher.Arguments(arguments.getConstraints()), - new CallOnceStub(new ReturnStub(result))); + public Invokable createReturnExpectation(String methodName, InvocationMatcher arguments, Object result) { + return new InvocationMocker(methodName, arguments, new CallOnceStub(new ReturnStub(result))); } - public Invokable createThrowableStub(String methodName, ArgumentsMatcher arguments, Throwable throwable) { - return new InvocationMocker(methodName, - new InvocationMatcher.Arguments(arguments.getConstraints()), - new ThrowStub(throwable)); + public Invokable createThrowableStub(String methodName, InvocationMatcher arguments, Throwable throwable) { + return new InvocationMocker(methodName, arguments, new ThrowStub(throwable)); } - public Invokable createThrowableExpectation(String methodName, ArgumentsMatcher arguments, Throwable throwable) { - return new InvocationMocker(methodName, - new InvocationMatcher.Arguments(arguments.getConstraints()), - new CallOnceStub(new ThrowStub(throwable))); + public Invokable createThrowableExpectation(String methodName, InvocationMatcher arguments, Throwable throwable) { + return new InvocationMocker(methodName, arguments,new CallOnceStub(new ThrowStub(throwable))); } - public Invokable createVoidStub(String methodName, ArgumentsMatcher arguments) { - return new InvocationMocker(methodName, - new InvocationMatcher.Arguments(arguments.getConstraints()), - new VoidStub()); + public Invokable createVoidStub(String methodName, InvocationMatcher arguments) { + return new InvocationMocker(methodName, arguments, new VoidStub()); } - public Invokable createVoidExpectation(String methodName, ArgumentsMatcher arguments) { - return new InvocationMocker(methodName, - new InvocationMatcher.Arguments(arguments.getConstraints()), - new CallOnceStub(new VoidStub())); + public Invokable createVoidExpectation(String methodName, InvocationMatcher arguments) { + return new InvocationMocker(methodName, arguments, new CallOnceStub(new VoidStub())); } } --- ArgumentsMatcher.java DELETED --- --- FullArgumentsMatcher.java DELETED --- |
