[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects/dynamic Mock.java,1.21,1.22

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

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

Modified Files:
	Mock.java 
Log Message:
Renamed callSequence to calls. Not just sequences any more

Index: Mock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Mock.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Mock.java	8 Jun 2003 00:30:29 -0000	1.21
+++ Mock.java	8 Jun 2003 21:49:22 -0000	1.22
@@ -13,12 +13,12 @@
 	private String name;
 	private Object proxy;
 	private CallFactory callFactory;
-	private CallableAddable callSequence;
+	private CallableAddable calls;
 
 	public Mock(CallFactory callFactory, CallableAddable callableAddable, Class mockedClass, String name) {
 		this.name = name;
 		this.callFactory = callFactory;
-		this.callSequence = callableAddable;
+		this.calls = callableAddable;
 		this.proxy = Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] { mockedClass }, this);
 	}
 
@@ -31,7 +31,7 @@
 	}
 
     public void reset() {
-        this.callSequence.reset();
+        this.calls.reset();
     }
     
 	public static String mockNameFromClass(Class c) {
@@ -85,7 +85,7 @@
 			} else if (isMockNameGetter(method, args)) {
 				return this.getMockName();
 			} else {
-				return callSequence.call(this, method.getName(), (args == null ? new Object[0] : args));
+				return calls.call(this, method.getName(), (args == null ? new Object[0] : args));
 			}
 		} catch (AssertionFailedError ex) {
 			throw new AssertionFailedError(name + ": " + ex.getMessage());
@@ -102,7 +102,7 @@
 
 	public void verify() {
 		try {
-			callSequence.verify();
+			calls.verify();
 		} catch (AssertionFailedError ex) {
 			throw new AssertionFailedError(name + ": " + ex.getMessage());
 		}
@@ -117,7 +117,7 @@
 	}
 		
 	public void expect(String methodName, ConstraintMatcher args) {
-		callSequence.addExpect(callFactory.createCallExpectation(callFactory.createCallSignature(methodName, args, callFactory.createVoidStub())));
+		calls.addExpect(callFactory.createCallExpectation(callFactory.createCallSignature(methodName, args, callFactory.createVoidStub())));
 	}
 	
 	public void expectAndReturn(String methodName, Object result) {
@@ -153,7 +153,7 @@
 	}
 
 	public void expectAndReturn(String methodName, ConstraintMatcher args, Object result) {
-		callSequence.addExpect(callFactory.createCallExpectation(callFactory.createCallSignature(methodName, args, callFactory.createReturnStub(result))));
+		calls.addExpect(callFactory.createCallExpectation(callFactory.createCallSignature(methodName, args, callFactory.createReturnStub(result))));
 	}
 	
 	public void expectAndThrow(String methodName, Throwable exception) {
@@ -165,7 +165,7 @@
 	}
 	
 	public void expectAndThrow(String methodName, ConstraintMatcher args, Throwable exception) {
-		callSequence.addExpect(callFactory.createCallExpectation(callFactory.createCallSignature(methodName, args, callFactory.createThrowStub(exception))));
+		calls.addExpect(callFactory.createCallExpectation(callFactory.createCallSignature(methodName, args, callFactory.createThrowStub(exception))));
 	}
 	
 	public void matchAndReturn(String methodName, Object result) {
@@ -209,7 +209,7 @@
 	}
 	
 	public void matchAndReturn(String methodName, ConstraintMatcher args, Object result) {
-		callSequence.addMatch(callFactory.createCallSignature(methodName, args, callFactory.createReturnStub(result)));
+		calls.addMatch(callFactory.createCallSignature(methodName, args, callFactory.createReturnStub(result)));
 	}
 	
 	public void matchAndThrow(String methodName, Throwable throwable) {
@@ -229,7 +229,7 @@
 	}
 	
 	public void matchAndThrow(String methodName, ConstraintMatcher args, Throwable throwable) {
-		callSequence.addMatch(callFactory.createCallSignature(methodName, args, callFactory.createThrowStub(throwable)));
+		calls.addMatch(callFactory.createCallSignature(methodName, args, callFactory.createThrowStub(throwable)));
 	}
 		
 	/** @deprecated @see OrderedMock
@@ -268,7 +268,7 @@
 		this.expect(methodName);
 	}
 	
-	/** @deprecated Not required, as if methodName is called, you will get a an exception
+	/** @deprecated Not required, as if methodName is called, you will get an exception
 	*/
 	public void expectNotCalled(String methodName) {
 	}