[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects/dynamic CallOnceStub.java,NONE,1.1 VoidStub.java,1.7,1.8 CallStub.java,1.6,1.7 Stub.java,1.5,1.6 ThrowStub.java,1.8,1.9 DefaultInvokableFactory.java,1.7,1.8 CallOnceExpectation.java,1.7,NONE CallSignature.java,1.9,NONE

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

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

Modified Files:
	VoidStub.java CallStub.java Stub.java ThrowStub.java 
	DefaultInvokableFactory.java 
Added Files:
	CallOnceStub.java 
Removed Files:
	CallOnceExpectation.java CallSignature.java 
Log Message:
Added call once stub and removed old CallOnceExpectation and CallSignature

--- NEW FILE: CallOnceStub.java ---
/*
 * Copyright mockobjects.com 08-Oct-2003
 */
package com.mockobjects.dynamic;

import junit.framework.Assert;

public class CallOnceStub extends CallStub {
	private boolean wasCalled = false;
	private CallStub delegateStub;
	
	public CallOnceStub(CallStub delegateStub) {
		this.delegateStub = delegateStub;
	}
	
	public String getDescription() {
		return " Call Once " + delegateStub.getDescription();
	}

	public Object invoke(Invocation invocation) throws Throwable {
		Assert.assertFalse("should not be called more than once", wasCalled);
		wasCalled = true;
		return delegateStub.invoke(invocation);
	}

	public void verify() {
		Assert.assertTrue("should have been called once", wasCalled);
	}

}

Index: VoidStub.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/VoidStub.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- VoidStub.java	5 Oct 2003 08:57:27 -0000	1.7
+++ VoidStub.java	8 Oct 2003 23:47:14 -0000	1.8
@@ -4,7 +4,7 @@
 package com.mockobjects.dynamic;
 
 
-public class VoidStub extends CallStub implements Stub {
+public class VoidStub extends CallStub {
 
 	public String getDescription() {
 		return "returns <void>";

Index: CallStub.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/CallStub.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CallStub.java	20 Aug 2003 21:51:27 -0000	1.6
+++ CallStub.java	8 Oct 2003 23:47:14 -0000	1.7
@@ -3,13 +3,8 @@
  */
 package com.mockobjects.dynamic;
 
-public abstract class CallStub  
-	implements Invokable 
+public abstract class CallStub implements Stub
 {
-	public boolean matches(Invocation invocation) {
-		return true;
-	}
-
 	public void verify() {
 	}
 }

Index: Stub.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Stub.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Stub.java	5 Oct 2003 10:10:18 -0000	1.5
+++ Stub.java	8 Oct 2003 23:47:14 -0000	1.6
@@ -25,4 +25,6 @@
      *      thrown from this method must be in the <code>throws</code> list of the invoked method.
      */
     Object invoke( Invocation invocation ) throws Throwable;
+
+	String getDescription();
 }

Index: ThrowStub.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/ThrowStub.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ThrowStub.java	5 Oct 2003 09:28:16 -0000	1.8
+++ ThrowStub.java	8 Oct 2003 23:47:14 -0000	1.9
@@ -5,7 +5,6 @@
 
 public class ThrowStub 
 	extends CallStub
-	implements Stub
 {
 	private Throwable throwable;
 	

Index: DefaultInvokableFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/DefaultInvokableFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultInvokableFactory.java	5 Oct 2003 09:28:16 -0000	1.7
+++ DefaultInvokableFactory.java	8 Oct 2003 23:47:14 -0000	1.8
@@ -7,8 +7,10 @@
 						new InvocationMatcher.Arguments(arguments.getConstraints()), 
 						new ReturnStub(result));
 	}
-	public Invokable createReturnExpectation(String methodName, ArgumentsMatcher constraints, Object result) {
-		return createCallExpectation(createCallSignature(methodName, constraints, new ReturnStub(result)));
+	public Invokable createReturnExpectation(String methodName, ArgumentsMatcher arguments, Object result) {
+		return new InvocationMocker(methodName, 
+						new InvocationMatcher.Arguments(arguments.getConstraints()), 
+						new CallOnceStub(new ReturnStub(result)));
 	}
 	
 	public Invokable createThrowableStub(String methodName, ArgumentsMatcher arguments, Throwable throwable) {
@@ -16,8 +18,10 @@
 						new InvocationMatcher.Arguments(arguments.getConstraints()), 
 						new ThrowStub(throwable));
 	}
-	public Invokable createThrowableExpectation(String methodName, ArgumentsMatcher constraints, Throwable throwable) {
-		return createCallExpectation(createCallSignature(methodName, constraints, new ThrowStub(throwable)));
+	public Invokable createThrowableExpectation(String methodName, ArgumentsMatcher arguments, Throwable throwable) {
+		return new InvocationMocker(methodName, 
+						new InvocationMatcher.Arguments(arguments.getConstraints()), 
+						new CallOnceStub(new ThrowStub(throwable)));
 	}
 	
 	public Invokable createVoidStub(String methodName, ArgumentsMatcher arguments) {
@@ -25,18 +29,9 @@
 						new InvocationMatcher.Arguments(arguments.getConstraints()), 
 						new VoidStub());
 	}
-	public Invokable createVoidExpectation(String methodName, ArgumentsMatcher constraints) {
-		return createCallExpectation(createCallSignature(methodName, constraints, new VoidStub()));
-	}
-
-	private Invokable createCallExpectation(Invokable callable) {
-		return new CallOnceExpectation(callable);
+	public Invokable createVoidExpectation(String methodName, ArgumentsMatcher arguments) {
+		return new InvocationMocker(methodName, 
+						new InvocationMatcher.Arguments(arguments.getConstraints()), 
+						new CallOnceStub(new VoidStub()));
 	}
-
-    private Invokable createCallSignature(String methodName, ArgumentsMatcher constraints, Invokable callable) {
-        return new CallSignature( methodName, constraints, callable );
-    }
-
-
-
 }

--- CallOnceExpectation.java DELETED ---

--- CallSignature.java DELETED ---