[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects/dynamic ExpectationBuilder.java,NONE,1.1 StubBuilder.java,NONE,1.1 InvocationMockerBuilder.java,NONE,1.1 InvocationMocker.java,1.7,1.8 DynaMock.java,1.3,1.4 MethodExpectation.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-serv19664/src/core/com/mockobjects/dynamic

Modified Files:
	InvocationMocker.java DynaMock.java 
Added Files:
	ExpectationBuilder.java StubBuilder.java 
	InvocationMockerBuilder.java 
Removed Files:
	MethodExpectation.java 
Log Message:
changed name of MethodExpectation to InvocationMockerBuilder

Added stub assignment builder

--- NEW FILE: ExpectationBuilder.java ---
/*
 * Created on 12-Nov-2003
 */
package com.mockobjects.dynamic;

public interface ExpectationBuilder {

}

--- NEW FILE: StubBuilder.java ---
/*
 * copyright Mockobjects.com 17-Oct-2003
 *
 */
package com.mockobjects.dynamic;

public interface StubBuilder {
	ExpectationBuilder isVoid();
	ExpectationBuilder returns(Object returnValue);
	ExpectationBuilder willThrow(Throwable throwable);
}


--- NEW FILE: InvocationMockerBuilder.java ---
/*
 * Created on 12-Nov-2003
 */
package com.mockobjects.dynamic;

public class InvocationMockerBuilder implements StubBuilder, ExpectationBuilder {

	private InvocationMocker mocker;
	
	public InvocationMockerBuilder(InvocationMocker mocker) {
		this.mocker = mocker;
	}

	public ExpectationBuilder isVoid() {
		mocker.setStub(new VoidStub());
		return this;
	}

	public ExpectationBuilder returns(Object returnValue) {
		mocker.setStub(new ReturnStub(returnValue));
		return this;
	}

	public ExpectationBuilder willThrow(Throwable throwable) {
		mocker.setStub(new ThrowStub(throwable));
		return this;
	}
}

Index: InvocationMocker.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/InvocationMocker.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InvocationMocker.java	29 Oct 2003 22:11:35 -0000	1.7
+++ InvocationMocker.java	13 Nov 2003 00:58:07 -0000	1.8
@@ -62,4 +62,8 @@
 		matchers.add(matcher);
 		return this;
 	}
+
+	public void setStub(Stub stub) {
+		 this.stub = stub;
+	}
 }

Index: DynaMock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/DynaMock.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DynaMock.java	12 Nov 2003 20:38:47 -0000	1.3
+++ DynaMock.java	13 Nov 2003 00:58:07 -0000	1.4
@@ -28,9 +28,9 @@
 		coreMock.verify();		
 	}
 	
-	public MethodExpectation method(String methodName, Object arg1, Object arg2) {
+	public StubBuilder method(String methodName, Object arg1, Object arg2) {
 		InvocationMocker mocker = new InvocationMocker(methodName, C.eq(arg1, arg2), new VoidStub());
 		coreMock.add(mocker);
-		return new MethodExpectation(mocker);
+		return new InvocationMockerBuilder(mocker);
 	}
 }

--- MethodExpectation.java DELETED ---