Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv3487/core/com/mockobjects/dynamic
Modified Files:
DefaultCallFactory.java CallFactory.java Mock.java
Log Message:
Internal factory method rename from createExpectedCall
to createCallExpectation (makes clearer tht factories can have
a different CallExpectation policy e.g. CallOnce, or CallMany)
Index: DefaultCallFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/DefaultCallFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultCallFactory.java 19 May 2003 23:37:48 -0000 1.3
+++ DefaultCallFactory.java 19 May 2003 23:56:23 -0000 1.4
@@ -10,7 +10,7 @@
return new ThrowStub(exception);
}
- public Callable createExpectedCall(Callable call) {
+ public Callable createCallExpectation(Callable call) {
return new ExpectedCall(call);
}
Index: CallFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/CallFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CallFactory.java 19 May 2003 23:37:49 -0000 1.3
+++ CallFactory.java 19 May 2003 23:56:23 -0000 1.4
@@ -1,16 +1,9 @@
-/*
- * Created on 07-Apr-2003
- */
package com.mockobjects.dynamic;
-
-/**
- * @author dev
- */
public interface CallFactory {
Callable createReturnStub( Object result );
Callable createThrowStub( Throwable throwable );
Callable createVoidStub();
- Callable createExpectedCall( Callable call );
+ Callable createCallExpectation( Callable call );
Callable createCallSignature( String methodName, ConstraintMatcher constraints, Callable call );
}
Index: Mock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Mock.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Mock.java 19 May 2003 23:37:49 -0000 1.18
+++ Mock.java 19 May 2003 23:56:23 -0000 1.19
@@ -118,7 +118,7 @@
}
public void expect(String methodName, ConstraintMatcher args) {
- callSequence.addExpect(callFactory.createExpectedCall(callFactory.createCallSignature(methodName, args, callFactory.createVoidStub())));
+ callSequence.addExpect(callFactory.createCallExpectation(callFactory.createCallSignature(methodName, args, callFactory.createVoidStub())));
}
public void expectAndReturn(String methodName, Object result) {
@@ -146,7 +146,7 @@
}
public void expectAndReturn(String methodName, ConstraintMatcher args, Object result) {
- callSequence.addExpect(callFactory.createExpectedCall(callFactory.createCallSignature(methodName, args, callFactory.createReturnStub(result))));
+ callSequence.addExpect(callFactory.createCallExpectation(callFactory.createCallSignature(methodName, args, callFactory.createReturnStub(result))));
}
public void expectAndReturn(String methodName, ConstraintMatcher args, boolean result) {
@@ -166,7 +166,7 @@
}
public void expectAndThrow(String methodName, ConstraintMatcher args, Throwable exception) {
- callSequence.addExpect(callFactory.createExpectedCall(callFactory.createCallSignature(methodName, args, callFactory.createThrowStub(exception))));
+ callSequence.addExpect(callFactory.createCallExpectation(callFactory.createCallSignature(methodName, args, callFactory.createThrowStub(exception))));
}
public void matchAndReturn(String methodName, Object result) {
|
