[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects/dynamic CallSequence.java,1.4.2.1,1.4.2.2 Mock.java,1.16.2.3,1.16.2.4 OrderedMock.java,1.1.2.1,1.1.2.2

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

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

Modified Files:
      Tag: DynamicMockExperiment
	Mock.java OrderedMock.java 
Added Files:
      Tag: DynamicMockExperiment
	CallSequence.java 
Log Message:
Added CallSequence and OrderedMock

This gives a usable reference implementation


Index: Mock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Mock.java,v
retrieving revision 1.16.2.3
retrieving revision 1.16.2.4
diff -u -r1.16.2.3 -r1.16.2.4
--- Mock.java	14 Apr 2003 08:46:27 -0000	1.16.2.3
+++ Mock.java	14 Apr 2003 18:46:52 -0000	1.16.2.4
@@ -18,12 +18,12 @@
 	private String name;
 	private Object proxy;
 	private CallFactory callFactory;
-	private CallableAddable callSet;
+	private CallableAddable callSequence;
 
 	public Mock(CallFactory callFactory, CallableAddable callableAddable, Class mockedClass, String name) {
 		this.name = name;
 		this.callFactory = callFactory;
-		this.callSet = callableAddable;
+		this.callSequence = callableAddable;
 		this.proxy = Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] { mockedClass }, this);
 	}
 
@@ -57,7 +57,7 @@
 	public Object invoke(Object proxy, Method method, Object[] args)
 		throws Throwable {
 		try {
-			return callSet.call(this, method.getName(), ((args == null) ? new Object[0] : args));
+			return callSequence.call(this, method.getName(), ((args == null) ? new Object[0] : args));
 		} catch (AssertionFailedError ex) {
 			throw new AssertionFailedError(name + ": " + ex.getMessage());
 		}
@@ -65,7 +65,7 @@
 
 	public void verify() {
 		try {
-			callSet.verify();
+			callSequence.verify();
 		} catch (AssertionFailedError ex) {
 			throw new AssertionFailedError(name + ": " + ex.getMessage());
 		}
@@ -76,7 +76,7 @@
 	}
 	
 	public void expect(String methodName, Constraint[] args) {
-		callSet.add(callFactory.createExpectedCall(callFactory.createCallMatch(methodName, args, callFactory.createVoidStub())));
+		callSequence.add(callFactory.createExpectedCall(callFactory.createCallMatch(methodName, args, callFactory.createVoidStub())));
 	}
 
 	public void expectAndReturn(String methodName, Object equalArg, Object result) {
@@ -84,11 +84,11 @@
 	}
 
 	public void expectAndReturn(String methodName, Constraint[] args, Object result) {
-		callSet.add(callFactory.createExpectedCall(callFactory.createCallMatch(methodName, args, callFactory.createReturnStub(result))));
+		callSequence.add(callFactory.createExpectedCall(callFactory.createCallMatch(methodName, args, callFactory.createReturnStub(result))));
 	}
 
 	public void expectAndThrow(String methodName, Constraint[] args, Throwable exception) {
-		callSet.add(callFactory.createExpectedCall(callFactory.createCallMatch(methodName, args, callFactory.createThrowStub(exception))));
+		callSequence.add(callFactory.createExpectedCall(callFactory.createCallMatch(methodName, args, callFactory.createThrowStub(exception))));
 	}
 
 	public void matchAndReturn(String methodName, Object equalArg, Object result) {
@@ -96,10 +96,10 @@
 	}
 
 	public void matchAndReturn(String methodName, Constraint[] args, Object result) {
-		callSet.add(callFactory.createCallMatch(methodName, args, callFactory.createReturnStub(result)));
+		callSequence.add(callFactory.createCallMatch(methodName, args, callFactory.createReturnStub(result)));
 	}
 
 	public void matchAndThrow(String methodName, Constraint[] args, Throwable throwable) {
-		callSet.add(callFactory.createCallMatch(methodName, args, callFactory.createThrowStub(throwable)));
+		callSequence.add(callFactory.createCallMatch(methodName, args, callFactory.createThrowStub(throwable)));
 	}
 }

Index: OrderedMock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Attic/OrderedMock.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- OrderedMock.java	11 Apr 2003 13:18:45 -0000	1.1.2.1
+++ OrderedMock.java	14 Apr 2003 18:46:52 -0000	1.1.2.2
@@ -9,11 +9,11 @@
 public class OrderedMock extends Mock {
 
 	public OrderedMock(Class mockedClass) {
-		super(mockedClass);
+		this(mockedClass, mockNameFromClass(mockedClass));
 	}
 
 	public OrderedMock(Class mockedClass, String name) {
-		super(mockedClass, name);
+		super(new DefaultCallFactory(), new CallSequence(),mockedClass, name);
 	}
 
 }