[MO-java-dev] CVS: mockobjects-java/src/core/test/mockobjects/dynamic/support MockInvokableFactory.java,1.1,1.2

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

Update of /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/support
In directory sc8-pr-cvs1:/tmp/cvs-serv23613/src/core/test/mockobjects/dynamic/support

Modified Files:
	MockInvokableFactory.java 
Log Message:
started wrapping Invokable creation to move towards new Invokable structure

Index: MockInvokableFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/support/MockInvokableFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockInvokableFactory.java	23 Sep 2003 23:04:33 -0000	1.1
+++ MockInvokableFactory.java	2 Oct 2003 23:21:30 -0000	1.2
@@ -18,7 +18,8 @@
     public Invokable createCallExpectationResult;
     public Invokable createReturnCallableResult;
     public Invokable createThrowableCallableResult;
-    public Invokable createVoidCallableResult;
+    public Invokable createVoidStubResult;
+	public Invokable createVoidExpectationResult;
 
     public ExpectationValue createCallExpectation = new ExpectationValue("createCallExpectation");
     public ExpectationList parameters = new ExpectationList("parameters");
@@ -71,16 +72,31 @@
         ConstraintMatcher constraints)
     {
         parameters.addExpectedMany(
-            new Object[] { "createVoidCallable", methodName, constraints });
+            new Object[] { "createVoidStub", methodName, constraints });
     }
     
-    public Invokable createVoidCallable(
+    public Invokable createVoidStub(
         String methodName,
         ConstraintMatcher constraints) 
     {
         parameters.addActualMany(
-            new Object[] { "createVoidCallable", methodName, constraints });
-        return createVoidCallableResult;
+            new Object[] { "createVoidStub", methodName, constraints });
+        return createVoidStubResult;
     }
+
+	public void expectCreateVoidExpectation(
+		String methodName, 
+		ConstraintMatcher constraints)
+	{
+		parameters.addExpectedMany(
+			new Object[] { "createVoidExpectation", methodName, constraints });
+	}
+
+	public Invokable createVoidExpectation(String methodName, ConstraintMatcher constraints) {
+		parameters.addActualMany(
+			new Object[] { "createVoidExpectation", methodName, constraints });
+		return createVoidExpectationResult;
+	}
+
 
 }