[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects/dynamic Mock.java,1.39,1.40 InvokableFactory.java,1.3,1.4 DefaultInvokableFactory.java,1.3,1.4

[Steve F. <sm...@us...>]

Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv27534/src/core/com/mockobjects/dynamic

Modified Files:
	Mock.java InvokableFactory.java DefaultInvokableFactory.java 
Log Message:
started wrapping Invokable creation to move towards new Invokable structure

Index: Mock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Mock.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Mock.java	2 Oct 2003 23:35:18 -0000	1.39
+++ Mock.java	2 Oct 2003 23:42:06 -0000	1.40
@@ -42,7 +42,7 @@
     }
 
     public void expectAndReturn(String methodName, ConstraintMatcher args, Object result) {
-        coreMock.add(callableFactory.createCallExpectation(callableFactory.createReturnCallable(methodName, args, result)));
+        coreMock.add(callableFactory.createReturnExpectation(methodName, args, result));
     }
 
     public void expectAndThrow(String methodName, ConstraintMatcher args, Throwable throwable) {
@@ -54,7 +54,7 @@
     }
 
     public void matchAndReturn(String methodName, ConstraintMatcher args, Object result) {
-        coreMock.add(callableFactory.createReturnCallable(methodName, args, result));
+        coreMock.add(callableFactory.createReturnStub(methodName, args, result));
     }
 
     public void matchAndThrow(String methodName, ConstraintMatcher args, Throwable throwable) {

Index: InvokableFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/InvokableFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InvokableFactory.java	2 Oct 2003 23:35:18 -0000	1.3
+++ InvokableFactory.java	2 Oct 2003 23:42:06 -0000	1.4
@@ -3,7 +3,8 @@
 public interface InvokableFactory {
 	Invokable createCallExpectation( Invokable invokable );
 	
-	Invokable createReturnCallable( String methodName, ConstraintMatcher constraints, Object result );
+	Invokable createReturnStub( String methodName, ConstraintMatcher constraints, Object result );
+	Invokable createReturnExpectation( String methodName, ConstraintMatcher constraints, Object result );
 	Invokable createThrowableStub( String methodName, ConstraintMatcher constraints, Throwable throwable);
 	Invokable createThrowableExpectation( String methodName, ConstraintMatcher constraints, Throwable throwable);
 	Invokable createVoidStub ( String methodName, ConstraintMatcher constraints);

Index: DefaultInvokableFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/DefaultInvokableFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultInvokableFactory.java	2 Oct 2003 23:35:18 -0000	1.3
+++ DefaultInvokableFactory.java	2 Oct 2003 23:42:06 -0000	1.4
@@ -6,21 +6,23 @@
 		return new CallOnceExpectation(callable);
 	}
 
-	public Invokable createReturnCallable(String methodName, ConstraintMatcher constraints, Object result) {
-		return createCallSignature(methodName, constraints, createReturnStub(result));
+	public Invokable createReturnStub(String methodName, ConstraintMatcher constraints, Object result) {
+		return createCallSignature(methodName, constraints, new ReturnStub(result));
 	}
-
+	public Invokable createReturnExpectation(String methodName, ConstraintMatcher constraints, Object result) {
+		return createCallExpectation(createCallSignature(methodName, constraints, new ReturnStub(result)));
+	}
+	
 	public Invokable createThrowableStub(String methodName, ConstraintMatcher constraints, Throwable throwable) {
 		return createCallSignature(methodName, constraints, new ThrowStub(throwable));
 	}
-
 	public Invokable createThrowableExpectation(String methodName, ConstraintMatcher constraints, Throwable throwable) {
 		return createCallExpectation(createCallSignature(methodName, constraints, new ThrowStub(throwable)));
 	}
+	
 	public Invokable createVoidStub(String methodName, ConstraintMatcher constraints) {
 		return createCallSignature(methodName, constraints, new VoidStub());
 	}
-
 	public Invokable createVoidExpectation(String methodName, ConstraintMatcher constraints) {
 		return createCallExpectation(createCallSignature(methodName, constraints, new VoidStub()));
 	}
@@ -29,9 +31,6 @@
         return new CallSignature( methodName, constraints, callable );
     }
 
-    private Invokable createReturnStub(Object result) {
-        return new ReturnStub(result);
-    }
 
 
 }