mockobjects-java-dev

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

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

Modified Files:
	CallOnceExpectation.java Mock.java CoreMock.java 
	DynamicMock.java CallSignature.java 
Log Message:
Composition of DynamicMock step - 4
Mock now composes a core

Index: CallOnceExpectation.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/CallOnceExpectation.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CallOnceExpectation.java	6 Jul 2003 23:24:09 -0000	1.4
+++ CallOnceExpectation.java	7 Jul 2003 01:17:57 -0000	1.5
@@ -33,6 +33,6 @@
 	
 	//	Implemented to aid visualisation in an IDE debugger
 	public String toString() {
-		return Mock.className(this.getClass()) + "(" + this.getDescription() + ")";
+		return CoreMock.className(this.getClass()) + "(" + this.getDescription() + ")";
 	}
 }

Index: Mock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Mock.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Mock.java	7 Jul 2003 00:19:33 -0000	1.29
+++ Mock.java	7 Jul 2003 01:17:57 -0000	1.30
@@ -4,11 +4,12 @@
 
 import com.mockobjects.constraint.Constraint;
 
-public class Mock extends CoreMock {
+public class Mock implements Verifiable {
 	private CallableFactory callableFactory;
+	private DynamicMock coreMock;
 	
 	public Mock(CallableFactory callableFactory, CallableCollection callables, Class mockedClass, String name) {
-		super(mockedClass, name, callables);
+		coreMock = new CoreMock(mockedClass, name, callables);
 		
 		this.callableFactory = callableFactory;
 	}
@@ -18,7 +19,7 @@
 	}
 
 	public Mock(Class mockedClass) {
-		this(mockedClass, mockNameFromClass(mockedClass));
+		this(mockedClass, CoreMock.mockNameFromClass(mockedClass));
 	}
 
     private ConstraintMatcher createConstraintMatcher(Object constraintArg) {
@@ -46,7 +47,7 @@
 	}
 		
 	public void expect(String methodName, ConstraintMatcher args) {
-		this.expect(callableFactory.createCallExpectation(callableFactory.createVoidCallable(methodName, args)));
+		coreMock.expect(callableFactory.createCallExpectation(callableFactory.createVoidCallable(methodName, args)));
 	}
 	
 	public void expectAndReturn(String methodName, Object result) {
@@ -82,7 +83,7 @@
 	}
 
 	public void expectAndReturn(String methodName, ConstraintMatcher args, Object result) {
-		this.expect(callableFactory.createCallExpectation(callableFactory.createReturnCallable(methodName, args, result)));
+		coreMock.expect(callableFactory.createCallExpectation(callableFactory.createReturnCallable(methodName, args, result)));
 	}
 	
 	public void expectAndThrow(String methodName, Throwable exception) {
@@ -94,7 +95,7 @@
 	}
 	
 	public void expectAndThrow(String methodName, ConstraintMatcher args, Throwable exception) {
-		this.expect(callableFactory.createCallExpectation(callableFactory.createThrowableCallable(methodName, args, exception)));
+		coreMock.expect(callableFactory.createCallExpectation(callableFactory.createThrowableCallable(methodName, args, exception)));
 	}
 	
 	public void match(String methodName) {
@@ -114,7 +115,7 @@
 	}
 
 	public void match(String methodName, ConstraintMatcher args) {
-		this.stub(callableFactory.createVoidCallable(methodName, args));
+		coreMock.stub(callableFactory.createVoidCallable(methodName, args));
 	}
 
 	public void matchAndReturn(String methodName, Object result) {
@@ -158,7 +159,7 @@
 	}
 	
 	public void matchAndReturn(String methodName, ConstraintMatcher args, Object result) {
-		this.stub(callableFactory.createReturnCallable(methodName, args, result));
+		coreMock.stub(callableFactory.createReturnCallable(methodName, args, result));
 	}
 	
 	public void matchAndThrow(String methodName, Throwable throwable) {
@@ -178,7 +179,7 @@
 	}
 	
 	public void matchAndThrow(String methodName, ConstraintMatcher args, Throwable throwable) {
-		this.stub(callableFactory.createThrowableCallable(methodName, args, throwable));
+		coreMock.stub(callableFactory.createThrowableCallable(methodName, args, throwable));
 	}
 		
 	/** @deprecated @see OrderedMock
@@ -220,6 +221,18 @@
 	/** @deprecated Not required, as if methodName is called, you will get an exception
 	*/
 	public void expectNotCalled(String methodName) {
+	}
+
+	public Object proxy() {
+		return coreMock.proxy();
+	}
+
+	public void reset() {
+		coreMock.reset();		
+	}
+
+	public void verify() {
+		coreMock.verify();		
 	}
 
 }

Index: CoreMock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/CoreMock.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CoreMock.java	7 Jul 2003 00:19:33 -0000	1.4
+++ CoreMock.java	7 Jul 2003 01:17:57 -0000	1.5
@@ -1,15 +1,12 @@
 package com.mockobjects.dynamic;
 
-import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
-import com.mockobjects.Verifiable;
-
 import junit.framework.AssertionFailedError;
 
 
-public class CoreMock implements DynamicMock, InvocationHandler, Verifiable {
+public class CoreMock implements DynamicMock {
 	private CallableCollection invocationMatchers;
 	private Object proxy;
 	private String name;

Index: DynamicMock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/DynamicMock.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DynamicMock.java	6 Jul 2003 23:06:12 -0000	1.1
+++ DynamicMock.java	7 Jul 2003 01:17:57 -0000	1.2
@@ -1,7 +1,13 @@
 package com.mockobjects.dynamic;
 
-public interface DynamicMock {
+import java.lang.reflect.InvocationHandler;
+
+import com.mockobjects.Verifiable;
+
+public interface DynamicMock extends Verifiable, InvocationHandler {
 	void expect(Callable invocationMatcher);
 	void stub(Callable invocationMatcher);
+	Object proxy();
+	
 	void reset();
 }

Index: CallSignature.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/CallSignature.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CallSignature.java	6 Jul 2003 23:24:09 -0000	1.5
+++ CallSignature.java	7 Jul 2003 01:17:57 -0000	1.6
@@ -32,6 +32,6 @@
 	
 	// Implemented to aid visualisation in an IDE debugger
 	public String toString() {
-		return Mock.className(this.getClass()) + "(" + this.getDescription() + ")";
+		return CoreMock.className(this.getClass()) + "(" + this.getDescription() + ")";
 	}
 }