[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects/dynamic CallSignature.java,NONE,1.1 DefaultCallFactory.java,1.2,1.3 CallFactory.java,1.2,1.3 Mock.java,1.17,1.18 CallMatch.java,1.2,NONE

[Tim M. <ma...@us...>]

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

Modified Files:
	DefaultCallFactory.java CallFactory.java Mock.java 
Added Files:
	CallSignature.java 
Removed Files:
	CallMatch.java 
Log Message:
Renamed internal class CallMatch to CallSignature - to avoid 
confusion with MatchAndReturn

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

import junit.framework.Assert;

public class CallSignature extends Assert implements Callable 
{
	private String methodName;
	private ConstraintMatcher constraints;
	private Callable delegate;
	
	public CallSignature( String methodName, ConstraintMatcher constraints, Callable delegate ) {
		this.methodName = methodName;
		this.constraints = constraints;
		this.delegate = delegate;
	}

	public Object call( Mock mock, String methodName, Object[] args ) 
		throws Throwable 
	{		
		return delegate.call( mock, methodName, args );
	}
	
	public void verify() {
		delegate.verify();
	}

	public boolean matches(String methodName, Object[] args) {
		return this.methodName.equals(methodName) && constraints.matches(args);
	}
	
	public String getDescription() {
		return DynamicUtil.methodToString(methodName, constraints.getConstraints());
	}
	
	// Implemented to aid visualisation in an IDE debugger
	public String toString() {
		return Mock.className(this.getClass()) + "(" + this.getDescription() + ")";
	}
}

Index: DefaultCallFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/DefaultCallFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultCallFactory.java	18 May 2003 20:59:35 -0000	1.2
+++ DefaultCallFactory.java	19 May 2003 23:37:48 -0000	1.3
@@ -14,8 +14,8 @@
 		return new ExpectedCall(call);
 	}
 
-	public Callable createCallMatch(String methodName, ConstraintMatcher constraints, Callable call) {
-		return new CallMatch( methodName, constraints, call );
+	public Callable createCallSignature(String methodName, ConstraintMatcher constraints, Callable call) {
+		return new CallSignature( methodName, constraints, call );
 	}
 
 	public Callable createVoidStub() {

Index: CallFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/CallFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CallFactory.java	18 May 2003 20:59:35 -0000	1.2
+++ CallFactory.java	19 May 2003 23:37:49 -0000	1.3
@@ -12,5 +12,5 @@
 	Callable createThrowStub( Throwable throwable );
 	Callable createVoidStub();
 	Callable createExpectedCall( Callable call );
-	Callable createCallMatch( String methodName, ConstraintMatcher constraints, 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Mock.java	18 May 2003 20:59:35 -0000	1.17
+++ Mock.java	19 May 2003 23:37:49 -0000	1.18
@@ -118,7 +118,7 @@
 	}
 		
 	public void expect(String methodName, ConstraintMatcher args) {
-		callSequence.addExpect(callFactory.createExpectedCall(callFactory.createCallMatch(methodName, args, callFactory.createVoidStub())));
+		callSequence.addExpect(callFactory.createExpectedCall(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.createCallMatch(methodName, args, callFactory.createReturnStub(result))));
+		callSequence.addExpect(callFactory.createExpectedCall(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.createCallMatch(methodName, args, callFactory.createThrowStub(exception))));
+		callSequence.addExpect(callFactory.createExpectedCall(callFactory.createCallSignature(methodName, args, callFactory.createThrowStub(exception))));
 	}
 	
 	public void matchAndReturn(String methodName, Object result) {
@@ -202,7 +202,7 @@
 	}
 	
 	public void matchAndReturn(String methodName, ConstraintMatcher args, Object result) {
-		callSequence.addMatch(callFactory.createCallMatch(methodName, args, callFactory.createReturnStub(result)));
+		callSequence.addMatch(callFactory.createCallSignature(methodName, args, callFactory.createReturnStub(result)));
 	}
 	
 	public void matchAndReturn(String methodName, ConstraintMatcher args, boolean result) {
@@ -230,7 +230,7 @@
 	}
 	
 	public void matchAndThrow(String methodName, ConstraintMatcher args, Throwable throwable) {
-		callSequence.addMatch(callFactory.createCallMatch(methodName, args, callFactory.createThrowStub(throwable)));
+		callSequence.addMatch(callFactory.createCallSignature(methodName, args, callFactory.createThrowStub(throwable)));
 	}
 		
 	/** @deprecated @see OrderedMock

--- CallMatch.java DELETED ---