[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects/dynamic CallableFactory.java,NONE,1.1 CallBag.java,1.6,1.7 DefaultCallFactory.java,1.5,1.6 Mock.java,1.25,1.26 CallSequence.java,1.8,1.9 CallSignature.java,1.3,1.4 CallFactory.java,1.4,NONE

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

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

Modified Files:
	CallBag.java DefaultCallFactory.java Mock.java 
	CallSequence.java CallSignature.java 
Added Files:
	CallableFactory.java 
Removed Files:
	CallFactory.java 
Log Message:
General tidy up
Renaming Call types to Callable
Collapsed CallableFactory interface

--- NEW FILE: CallableFactory.java ---
package com.mockobjects.dynamic;

public interface CallableFactory {
	Callable createCallExpectation( Callable callable );
	
	Callable createReturnCallable( String methodName, ConstraintMatcher constraints, Object result );
	Callable createThrowableCallable( String methodName, ConstraintMatcher constraints, Throwable throwable);
	Callable createVoidCallable( String methodName, ConstraintMatcher constraints);
}

Index: CallBag.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/CallBag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CallBag.java	5 Jul 2003 16:35:51 -0000	1.6
+++ CallBag.java	6 Jul 2003 02:31:37 -0000	1.7
@@ -4,9 +4,8 @@
 package com.mockobjects.dynamic;
 
 
-public class CallBag extends CallCollection  {
-	public Object call(ActiveCall call)
-		throws Throwable {
+public class CallBag extends AbstractCallableCollection  {
+	public Object call(ActiveCall call) throws Throwable {
 			
 		Callable foundCall = expectedCalls.firstMatchingCall(call);
 		if (foundCall == null) {

Index: DefaultCallFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/DefaultCallFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultCallFactory.java	20 May 2003 00:05:24 -0000	1.5
+++ DefaultCallFactory.java	6 Jul 2003 02:31:37 -0000	1.6
@@ -1,25 +1,37 @@
 package com.mockobjects.dynamic;
 
-public class DefaultCallFactory implements CallFactory {
+public class DefaultCallFactory implements CallableFactory {
 
-	public Callable createReturnStub(Object result) {
+	private Callable createReturnStub(Object result) {
 		return new ReturnStub(result);
 	}
 
-	public Callable createThrowStub( Throwable exception ) {
+	private Callable createThrowStub( Throwable exception ) {
 		return new ThrowStub(exception);
 	}
 
-	public Callable createCallExpectation(Callable call) {
-		return new CallOnceExpectation(call);
+	private Callable createVoidStub() {
+		return new VoidStub();
 	}
 
-	public Callable createCallSignature(String methodName, ConstraintMatcher constraints, Callable call) {
-		return new CallSignature( methodName, constraints, call );
+	public Callable createCallExpectation(Callable callable) {
+		return new CallOnceExpectation(callable);
 	}
 
-	public Callable createVoidStub() {
-		return new VoidStub();
+	private Callable createCallSignature(String methodName, ConstraintMatcher constraints, Callable callable) {
+		return new CallSignature( methodName, constraints, callable );
+	}
+
+	public Callable createReturnCallable(String methodName, ConstraintMatcher constraints, Object result) {
+		return createCallSignature(methodName, constraints, createReturnStub(result));
+	}
+
+	public Callable createThrowableCallable(String methodName, ConstraintMatcher constraints, Throwable throwable) {
+		return createCallSignature(methodName, constraints, createThrowStub(throwable));
+	}
+
+	public Callable createVoidCallable(String methodName, ConstraintMatcher constraints) {
+		return createCallSignature(methodName, constraints, createVoidStub());
 	}
 
 }

Index: Mock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Mock.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Mock.java	5 Jul 2003 15:15:54 -0000	1.25
+++ Mock.java	6 Jul 2003 02:31:37 -0000	1.26
@@ -3,22 +3,21 @@
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-
 import junit.framework.AssertionFailedError;
-
 import com.mockobjects.Verifiable;
+
 import com.mockobjects.constraint.Constraint;
 
 public class Mock implements InvocationHandler, Verifiable {
 	private String name;
 	private Object proxy;
-	private CallFactory callFactory;
-	private CallableAddable calls;
+	private CallableFactory callableFactory;
+	private CallableCollection callables;
 
-	public Mock(CallFactory callFactory, CallableAddable callableAddable, Class mockedClass, String name) {
+	public Mock(CallableFactory callableFactory, CallableCollection callableAddable, Class mockedClass, String name) {
 		this.name = name;
-		this.callFactory = callFactory;
-		this.calls = callableAddable;
+		this.callableFactory = callableFactory;
+		this.callables = callableAddable;
 		this.proxy = Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] { mockedClass }, this);
 	}
 
@@ -31,7 +30,7 @@
 	}
 
     public void reset() {
-        this.calls.reset();
+        this.callables.reset();
     }
     
 	public static String mockNameFromClass(Class c) {
@@ -87,7 +86,7 @@
 			} else if (isMockNameGetter(activeCall)) {
 				return this.getMockName();
 			} else {
-				return calls.call(activeCall);
+				return callables.call(activeCall);
 			}
 		} catch (AssertionFailedError ex) {
 			throw new AssertionFailedError(name + ": " + ex.getMessage());
@@ -105,7 +104,7 @@
 
 	public void verify() {
 		try {
-			calls.verify();
+			callables.verify();
 		} catch (AssertionFailedError ex) {
 			throw new AssertionFailedError(name + ": " + ex.getMessage());
 		}
@@ -120,7 +119,7 @@
 	}
 		
 	public void expect(String methodName, ConstraintMatcher args) {
-		calls.addExpect(callFactory.createCallExpectation(callFactory.createCallSignature(methodName, args, callFactory.createVoidStub())));
+		callables.addExpect(callableFactory.createCallExpectation(callableFactory.createVoidCallable(methodName, args)));
 	}
 	
 	public void expectAndReturn(String methodName, Object result) {
@@ -156,7 +155,7 @@
 	}
 
 	public void expectAndReturn(String methodName, ConstraintMatcher args, Object result) {
-		calls.addExpect(callFactory.createCallExpectation(callFactory.createCallSignature(methodName, args, callFactory.createReturnStub(result))));
+		callables.addExpect(callableFactory.createCallExpectation(callableFactory.createReturnCallable(methodName, args, result)));
 	}
 	
 	public void expectAndThrow(String methodName, Throwable exception) {
@@ -168,7 +167,7 @@
 	}
 	
 	public void expectAndThrow(String methodName, ConstraintMatcher args, Throwable exception) {
-		calls.addExpect(callFactory.createCallExpectation(callFactory.createCallSignature(methodName, args, callFactory.createThrowStub(exception))));
+		callables.addExpect(callableFactory.createCallExpectation(callableFactory.createThrowableCallable(methodName, args, exception)));
 	}
 	
 	public void match(String methodName) {
@@ -188,7 +187,7 @@
 	}
 
 	public void match(String methodName, ConstraintMatcher args) {
-		calls.addMatch(callFactory.createCallSignature(methodName, args, callFactory.createVoidStub()));
+		callables.addMatch(callableFactory.createVoidCallable(methodName, args));
 	}
 
 	public void matchAndReturn(String methodName, Object result) {
@@ -232,7 +231,7 @@
 	}
 	
 	public void matchAndReturn(String methodName, ConstraintMatcher args, Object result) {
-		calls.addMatch(callFactory.createCallSignature(methodName, args, callFactory.createReturnStub(result)));
+		callables.addMatch(callableFactory.createReturnCallable(methodName, args, result));
 	}
 	
 	public void matchAndThrow(String methodName, Throwable throwable) {
@@ -252,7 +251,7 @@
 	}
 	
 	public void matchAndThrow(String methodName, ConstraintMatcher args, Throwable throwable) {
-		calls.addMatch(callFactory.createCallSignature(methodName, args, callFactory.createThrowStub(throwable)));
+		callables.addMatch(callableFactory.createThrowableCallable(methodName, args, throwable));
 	}
 		
 	/** @deprecated @see OrderedMock

Index: CallSequence.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/CallSequence.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CallSequence.java	5 Jul 2003 16:35:51 -0000	1.8
+++ CallSequence.java	6 Jul 2003 02:31:37 -0000	1.9
@@ -2,15 +2,15 @@
 
 import junit.framework.AssertionFailedError;
 
-public class CallSequence extends CallCollection {
+public class CallSequence extends AbstractCallableCollection {
 	
 	int callIndex = 0;
 	
     public Object call(ActiveCall activeCall) throws Throwable {
 		if (expectedCalls.isEmpty()) 
-			throw new AssertionFailedError("no methods defined on mock, received: " + DynamicUtil.methodToString(activeCall));
+			throw new AssertionFailedError("no methods defined on mock, received: " + activeCall.toString());
 		if (callIndex == expectedCalls.size()) 
-			throw new AssertionFailedError("mock called too many times, received: " + DynamicUtil.methodToString(activeCall));
+			throw new AssertionFailedError("mock called too many times, received: " + activeCall.toString());
 		
 		Callable callable = expectedCalls.get(callIndex++);
 		if (callable.matches(activeCall)) {

Index: CallSignature.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/CallSignature.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CallSignature.java	5 Jul 2003 15:15:54 -0000	1.3
+++ CallSignature.java	6 Jul 2003 02:31:37 -0000	1.4
@@ -1,8 +1,6 @@
 package com.mockobjects.dynamic;
 
-import junit.framework.Assert;
-
-public class CallSignature extends Assert implements Callable 
+public class CallSignature implements Callable 
 {
 	private String methodName;
 	private ConstraintMatcher constraints;

--- CallFactory.java DELETED ---