Menu
▾
▴
[MO-java-dev] CVS: mockobjects-java/src/core/test/mockobjects/dynamic MockTest.java,1.10,1.11 MockCallFactory.java,1.3,1.4
|
From: Tim M. <ma...@us...> - 2003-05-19 23:56:26
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv3487/core/test/mockobjects/dynamic
Modified Files:
MockTest.java MockCallFactory.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: MockTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/MockTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MockTest.java 19 May 2003 23:37:49 -0000 1.10
+++ MockTest.java 19 May 2003 23:56:23 -0000 1.11
@@ -55,8 +55,8 @@
mockCallFactory.setupCreateVoidStub(mockVoidStub);
mockCallFactory.addExpectedCreateCallSignature(METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, mockVoidStub);
mockCallFactory.setupCreateCallSignature(mockCallMatch);
- mockCallFactory.addExpectedCreateExpectedCall(mockCallMatch);
- mockCallFactory.setupCreateExpectedCall(mockExpectedCall);
+ mockCallFactory.addExpectedCreateCallExpectation(mockCallMatch);
+ mockCallFactory.setupCreateCallExpectation(mockExpectedCall);
mockCallableAddable.addExpectedAddExpect(mockExpectedCall);
@@ -71,8 +71,8 @@
mockCallFactory.setupCreateReturnStub(mockReturnStub);
mockCallFactory.addExpectedCreateCallSignature(METHOD_NOARGANDRETURN_NAME, C.NO_ARGS, mockReturnStub);
mockCallFactory.setupCreateCallSignature(mockCallMatch);
- mockCallFactory.addExpectedCreateExpectedCall(mockCallMatch);
- mockCallFactory.setupCreateExpectedCall(mockExpectedCall);
+ mockCallFactory.addExpectedCreateCallExpectation(mockCallMatch);
+ mockCallFactory.setupCreateCallExpectation(mockExpectedCall);
mockCallableAddable.addExpectedAddExpect(mockExpectedCall);
@@ -87,8 +87,8 @@
mockCallFactory.setupCreateThrowStub(mockThrowStub);
mockCallFactory.addExpectedCreateCallSignature(METHOD_NOARGANDRETURN_NAME, C.NO_ARGS, mockThrowStub);
mockCallFactory.setupCreateCallSignature(mockCallMatch);
- mockCallFactory.addExpectedCreateExpectedCall(mockCallMatch);
- mockCallFactory.setupCreateExpectedCall(mockExpectedCall);
+ mockCallFactory.addExpectedCreateCallExpectation(mockCallMatch);
+ mockCallFactory.setupCreateCallExpectation(mockExpectedCall);
mockCallableAddable.addExpectedAddExpect(mockExpectedCall);
@@ -103,8 +103,8 @@
mockCallFactory.setupCreateThrowStub(mockThrowStub);
mockCallFactory.addExpectedCreateCallSignature(METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, mockThrowStub);
mockCallFactory.setupCreateCallSignature(mockCallMatch);
- mockCallFactory.addExpectedCreateExpectedCall(mockCallMatch);
- mockCallFactory.setupCreateExpectedCall(mockExpectedCall);
+ mockCallFactory.addExpectedCreateCallExpectation(mockCallMatch);
+ mockCallFactory.setupCreateCallExpectation(mockExpectedCall);
mockCallableAddable.addExpectedAddExpect(mockExpectedCall);
@@ -119,8 +119,8 @@
mockCallFactory.setupCreateVoidStub(mockVoidStub);
mockCallFactory.addExpectedCreateCallSignature(METHOD_NOARG_NAME, C.NO_ARGS, mockVoidStub);
mockCallFactory.setupCreateCallSignature(mockCallMatch);
- mockCallFactory.addExpectedCreateExpectedCall(mockCallMatch);
- mockCallFactory.setupCreateExpectedCall(mockExpectedCall);
+ mockCallFactory.addExpectedCreateCallExpectation(mockCallMatch);
+ mockCallFactory.setupCreateCallExpectation(mockExpectedCall);
mockCallableAddable.addExpectedAddExpect(mockExpectedCall);
@@ -135,8 +135,8 @@
mockCallFactory.setupCreateVoidStub(mockVoidStub);
mockCallFactory.addExpectedCreateCallSignature(METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, mockVoidStub);
mockCallFactory.setupCreateCallSignature(mockCallMatch);
- mockCallFactory.addExpectedCreateExpectedCall(mockCallMatch);
- mockCallFactory.setupCreateExpectedCall(mockExpectedCall);
+ mockCallFactory.addExpectedCreateCallExpectation(mockCallMatch);
+ mockCallFactory.setupCreateCallExpectation(mockExpectedCall);
mockCallableAddable.addExpectedAddExpect(mockExpectedCall);
@@ -150,7 +150,7 @@
mockCallFactory.setupCreateVoidStub(mockVoidStub);
mockCallFactory.addExpectedCreateCallSignature(METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, mockVoidStub);
mockCallFactory.setupCreateCallSignature(mockCallMatch);
- mockCallFactory.setupCreateExpectedCall(mockExpectedCall);
+ mockCallFactory.setupCreateCallExpectation(mockExpectedCall);
mockCallableAddable.addExpectedAddExpect(mockExpectedCall);
@@ -164,7 +164,7 @@
mockCallFactory.setupCreateVoidStub(mockVoidStub);
mockCallFactory.addExpectedCreateCallSignature(METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, mockVoidStub);
mockCallFactory.setupCreateCallSignature(mockCallMatch);
- mockCallFactory.setupCreateExpectedCall(mockExpectedCall);
+ mockCallFactory.setupCreateCallExpectation(mockExpectedCall);
mockCallableAddable.addExpectedAddExpect(mockExpectedCall);
@@ -180,8 +180,8 @@
mockCallFactory.setupCreateReturnStub(mockReturnStub);
mockCallFactory.addExpectedCreateCallSignature(METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, mockReturnStub);
mockCallFactory.setupCreateCallSignature(mockCallMatch);
- mockCallFactory.addExpectedCreateExpectedCall(mockCallMatch);
- mockCallFactory.setupCreateExpectedCall(mockExpectedCall);
+ mockCallFactory.addExpectedCreateCallExpectation(mockCallMatch);
+ mockCallFactory.setupCreateCallExpectation(mockExpectedCall);
mockCallableAddable.addExpectedAddExpect(mockExpectedCall);
mockCallableAddable.setupCall(METHOD_TWOARG_RESULT);
@@ -197,8 +197,8 @@
mockCallFactory.setupCreateThrowStub(mockThrowStub);
mockCallFactory.addExpectedCreateCallSignature(METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, mockThrowStub);
mockCallFactory.setupCreateCallSignature(mockCallMatch);
- mockCallFactory.addExpectedCreateExpectedCall(mockCallMatch);
- mockCallFactory.setupCreateExpectedCall(mockExpectedCall);
+ mockCallFactory.addExpectedCreateCallExpectation(mockCallMatch);
+ mockCallFactory.setupCreateCallExpectation(mockExpectedCall);
mockCallableAddable.addExpectedAddExpect(mockExpectedCall);
mockCallableAddable.setupCall(METHOD_TWOARG_RESULT);
@@ -214,8 +214,8 @@
mockCallFactory.setupCreateReturnStub(mockReturnStub);
mockCallFactory.addExpectedCreateCallSignature(METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, mockReturnStub);
mockCallFactory.setupCreateCallSignature(mockCallMatch);
- mockCallFactory.addExpectedCreateExpectedCall(mockCallMatch);
- mockCallFactory.setupCreateExpectedCall(mockExpectedCall);
+ mockCallFactory.addExpectedCreateCallExpectation(mockCallMatch);
+ mockCallFactory.setupCreateCallExpectation(mockExpectedCall);
mockCallableAddable.addExpectedAddExpect(mockExpectedCall);
mockCallableAddable.setupCall(METHOD_ONEARG_RESULT);
Index: MockCallFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/MockCallFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MockCallFactory.java 19 May 2003 23:37:49 -0000 1.3
+++ MockCallFactory.java 19 May 2003 23:56:23 -0000 1.4
@@ -14,9 +14,9 @@
private ExpectationList myCreateThrowStubParameter0Values = new ExpectationList("MockCallFactory.createThrowStub(Throwable) java.lang.Throwable");
private ExpectationCounter myCreateVoidStubCalls = new ExpectationCounter("MockCallFactory.createVoidStub()");
private ReturnValues myActualCreateVoidStubReturnValues = new ReturnValues("MockCallFactory.createVoidStub()", true);
- private ExpectationCounter myCreateExpectedCallCalls = new ExpectationCounter("MockCallFactory.createExpectedCall(Callable)");
- private ReturnValues myActualCreateExpectedCallReturnValues = new ReturnValues("MockCallFactory.createExpectedCall(Callable)", true);
- private ExpectationList myCreateExpectedCallParameter0Values = new ExpectationList("MockCallFactory.createExpectedCall(Callable) com.mockobjects.dynamic.Callable");
+ private ExpectationCounter myCreateCallExpectationCalls = new ExpectationCounter("MockCallFactory.createCallExpectation(Callable)");
+ private ReturnValues myActualCreateCallExpectationReturnValues = new ReturnValues("MockCallFactory.createCallExpectation(Callable)", true);
+ private ExpectationList myCreateCallExpectationParameter0Values = new ExpectationList("MockCallFactory.createCallExpectation(Callable) com.mockobjects.dynamic.Callable");
private ExpectationCounter myCreateCallSignatureCalls = new ExpectationCounter("MockCallFactory.createCallMatch(String, ConstraintMatcher, Callable)");
private ReturnValues myActualCreateCallSignatureReturnValues = new ReturnValues("MockCallFactory.createCallMatch(String, ConstraintMatcher, Callable)", true);
private ExpectationList myCreateCallSignatureParameter0Values = new ExpectationList("MockCallFactory.createCallMatch(String, ConstraintMatcher, Callable) java.lang.String");
@@ -93,29 +93,29 @@
myActualCreateVoidStubReturnValues.add(arg);
}
- public void setExpectedCreateExpectedCallCalls(int calls){
- myCreateExpectedCallCalls.setExpected(calls);
+ public void setExpectedCreateCallExpectationCalls(int calls){
+ myCreateCallExpectationCalls.setExpected(calls);
}
- public void addExpectedCreateExpectedCall(Callable arg0){
- myCreateExpectedCallParameter0Values.addExpected(arg0);
+ public void addExpectedCreateCallExpectation(Callable arg0){
+ myCreateCallExpectationParameter0Values.addExpected(arg0);
}
- public Callable createExpectedCall(Callable arg0){
- myCreateExpectedCallCalls.inc();
- myCreateExpectedCallParameter0Values.addActual(arg0);
- Object nextReturnValue = myActualCreateExpectedCallReturnValues.getNext();
+ public Callable createCallExpectation(Callable arg0){
+ myCreateCallExpectationCalls.inc();
+ myCreateCallExpectationParameter0Values.addActual(arg0);
+ Object nextReturnValue = myActualCreateCallExpectationReturnValues.getNext();
if (nextReturnValue instanceof ExceptionalReturnValue && ((ExceptionalReturnValue)nextReturnValue).getException() instanceof RuntimeException)
throw (RuntimeException)((ExceptionalReturnValue)nextReturnValue).getException();
return (Callable) nextReturnValue;
}
- public void setupExceptionCreateExpectedCall(Throwable arg){
- myActualCreateExpectedCallReturnValues.add(new ExceptionalReturnValue(arg));
+ public void setupExceptionCreateCallExpectation(Throwable arg){
+ myActualCreateCallExpectationReturnValues.add(new ExceptionalReturnValue(arg));
}
- public void setupCreateExpectedCall(Callable arg){
- myActualCreateExpectedCallReturnValues.add(arg);
+ public void setupCreateCallExpectation(Callable arg){
+ myActualCreateCallExpectationReturnValues.add(arg);
}
public void setExpectedCreateCallSignatureCalls(int calls){
@@ -153,8 +153,8 @@
myCreateThrowStubCalls.verify();
myCreateThrowStubParameter0Values.verify();
myCreateVoidStubCalls.verify();
- myCreateExpectedCallCalls.verify();
- myCreateExpectedCallParameter0Values.verify();
+ myCreateCallExpectationCalls.verify();
+ myCreateCallExpectationParameter0Values.verify();
myCreateCallSignatureCalls.verify();
myCreateCallSignatureParameter0Values.verify();
myCreateCallSignatureParameter1Values.verify();
|
