[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects/dynamic CoreMock.java,1.11,1.12 Mock.java,1.36,1.37 DynamicMock.java,1.4,1.5 Stub.java,1.2,1.3

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

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

Modified Files:
	CoreMock.java Mock.java DynamicMock.java Stub.java 
Log Message:
renamed DynamicMock.expect() to add(). 

Index: CoreMock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/CoreMock.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CoreMock.java	1 Oct 2003 20:21:59 -0000	1.11
+++ CoreMock.java	2 Oct 2003 22:55:32 -0000	1.12
@@ -56,7 +56,7 @@
 		return this.name;
 	}
 
-	public void expect(Invokable invocationMatcher) {
+	public void add(Invokable invocationMatcher) {
 		invocationDispatcher.add(invocationMatcher);
 	}
 	

Index: Mock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Mock.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Mock.java	1 Oct 2003 20:21:59 -0000	1.36
+++ Mock.java	2 Oct 2003 22:55:32 -0000	1.37
@@ -38,27 +38,27 @@
 	}
 
     public void expect(String methodName, ConstraintMatcher args) {
-        coreMock.expect(callableFactory.createCallExpectation(callableFactory.createVoidCallable(methodName, args)));
+        coreMock.add(callableFactory.createCallExpectation(callableFactory.createVoidCallable(methodName, args)));
     }
 
     public void expectAndReturn(String methodName, ConstraintMatcher args, Object result) {
-        coreMock.expect(callableFactory.createCallExpectation(callableFactory.createReturnCallable(methodName, args, result)));
+        coreMock.add(callableFactory.createCallExpectation(callableFactory.createReturnCallable(methodName, args, result)));
     }
 
     public void expectAndThrow(String methodName, ConstraintMatcher args, Throwable throwable) {
-        coreMock.expect(callableFactory.createCallExpectation(callableFactory.createThrowableCallable(methodName, args, throwable)));
+        coreMock.add(callableFactory.createCallExpectation(callableFactory.createThrowableCallable(methodName, args, throwable)));
     }
 
     public void match(String methodName, ConstraintMatcher args) {
-        coreMock.expect(callableFactory.createVoidCallable(methodName, args));
+        coreMock.add(callableFactory.createVoidCallable(methodName, args));
     }
 
     public void matchAndReturn(String methodName, ConstraintMatcher args, Object result) {
-        coreMock.expect(callableFactory.createReturnCallable(methodName, args, result));
+        coreMock.add(callableFactory.createReturnCallable(methodName, args, result));
     }
 
     public void matchAndThrow(String methodName, ConstraintMatcher args, Throwable throwable) {
-        coreMock.expect(callableFactory.createThrowableCallable(methodName, args, throwable));
+        coreMock.add(callableFactory.createThrowableCallable(methodName, args, throwable));
     }
 
     /*

Index: DynamicMock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/DynamicMock.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DynamicMock.java	1 Oct 2003 20:21:59 -0000	1.4
+++ DynamicMock.java	2 Oct 2003 22:55:32 -0000	1.5
@@ -7,7 +7,7 @@
 public interface DynamicMock 
     extends Verifiable, InvocationHandler 
 {
-	void expect(Invokable invokable);
+	void add(Invokable invokable);
 	
     Object proxy();
 	

Index: Stub.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Stub.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Stub.java	20 Aug 2003 21:47:58 -0000	1.2
+++ Stub.java	2 Oct 2003 22:55:32 -0000	1.3
@@ -7,8 +7,6 @@
 /** 
  * An object that stubs the behaviour of a method invocation on behalf of an 
  * {@link Invokable} object.
- *  
- *  @author montagu
  */
 public interface Stub 
 {