[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects/dynamic CallSet.java,1.1.2.3,1.1.2.4

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

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

Modified Files:
      Tag: DynamicMockExperiment
	CallSet.java 
Log Message:
Changed permitAndReturn to matchAndReturn

Index: CallSet.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Attic/CallSet.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- CallSet.java	7 Apr 2003 17:38:23 -0000	1.1.2.3
+++ CallSet.java	10 Apr 2003 21:24:43 -0000	1.1.2.4
@@ -71,12 +71,17 @@
 		expectedCalls.add(call);
 	}
 
-	public void permitAndReturn( String methodName, Constraint[] args, Object result ) {
+	public void matchAndReturn( String methodName, Object equalArg, Object result ) {
+		add( callFactory.createCallMatch( methodName, C.args(C.eq(equalArg)), 
+			 callFactory.createReturnStub(result) ) );		
+	}
+
+	public void matchAndReturn( String methodName, Constraint[] args, Object result ) {
 		add( callFactory.createCallMatch( methodName, args, 
 			 callFactory.createReturnStub(result) ) );		
 	}
 	
-	public void permitAndThrow( String methodName, Constraint[] args, Throwable throwable ) {
+	public void matchAndThrow( String methodName, Constraint[] args, Throwable throwable ) {
 		add( callFactory.createCallMatch( methodName, args, 
 			 callFactory.createThrowStub(throwable) ) );
 	}