You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(13) |
Aug
(151) |
Sep
(21) |
Oct
(6) |
Nov
(70) |
Dec
(8) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(47) |
Feb
(66) |
Mar
(23) |
Apr
(115) |
May
(24) |
Jun
(53) |
Jul
(10) |
Aug
(279) |
Sep
(84) |
Oct
(149) |
Nov
(138) |
Dec
(52) |
| 2003 |
Jan
(22) |
Feb
(20) |
Mar
(29) |
Apr
(106) |
May
(170) |
Jun
(122) |
Jul
(70) |
Aug
(64) |
Sep
(27) |
Oct
(71) |
Nov
(49) |
Dec
(9) |
| 2004 |
Jan
(7) |
Feb
(38) |
Mar
(3) |
Apr
(9) |
May
(22) |
Jun
(4) |
Jul
(1) |
Aug
(2) |
Sep
(2) |
Oct
|
Nov
(15) |
Dec
(2) |
| 2005 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
(1) |
May
(28) |
Jun
(3) |
Jul
(11) |
Aug
(5) |
Sep
(1) |
Oct
(5) |
Nov
(2) |
Dec
(3) |
| 2006 |
Jan
(8) |
Feb
(3) |
Mar
(8) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Steve F. <sm...@us...> - 2003-10-04 22:56:49
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic In directory sc8-pr-cvs1:/tmp/cvs-serv20912/src/core/test/mockobjects/dynamic Modified Files: MockTest.java Added Files: InvocationMockerTest.java ArgumentsMatcherTest.java InvocationMatcherTest.java DynamicMockErrorTest.java Removed Files: ConstraintMatcherTest.java Log Message: Started implementing new dynamic mock structure. Introduced InvocationMocker. and InvocationMatcher Renamed ConstraintMatcher to ArgumentsMatcher --- NEW FILE: InvocationMockerTest.java --- /* * Copyright MockObjects.com 04-Oct-2003 */ package test.mockobjects.dynamic; import com.mockobjects.dynamic.Invocation; import com.mockobjects.dynamic.InvocationMatcher; import com.mockobjects.dynamic.InvocationMocker; import com.mockobjects.util.TestCaseMo; public class InvocationMockerTest extends TestCaseMo { private InvocationMatcher matchAll = new InvocationMatcher() { public boolean matches(Invocation invocation) { return true; } }; private InvocationMatcher matchNone = new InvocationMatcher() { public boolean matches(Invocation invocation) { return false; } }; private Invocation invocation = new Invocation("example", new Class[0], Void.class, new Object[0]); public InvocationMockerTest(String name) { super(name); } public void testMatchesIfEverythingMatches() { InvocationMocker invocationMocker = new InvocationMocker(new InvocationMatcher[] { matchAll, matchAll}, null); assertTrue("Should have matched", invocationMocker.matches(invocation)); } public void testDoesNotMatchIfEverythingMatches() { InvocationMocker invocationMocker = new InvocationMocker(new InvocationMatcher[] { matchAll, matchNone}, null); assertFalse("Should not have matched", invocationMocker.matches(invocation)); } } --- NEW FILE: ArgumentsMatcherTest.java --- package test.mockobjects.dynamic; import test.mockobjects.dynamic.support.*; import com.mockobjects.dynamic.*; import com.mockobjects.dynamic.ArgumentsMatcher; import junit.framework.TestCase; public class ArgumentsMatcherTest extends TestCase { public ArgumentsMatcherTest(String name) { super(name); } public void testNoMatchWhenTooManyArguments() throws Throwable { String[] args = { "arg1", "arg2" }; MockConstraint[] constraints = { new MockConstraint("constraint1", args[0], true) }; ArgumentsMatcher constraintMatcher = new FullArgumentsMatcher(constraints); assertFalse("Should not match if too many arguments", constraintMatcher.matches(args)); } public void testNoMatchWhenTooFewArguments() throws Throwable { String[] args = { "arg1" }; MockConstraint[] constraints = { new MockConstraint("constraint1", args[0], true), new MockConstraint("constraint2", args[0], true) }; ArgumentsMatcher constraintMatcher = new FullArgumentsMatcher(constraints); assertFalse("Should not match if too few arguments", constraintMatcher.matches(args)); } public void testNoMatchWhenConstraintIsViolated() throws Throwable { String[] args = { "argA", "argB", "argC" }; MockConstraint[] constraints = { new MockConstraint("constraintA", args[0], true), new MockConstraint("constraintB", args[1], false), new MockConstraint("constraintC", args[2], true) }; ArgumentsMatcher constraintMatcher = new FullArgumentsMatcher(constraints); assertFalse("Should not match", constraintMatcher.matches(args)); } public void testNoMatchWithNoArgumentsAndCalleeHasArguments() throws Throwable { String[] args = new String[] { "arg1", "arg2" }; MockConstraint[] constraints = new MockConstraint[0]; ArgumentsMatcher constraintMatcher = new FullArgumentsMatcher(constraints); assertFalse("Should not match", constraintMatcher.matches(args)); } public void testMatchWithNoArguments() throws Throwable { String[] args = new String[0]; MockConstraint[] constraints = new MockConstraint[0]; ArgumentsMatcher constraintMatcher = new FullArgumentsMatcher(constraints); assertTrue("Should match", constraintMatcher.matches(args)); } public void testMatchAndArgumentsCheckedAgainstConstraints() throws Throwable { String[] args = { "argA", "argB", "argC" }; MockConstraint constraintA = new MockConstraint("constraintA", args[0], true); MockConstraint constraintB = new MockConstraint("constraintB", args[1], true); MockConstraint constraintC = new MockConstraint("constraintC", args[2], true); MockConstraint[] constraints = { constraintA, constraintB, constraintC }; ArgumentsMatcher constraintMatcher = new FullArgumentsMatcher(constraints); assertTrue("Should match", constraintMatcher.matches(args)); constraintA.verify(); constraintB.verify(); constraintC.verify(); } public void testMatchWithArgument() throws Throwable { String[] args = { "argA" }; MockConstraint constraintA = new MockConstraint("constraintA", args[0], true); ArgumentsMatcher constraintMatcher = new FullArgumentsMatcher(new MockConstraint[] { constraintA }); assertTrue("Should match", constraintMatcher.matches(args)); } } --- NEW FILE: InvocationMatcherTest.java --- /* * Copyright mockobjects.com 04-Oct-2003 */ package test.mockobjects.dynamic; import com.mockobjects.dynamic.C; import com.mockobjects.dynamic.Invocation; import com.mockobjects.dynamic.InvocationMatcher; import com.mockobjects.util.TestCaseMo; public class InvocationMatcherTest extends TestCaseMo { private Invocation invocation = new Invocation("example", new Class[0], Void.class, new Object[0]); public InvocationMatcherTest(String name) { super(name); } public void testNameMatchesWhenConstraintIsAnything() { InvocationMatcher.MethodName matcher = new InvocationMatcher.MethodName(C.IS_ANYTHING); assertTrue("Should match name", matcher.matches(invocation)); } public void testNameMatchesWhenConstraintIsNothing() { InvocationMatcher.MethodName matcher = new InvocationMatcher.MethodName(C.not(C.IS_ANYTHING)); assertFalse("Should not match name", matcher.matches(invocation)); } public void testNameMatchesGivenString() { InvocationMatcher.MethodName matcher = new InvocationMatcher.MethodName("example"); assertTrue("Should match name", matcher.matches(invocation)); } public void testNameDoesNotMatcheIncorrectString() { InvocationMatcher.MethodName matcher = new InvocationMatcher.MethodName("not an example"); assertFalse("Should not match name", matcher.matches(invocation)); } } --- NEW FILE: DynamicMockErrorTest.java --- /* * copyright mockobjects.com 04-Oct-2003 */ package test.mockobjects.dynamic; import com.mockobjects.util.TestCaseMo; public class DynamicMockErrorTest extends TestCaseMo { public DynamicMockErrorTest(String name) { super(name); } // TODO test message generation based on message and invocation. } Index: MockTest.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/MockTest.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- MockTest.java 2 Oct 2003 23:42:06 -0000 1.26 +++ MockTest.java 4 Oct 2003 22:56:45 -0000 1.27 @@ -6,7 +6,7 @@ import com.mockobjects.constraint.Constraint; import com.mockobjects.constraint.IsEqual; import com.mockobjects.dynamic.C; -import com.mockobjects.dynamic.ConstraintMatcher; +import com.mockobjects.dynamic.ArgumentsMatcher; import com.mockobjects.dynamic.Mock; @@ -14,8 +14,8 @@ private static final String MOCK_NAME = "Test mock"; final Throwable METHOD_EXCEPTION = new DummyThrowable("Configured test throwable"); - final ConstraintMatcher METHOD_ONEARG_CONSTRAINTS = C.args(C.eq("oneP1")); - final ConstraintMatcher METHOD_TWOARG_CONSTRAINTS = C.args(C.eq("twoP1"), C.eq("twoP2")); + final ArgumentsMatcher METHOD_ONEARG_CONSTRAINTS = C.args(C.eq("oneP1")); + final ArgumentsMatcher METHOD_TWOARG_CONSTRAINTS = C.args(C.eq("twoP1"), C.eq("twoP2")); private MockInvokableFactory mockCallableFactory = new MockInvokableFactory(); private MockInvocationDispatcher mockDispatcher = new MockInvocationDispatcher(); --- ConstraintMatcherTest.java DELETED --- |
|
From: Steve F. <sm...@us...> - 2003-10-04 22:54:56
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/functional/test/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv20630/src/core/functional/test/mockobjects/dynamic
Modified Files:
MockTest.java
Log Message:
added a couple more functional tests
Index: MockTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/functional/test/mockobjects/dynamic/MockTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockTest.java 3 Oct 2003 00:08:17 -0000 1.1
+++ MockTest.java 4 Oct 2003 22:54:48 -0000 1.2
@@ -19,6 +19,17 @@
private Mock mockTarget = new Mock(TargetType.class);
private TargetType targetType = ((TargetType)mockTarget.proxy());
+ public void testHasDefaultNameBasedOnMockedType()
+ {
+ assertEquals("Should have same name", "mockMockTest$TargetType", mockTarget.toString() );
+ }
+
+ public void testCanBeExplicitlyNamed()
+ {
+ Mock otherMock = new Mock(TargetType.class, "otherMock");
+ assertEquals("Should have same name", "otherMock", otherMock.toString());
+ }
+
public void testPassesIfMockedMethodCalled() {
mockTarget.expect("noParams");
@@ -57,7 +68,7 @@
mockTarget.verify();
}
- public void testFailsImmediatelyIfIncorrectParameterPassed() {
+ public void testInvocationFailsIfParameterValueIncorrect() {
mockTarget.expect("oneParam", "one");
try {
|
|
From: Steve F. <sm...@us...> - 2003-10-03 00:08:21
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/functional/test/mockobjects/dynamic In directory sc8-pr-cvs1:/tmp/cvs-serv32603/src/core/functional/test/mockobjects/dynamic Added Files: MockTest.java Log Message: Added beginnings of functional testing --- NEW FILE: MockTest.java --- /* * Copyright mockobjects.com 03-Oct-2003 */ package functional.test.mockobjects.dynamic; import junit.framework.AssertionFailedError; import junit.framework.TestCase; import com.mockobjects.dynamic.*; /** * High level test of dynamic mock class. */ public class MockTest extends TestCase { public interface TargetType { void noParams(); void oneParam(Object aParam); } private Mock mockTarget = new Mock(TargetType.class); private TargetType targetType = ((TargetType)mockTarget.proxy()); public void testPassesIfMockedMethodCalled() { mockTarget.expect("noParams"); targetType.noParams(); mockTarget.verify(); } public void testFailsIfMockedMethodNotCalled() { mockTarget.expect("noParams"); try { mockTarget.verify(); } catch (AssertionFailedError unused) { return; } fail("Should have thrown exception"); } public void testFailsImmediatelyIfUnexpectedMethodCalled() { mockTarget.expect("notNoParams"); try { targetType.noParams(); } catch (AssertionFailedError unused) { return; } fail("Should have thrown exception"); } public void testPassesIfMockedMethodCalledWithParameter() { mockTarget.expect("oneParam", "one"); targetType.oneParam("one"); mockTarget.verify(); } public void testFailsImmediatelyIfIncorrectParameterPassed() { mockTarget.expect("oneParam", "one"); try { targetType.oneParam("two"); } catch (AssertionFailedError unused) { return; } fail("Should have thrown exception"); } } |
|
From: Steve F. <sm...@us...> - 2003-10-02 23:47:29
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/support
In directory sc8-pr-cvs1:/tmp/cvs-serv28570/src/core/test/mockobjects/dynamic/support
Modified Files:
MockInvokableFactory.java
Log Message:
tidied import
Index: MockInvokableFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/support/MockInvokableFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MockInvokableFactory.java 2 Oct 2003 23:45:28 -0000 1.6
+++ MockInvokableFactory.java 2 Oct 2003 23:47:22 -0000 1.7
@@ -5,11 +5,10 @@
package test.mockobjects.dynamic.support;
import com.mockobjects.ExpectationList;
-import com.mockobjects.ExpectationValue;
import com.mockobjects.MockObject;
-import com.mockobjects.dynamic.InvokableFactory;
import com.mockobjects.dynamic.ConstraintMatcher;
import com.mockobjects.dynamic.Invokable;
+import com.mockobjects.dynamic.InvokableFactory;
public class MockInvokableFactory
extends MockObject
|
|
From: Steve F. <sm...@us...> - 2003-10-02 23:45:34
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv28198/src/core/com/mockobjects/dynamic
Modified Files:
InvokableFactory.java DefaultInvokableFactory.java
Log Message:
started wrapping Invokable creation to move towards new Invokable structure
Index: InvokableFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/InvokableFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InvokableFactory.java 2 Oct 2003 23:42:06 -0000 1.4
+++ InvokableFactory.java 2 Oct 2003 23:45:28 -0000 1.5
@@ -1,8 +1,6 @@
package com.mockobjects.dynamic;
public interface InvokableFactory {
- Invokable createCallExpectation( Invokable invokable );
-
Invokable createReturnStub( String methodName, ConstraintMatcher constraints, Object result );
Invokable createReturnExpectation( String methodName, ConstraintMatcher constraints, Object result );
Invokable createThrowableStub( String methodName, ConstraintMatcher constraints, Throwable throwable);
Index: DefaultInvokableFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/DefaultInvokableFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultInvokableFactory.java 2 Oct 2003 23:42:06 -0000 1.4
+++ DefaultInvokableFactory.java 2 Oct 2003 23:45:28 -0000 1.5
@@ -2,10 +2,6 @@
public class DefaultInvokableFactory implements InvokableFactory {
- public Invokable createCallExpectation(Invokable callable) {
- return new CallOnceExpectation(callable);
- }
-
public Invokable createReturnStub(String methodName, ConstraintMatcher constraints, Object result) {
return createCallSignature(methodName, constraints, new ReturnStub(result));
}
@@ -25,6 +21,10 @@
}
public Invokable createVoidExpectation(String methodName, ConstraintMatcher constraints) {
return createCallExpectation(createCallSignature(methodName, constraints, new VoidStub()));
+ }
+
+ private Invokable createCallExpectation(Invokable callable) {
+ return new CallOnceExpectation(callable);
}
private Invokable createCallSignature(String methodName, ConstraintMatcher constraints, Invokable callable) {
|
|
From: Steve F. <sm...@us...> - 2003-10-02 23:45:34
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/support
In directory sc8-pr-cvs1:/tmp/cvs-serv28198/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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MockInvokableFactory.java 2 Oct 2003 23:42:06 -0000 1.5
+++ MockInvokableFactory.java 2 Oct 2003 23:45:28 -0000 1.6
@@ -18,14 +18,8 @@
public Invokable createCallExpectationResult;
public Invokable createInvokableResult;
- public ExpectationValue createCallExpectation = new ExpectationValue("createCallExpectation");
public ExpectationList parameters = new ExpectationList("parameters");
- public Invokable createCallExpectation(Invokable invokable) {
- createCallExpectation.setActual(invokable);
- return createCallExpectationResult;
- }
-
public void expectCreateReturnStub(
String methodName,
ConstraintMatcher constraints,
|
|
From: Steve F. <sm...@us...> - 2003-10-02 23:42:10
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv27534/src/core/com/mockobjects/dynamic
Modified Files:
Mock.java InvokableFactory.java DefaultInvokableFactory.java
Log Message:
started wrapping Invokable creation to move towards new Invokable structure
Index: Mock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Mock.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Mock.java 2 Oct 2003 23:35:18 -0000 1.39
+++ Mock.java 2 Oct 2003 23:42:06 -0000 1.40
@@ -42,7 +42,7 @@
}
public void expectAndReturn(String methodName, ConstraintMatcher args, Object result) {
- coreMock.add(callableFactory.createCallExpectation(callableFactory.createReturnCallable(methodName, args, result)));
+ coreMock.add(callableFactory.createReturnExpectation(methodName, args, result));
}
public void expectAndThrow(String methodName, ConstraintMatcher args, Throwable throwable) {
@@ -54,7 +54,7 @@
}
public void matchAndReturn(String methodName, ConstraintMatcher args, Object result) {
- coreMock.add(callableFactory.createReturnCallable(methodName, args, result));
+ coreMock.add(callableFactory.createReturnStub(methodName, args, result));
}
public void matchAndThrow(String methodName, ConstraintMatcher args, Throwable throwable) {
Index: InvokableFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/InvokableFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InvokableFactory.java 2 Oct 2003 23:35:18 -0000 1.3
+++ InvokableFactory.java 2 Oct 2003 23:42:06 -0000 1.4
@@ -3,7 +3,8 @@
public interface InvokableFactory {
Invokable createCallExpectation( Invokable invokable );
- Invokable createReturnCallable( String methodName, ConstraintMatcher constraints, Object result );
+ Invokable createReturnStub( String methodName, ConstraintMatcher constraints, Object result );
+ Invokable createReturnExpectation( String methodName, ConstraintMatcher constraints, Object result );
Invokable createThrowableStub( String methodName, ConstraintMatcher constraints, Throwable throwable);
Invokable createThrowableExpectation( String methodName, ConstraintMatcher constraints, Throwable throwable);
Invokable createVoidStub ( String methodName, ConstraintMatcher constraints);
Index: DefaultInvokableFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/DefaultInvokableFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultInvokableFactory.java 2 Oct 2003 23:35:18 -0000 1.3
+++ DefaultInvokableFactory.java 2 Oct 2003 23:42:06 -0000 1.4
@@ -6,21 +6,23 @@
return new CallOnceExpectation(callable);
}
- public Invokable createReturnCallable(String methodName, ConstraintMatcher constraints, Object result) {
- return createCallSignature(methodName, constraints, createReturnStub(result));
+ public Invokable createReturnStub(String methodName, ConstraintMatcher constraints, Object result) {
+ return createCallSignature(methodName, constraints, new ReturnStub(result));
}
-
+ public Invokable createReturnExpectation(String methodName, ConstraintMatcher constraints, Object result) {
+ return createCallExpectation(createCallSignature(methodName, constraints, new ReturnStub(result)));
+ }
+
public Invokable createThrowableStub(String methodName, ConstraintMatcher constraints, Throwable throwable) {
return createCallSignature(methodName, constraints, new ThrowStub(throwable));
}
-
public Invokable createThrowableExpectation(String methodName, ConstraintMatcher constraints, Throwable throwable) {
return createCallExpectation(createCallSignature(methodName, constraints, new ThrowStub(throwable)));
}
+
public Invokable createVoidStub(String methodName, ConstraintMatcher constraints) {
return createCallSignature(methodName, constraints, new VoidStub());
}
-
public Invokable createVoidExpectation(String methodName, ConstraintMatcher constraints) {
return createCallExpectation(createCallSignature(methodName, constraints, new VoidStub()));
}
@@ -29,9 +31,6 @@
return new CallSignature( methodName, constraints, callable );
}
- private Invokable createReturnStub(Object result) {
- return new ReturnStub(result);
- }
}
|
|
From: Steve F. <sm...@us...> - 2003-10-02 23:42:10
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/support
In directory sc8-pr-cvs1:/tmp/cvs-serv27534/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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MockInvokableFactory.java 2 Oct 2003 23:35:18 -0000 1.4
+++ MockInvokableFactory.java 2 Oct 2003 23:42:06 -0000 1.5
@@ -26,25 +26,40 @@
return createCallExpectationResult;
}
- public void expectCreateReturnCallable(
+ public void expectCreateReturnStub(
String methodName,
ConstraintMatcher constraints,
Object result)
{
parameters.addExpectedMany(
- new Object[] { "createReturnCallable", methodName, constraints, result });
+ new Object[] { "createReturnStub", methodName, constraints, result });
}
- public Invokable createReturnCallable(
+ public Invokable createReturnStub(
String methodName,
ConstraintMatcher constraints,
Object result)
{
parameters.addActualMany(
- new Object[] { "createReturnCallable", methodName, constraints, result });
+ new Object[] { "createReturnStub", methodName, constraints, result });
return createInvokableResult;
}
+ public void expectCreateReturnExpectation(
+ String methodName,
+ ConstraintMatcher constraints,
+ Object result)
+ {
+ parameters.addExpectedMany(
+ new Object[] { "createReturnExpectation", methodName, constraints, result });
+ }
+
+ public Invokable createReturnExpectation(String methodName, ConstraintMatcher constraints, Object result) {
+ parameters.addActualMany(
+ new Object[] { "createReturnExpectation", methodName, constraints, result });
+ return createInvokableResult;
+ }
+
public void expectCreateThrowableStub(
String methodName,
ConstraintMatcher constraints,
@@ -108,6 +123,7 @@
new Object[] { "createVoidExpectation", methodName, constraints });
return createInvokableResult;
}
+
|
|
From: Steve F. <sm...@us...> - 2003-10-02 23:42:10
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv27534/src/core/test/mockobjects/dynamic
Modified Files:
MockTest.java
Log Message:
started wrapping Invokable creation to move towards new Invokable structure
Index: MockTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/MockTest.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- MockTest.java 2 Oct 2003 23:35:18 -0000 1.25
+++ MockTest.java 2 Oct 2003 23:42:06 -0000 1.26
@@ -50,9 +50,8 @@
}
public void testExpectNoneAndReturn() throws Throwable {
- mockCallableFactory.expectCreateReturnCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS, DummyInterface.METHOD_NOARG_RESULT);
+ mockCallableFactory.expectCreateReturnExpectation(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS, DummyInterface.METHOD_NOARG_RESULT);
mockCallableFactory.createInvokableResult = mockInvokable;
- mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expectAndReturn(DummyInterface.METHOD_NOARG_NAME, DummyInterface.METHOD_NOARG_RESULT);
@@ -101,9 +100,8 @@
}
public void testExpectManyAndReturn() throws Throwable {
- mockCallableFactory.expectCreateReturnCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, DummyInterface.METHOD_TWOARG_RESULT);
+ mockCallableFactory.expectCreateReturnExpectation(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, DummyInterface.METHOD_TWOARG_RESULT);
mockCallableFactory.createInvokableResult = mockInvokable;
- mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expectAndReturn(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, DummyInterface.METHOD_TWOARG_RESULT);
@@ -122,9 +120,8 @@
}
public void testExpectOneAndReturn() throws Throwable {
- mockCallableFactory.expectCreateReturnCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, DummyInterface.METHOD_ONEARG_RESULT);
+ mockCallableFactory.expectCreateReturnExpectation(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, DummyInterface.METHOD_ONEARG_RESULT);
mockCallableFactory.createInvokableResult = mockInvokable;
- mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expectAndReturn(DummyInterface.METHOD_ONEARG_NAME, DummyInterface.METHOD_ONEARG_ARGS[0], DummyInterface.METHOD_ONEARG_RESULT);
@@ -143,7 +140,7 @@
}
public void testMatchNoneAndReturn() throws Throwable {
- mockCallableFactory.expectCreateReturnCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS, DummyInterface.METHOD_NOARG_RESULT);
+ mockCallableFactory.expectCreateReturnStub(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS, DummyInterface.METHOD_NOARG_RESULT);
mockCallableFactory.createInvokableResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
@@ -173,7 +170,7 @@
}
public void testMatchOneAndReturn() throws Throwable {
- mockCallableFactory.expectCreateReturnCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, DummyInterface.METHOD_ONEARG_RESULT);
+ mockCallableFactory.expectCreateReturnStub(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, DummyInterface.METHOD_ONEARG_RESULT);
mockCallableFactory.createInvokableResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
@@ -203,7 +200,7 @@
}
public void testMatchManyAndReturn() throws Throwable {
- mockCallableFactory.expectCreateReturnCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, DummyInterface.METHOD_TWOARG_RESULT);
+ mockCallableFactory.expectCreateReturnStub(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, DummyInterface.METHOD_TWOARG_RESULT);
mockCallableFactory.createInvokableResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
|
|
From: Steve F. <sm...@us...> - 2003-10-02 23:35:23
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/support
In directory sc8-pr-cvs1:/tmp/cvs-serv26253/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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MockInvokableFactory.java 2 Oct 2003 23:27:30 -0000 1.3
+++ MockInvokableFactory.java 2 Oct 2003 23:35:18 -0000 1.4
@@ -45,25 +45,39 @@
return createInvokableResult;
}
- public void expectCreateThrowableCallable(
+ public void expectCreateThrowableStub(
String methodName,
ConstraintMatcher constraints,
Throwable throwable)
{
parameters.addExpectedMany(
- new Object[] { "createThrowableCallable", methodName, constraints, throwable });
+ new Object[] { "createThrowableStub", methodName, constraints, throwable });
}
- public Invokable createThrowableCallable(
+ public Invokable createThrowableStub(
String methodName,
ConstraintMatcher constraints,
Throwable throwable)
{
parameters.addActualMany(
- new Object[] { "createThrowableCallable", methodName, constraints, throwable });
+ new Object[] { "createThrowableStub", methodName, constraints, throwable });
return createInvokableResult;
}
+ public void expectCreateThrowableExpectation(
+ String methodName,
+ ConstraintMatcher constraints,
+ Throwable throwable)
+ {
+ parameters.addExpectedMany(
+ new Object[] { "createThrowableExpectation", methodName, constraints, throwable });
+ }
+
+ public Invokable createThrowableExpectation(String methodName, ConstraintMatcher constraints, Throwable throwable) {
+ parameters.addActualMany(
+ new Object[] { "createThrowableExpectation", methodName, constraints, throwable });
+ return createInvokableResult;
+ }
public void expectCreateVoidCallable(
String methodName,
ConstraintMatcher constraints)
@@ -94,6 +108,7 @@
new Object[] { "createVoidExpectation", methodName, constraints });
return createInvokableResult;
}
+
}
|
|
From: Steve F. <sm...@us...> - 2003-10-02 23:35:23
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv26253/src/core/com/mockobjects/dynamic
Modified Files:
Mock.java InvokableFactory.java DefaultInvokableFactory.java
Log Message:
started wrapping Invokable creation to move towards new Invokable structure
Index: Mock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Mock.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Mock.java 2 Oct 2003 23:21:31 -0000 1.38
+++ Mock.java 2 Oct 2003 23:35:18 -0000 1.39
@@ -46,7 +46,7 @@
}
public void expectAndThrow(String methodName, ConstraintMatcher args, Throwable throwable) {
- coreMock.add(callableFactory.createCallExpectation(callableFactory.createThrowableCallable(methodName, args, throwable)));
+ coreMock.add(callableFactory.createThrowableExpectation(methodName, args, throwable));
}
public void match(String methodName, ConstraintMatcher args) {
@@ -58,7 +58,7 @@
}
public void matchAndThrow(String methodName, ConstraintMatcher args, Throwable throwable) {
- coreMock.add(callableFactory.createThrowableCallable(methodName, args, throwable));
+ coreMock.add(callableFactory.createThrowableStub(methodName, args, throwable));
}
/*
Index: InvokableFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/InvokableFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InvokableFactory.java 2 Oct 2003 23:21:31 -0000 1.2
+++ InvokableFactory.java 2 Oct 2003 23:35:18 -0000 1.3
@@ -4,7 +4,8 @@
Invokable createCallExpectation( Invokable invokable );
Invokable createReturnCallable( String methodName, ConstraintMatcher constraints, Object result );
- Invokable createThrowableCallable( String methodName, ConstraintMatcher constraints, Throwable throwable);
+ Invokable createThrowableStub( String methodName, ConstraintMatcher constraints, Throwable throwable);
+ Invokable createThrowableExpectation( String methodName, ConstraintMatcher constraints, Throwable throwable);
Invokable createVoidStub ( String methodName, ConstraintMatcher constraints);
Invokable createVoidExpectation ( String methodName, ConstraintMatcher constraints);
}
Index: DefaultInvokableFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/DefaultInvokableFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultInvokableFactory.java 2 Oct 2003 23:21:31 -0000 1.2
+++ DefaultInvokableFactory.java 2 Oct 2003 23:35:18 -0000 1.3
@@ -10,10 +10,13 @@
return createCallSignature(methodName, constraints, createReturnStub(result));
}
- public Invokable createThrowableCallable(String methodName, ConstraintMatcher constraints, Throwable throwable) {
- return createCallSignature(methodName, constraints, createThrowStub(throwable));
+ public Invokable createThrowableStub(String methodName, ConstraintMatcher constraints, Throwable throwable) {
+ return createCallSignature(methodName, constraints, new ThrowStub(throwable));
}
+ public Invokable createThrowableExpectation(String methodName, ConstraintMatcher constraints, Throwable throwable) {
+ return createCallExpectation(createCallSignature(methodName, constraints, new ThrowStub(throwable)));
+ }
public Invokable createVoidStub(String methodName, ConstraintMatcher constraints) {
return createCallSignature(methodName, constraints, new VoidStub());
}
@@ -30,8 +33,5 @@
return new ReturnStub(result);
}
- private Invokable createThrowStub( Throwable exception ) {
- return new ThrowStub(exception);
- }
}
|
|
From: Steve F. <sm...@us...> - 2003-10-02 23:35:23
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv26253/src/core/test/mockobjects/dynamic
Modified Files:
MockTest.java
Log Message:
started wrapping Invokable creation to move towards new Invokable structure
Index: MockTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/MockTest.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- MockTest.java 2 Oct 2003 23:27:30 -0000 1.24
+++ MockTest.java 2 Oct 2003 23:35:18 -0000 1.25
@@ -61,9 +61,8 @@
}
public void testExpectNoneAndThrow() throws Throwable {
- mockCallableFactory.expectCreateThrowableCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS, METHOD_EXCEPTION);
+ mockCallableFactory.expectCreateThrowableExpectation(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS, METHOD_EXCEPTION);
mockCallableFactory.createInvokableResult = mockInvokable;
- mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expectAndThrow(DummyInterface.METHOD_NOARG_NAME, METHOD_EXCEPTION);
@@ -72,9 +71,8 @@
}
public void testExpectOneAndThrow() throws Throwable {
- mockCallableFactory.expectCreateThrowableCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, METHOD_EXCEPTION);
+ mockCallableFactory.expectCreateThrowableExpectation(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, METHOD_EXCEPTION);
mockCallableFactory.createInvokableResult = mockInvokable;
- mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expectAndThrow(DummyInterface.METHOD_ONEARG_NAME, DummyInterface.METHOD_ONEARG_ARGS[0], METHOD_EXCEPTION);
@@ -114,9 +112,8 @@
}
public void testExpectManyAndThrow() throws Throwable {
- mockCallableFactory.expectCreateThrowableCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, METHOD_EXCEPTION);
+ mockCallableFactory.expectCreateThrowableExpectation(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, METHOD_EXCEPTION);
mockCallableFactory.createInvokableResult = mockInvokable;
- mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expectAndThrow(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, METHOD_EXCEPTION);
@@ -156,7 +153,7 @@
}
public void testMatchNoneAndThrow() throws Throwable {
- mockCallableFactory.expectCreateThrowableCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS, METHOD_EXCEPTION);
+ mockCallableFactory.expectCreateThrowableStub(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS, METHOD_EXCEPTION);
mockCallableFactory.createInvokableResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
@@ -186,7 +183,7 @@
}
public void testMatchOneAndThrow() throws Throwable {
- mockCallableFactory.expectCreateThrowableCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, METHOD_EXCEPTION);
+ mockCallableFactory.expectCreateThrowableStub(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, METHOD_EXCEPTION);
mockCallableFactory.createInvokableResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
@@ -216,7 +213,7 @@
}
public void testMatchManyAndThrow() throws Throwable {
- mockCallableFactory.expectCreateThrowableCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, METHOD_EXCEPTION);
+ mockCallableFactory.expectCreateThrowableStub(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, METHOD_EXCEPTION);
mockCallableFactory.createInvokableResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
|
|
From: Steve F. <sm...@us...> - 2003-10-02 23:27:35
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/support
In directory sc8-pr-cvs1:/tmp/cvs-serv24665/src/core/test/mockobjects/dynamic/support
Modified Files:
MockInvokableFactory.java
Log Message:
Simplified field for returning values from MockInvokableFactory
Index: MockInvokableFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/support/MockInvokableFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MockInvokableFactory.java 2 Oct 2003 23:21:30 -0000 1.2
+++ MockInvokableFactory.java 2 Oct 2003 23:27:30 -0000 1.3
@@ -16,10 +16,7 @@
implements InvokableFactory
{
public Invokable createCallExpectationResult;
- public Invokable createReturnCallableResult;
- public Invokable createThrowableCallableResult;
- public Invokable createVoidStubResult;
- public Invokable createVoidExpectationResult;
+ public Invokable createInvokableResult;
public ExpectationValue createCallExpectation = new ExpectationValue("createCallExpectation");
public ExpectationList parameters = new ExpectationList("parameters");
@@ -45,7 +42,7 @@
{
parameters.addActualMany(
new Object[] { "createReturnCallable", methodName, constraints, result });
- return createReturnCallableResult;
+ return createInvokableResult;
}
public void expectCreateThrowableCallable(
@@ -64,7 +61,7 @@
{
parameters.addActualMany(
new Object[] { "createThrowableCallable", methodName, constraints, throwable });
- return createThrowableCallableResult;
+ return createInvokableResult;
}
public void expectCreateVoidCallable(
@@ -81,7 +78,7 @@
{
parameters.addActualMany(
new Object[] { "createVoidStub", methodName, constraints });
- return createVoidStubResult;
+ return createInvokableResult;
}
public void expectCreateVoidExpectation(
@@ -95,7 +92,7 @@
public Invokable createVoidExpectation(String methodName, ConstraintMatcher constraints) {
parameters.addActualMany(
new Object[] { "createVoidExpectation", methodName, constraints });
- return createVoidExpectationResult;
+ return createInvokableResult;
}
|
|
From: Steve F. <sm...@us...> - 2003-10-02 23:27:35
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv24665/src/core/test/mockobjects/dynamic
Modified Files:
MockTest.java
Log Message:
Simplified field for returning values from MockInvokableFactory
Index: MockTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/MockTest.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- MockTest.java 2 Oct 2003 23:21:31 -0000 1.23
+++ MockTest.java 2 Oct 2003 23:27:30 -0000 1.24
@@ -33,7 +33,7 @@
}
public void testExpectManyAndVoid() throws Throwable {
- mockCallableFactory.createVoidExpectationResult = mockInvokable;
+ mockCallableFactory.createInvokableResult = mockInvokable;
mockCallableFactory.expectCreateVoidExpectation(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS);
mockDispatcher.addInvokable.setExpected(mockInvokable);
@@ -51,7 +51,7 @@
public void testExpectNoneAndReturn() throws Throwable {
mockCallableFactory.expectCreateReturnCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS, DummyInterface.METHOD_NOARG_RESULT);
- mockCallableFactory.createReturnCallableResult = mockInvokable;
+ mockCallableFactory.createInvokableResult = mockInvokable;
mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
mockDispatcher.addInvokable.setExpected(mockInvokable);
@@ -62,7 +62,7 @@
public void testExpectNoneAndThrow() throws Throwable {
mockCallableFactory.expectCreateThrowableCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS, METHOD_EXCEPTION);
- mockCallableFactory.createThrowableCallableResult = mockInvokable;
+ mockCallableFactory.createInvokableResult = mockInvokable;
mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
mockDispatcher.addInvokable.setExpected(mockInvokable);
@@ -73,7 +73,7 @@
public void testExpectOneAndThrow() throws Throwable {
mockCallableFactory.expectCreateThrowableCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, METHOD_EXCEPTION);
- mockCallableFactory.createThrowableCallableResult = mockInvokable;
+ mockCallableFactory.createInvokableResult = mockInvokable;
mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
mockDispatcher.addInvokable.setExpected(mockInvokable);
@@ -84,7 +84,7 @@
public void testExpectNoneAndVoid() throws Throwable {
mockCallableFactory.expectCreateVoidExpectation(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS);
- mockCallableFactory.createVoidExpectationResult = mockInvokable;
+ mockCallableFactory.createInvokableResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expect(DummyInterface.METHOD_NOARG_NAME);
@@ -94,7 +94,7 @@
public void testExpectOneAndVoid() throws Throwable {
mockCallableFactory.expectCreateVoidExpectation(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS);
- mockCallableFactory.createVoidExpectationResult = mockInvokable;
+ mockCallableFactory.createInvokableResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expect(DummyInterface.METHOD_ONEARG_NAME, DummyInterface.METHOD_ONEARG_ARGS[0]);
@@ -104,7 +104,7 @@
public void testExpectManyAndReturn() throws Throwable {
mockCallableFactory.expectCreateReturnCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, DummyInterface.METHOD_TWOARG_RESULT);
- mockCallableFactory.createReturnCallableResult = mockInvokable;
+ mockCallableFactory.createInvokableResult = mockInvokable;
mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
mockDispatcher.addInvokable.setExpected(mockInvokable);
@@ -115,7 +115,7 @@
public void testExpectManyAndThrow() throws Throwable {
mockCallableFactory.expectCreateThrowableCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, METHOD_EXCEPTION);
- mockCallableFactory.createThrowableCallableResult = mockInvokable;
+ mockCallableFactory.createInvokableResult = mockInvokable;
mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
mockDispatcher.addInvokable.setExpected(mockInvokable);
@@ -126,7 +126,7 @@
public void testExpectOneAndReturn() throws Throwable {
mockCallableFactory.expectCreateReturnCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, DummyInterface.METHOD_ONEARG_RESULT);
- mockCallableFactory.createReturnCallableResult = mockInvokable;
+ mockCallableFactory.createInvokableResult = mockInvokable;
mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
mockDispatcher.addInvokable.setExpected(mockInvokable);
@@ -137,7 +137,7 @@
public void testMatchNoneAndVoid() throws Throwable {
mockCallableFactory.expectCreateVoidCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS);
- mockCallableFactory.createVoidStubResult = mockInvokable;
+ mockCallableFactory.createInvokableResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.match(DummyInterface.METHOD_NOARG_NAME);
@@ -147,7 +147,7 @@
public void testMatchNoneAndReturn() throws Throwable {
mockCallableFactory.expectCreateReturnCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS, DummyInterface.METHOD_NOARG_RESULT);
- mockCallableFactory.createReturnCallableResult = mockInvokable;
+ mockCallableFactory.createInvokableResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.matchAndReturn(DummyInterface.METHOD_NOARG_NAME, DummyInterface.METHOD_NOARG_RESULT);
@@ -157,7 +157,7 @@
public void testMatchNoneAndThrow() throws Throwable {
mockCallableFactory.expectCreateThrowableCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS, METHOD_EXCEPTION);
- mockCallableFactory.createThrowableCallableResult = mockInvokable;
+ mockCallableFactory.createInvokableResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.matchAndThrow(DummyInterface.METHOD_NOARG_NAME, METHOD_EXCEPTION);
@@ -167,7 +167,7 @@
public void testMatchOneAndVoid() throws Throwable {
mockCallableFactory.expectCreateVoidCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS);
- mockCallableFactory.createVoidStubResult = mockInvokable;
+ mockCallableFactory.createInvokableResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.match(DummyInterface.METHOD_ONEARG_NAME, DummyInterface.METHOD_ONEARG_ARGS[0]);
@@ -177,7 +177,7 @@
public void testMatchOneAndReturn() throws Throwable {
mockCallableFactory.expectCreateReturnCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, DummyInterface.METHOD_ONEARG_RESULT);
- mockCallableFactory.createReturnCallableResult = mockInvokable;
+ mockCallableFactory.createInvokableResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.matchAndReturn(DummyInterface.METHOD_ONEARG_NAME, DummyInterface.METHOD_ONEARG_ARGS[0], DummyInterface.METHOD_ONEARG_RESULT);
@@ -187,7 +187,7 @@
public void testMatchOneAndThrow() throws Throwable {
mockCallableFactory.expectCreateThrowableCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, METHOD_EXCEPTION);
- mockCallableFactory.createThrowableCallableResult = mockInvokable;
+ mockCallableFactory.createInvokableResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.matchAndThrow(DummyInterface.METHOD_ONEARG_NAME, DummyInterface.METHOD_ONEARG_ARGS[0], METHOD_EXCEPTION);
@@ -197,7 +197,7 @@
public void testMatchManyAndVoid() throws Throwable {
mockCallableFactory.expectCreateVoidCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS);
- mockCallableFactory.createVoidStubResult = mockInvokable;
+ mockCallableFactory.createInvokableResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.match(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS);
@@ -207,7 +207,7 @@
public void testMatchManyAndReturn() throws Throwable {
mockCallableFactory.expectCreateReturnCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, DummyInterface.METHOD_TWOARG_RESULT);
- mockCallableFactory.createReturnCallableResult = mockInvokable;
+ mockCallableFactory.createInvokableResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.matchAndReturn(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, DummyInterface.METHOD_TWOARG_RESULT);
@@ -217,7 +217,7 @@
public void testMatchManyAndThrow() throws Throwable {
mockCallableFactory.expectCreateThrowableCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, METHOD_EXCEPTION);
- mockCallableFactory.createThrowableCallableResult = mockInvokable;
+ mockCallableFactory.createInvokableResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.matchAndThrow(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, METHOD_EXCEPTION);
@@ -227,7 +227,7 @@
public void testExpectWithConstraint() throws Throwable {
mockCallableFactory.expectCreateVoidExpectation(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS);
- mockCallableFactory.createVoidExpectationResult = mockInvokable;
+ mockCallableFactory.createInvokableResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expect(DummyInterface.METHOD_ONEARG_NAME, new IsEqual(DummyInterface.METHOD_ONEARG_ARGS[0]));
@@ -237,7 +237,7 @@
public void testExpectWithConstraintArray() throws Throwable {
mockCallableFactory.expectCreateVoidExpectation(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS);
- mockCallableFactory.createVoidExpectationResult = mockInvokable;
+ mockCallableFactory.createInvokableResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expect(DummyInterface.METHOD_ONEARG_NAME, new Constraint[] { new IsEqual(DummyInterface.METHOD_ONEARG_ARGS[0])});
|
|
From: Steve F. <sm...@us...> - 2003-10-02 23:21:36
|
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;
+ }
+
}
|
|
From: Steve F. <sm...@us...> - 2003-10-02 23:21:36
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv23613/src/core/test/mockobjects/dynamic
Modified Files:
MockTest.java
Log Message:
started wrapping Invokable creation to move towards new Invokable structure
Index: MockTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/MockTest.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- MockTest.java 1 Oct 2003 18:50:31 -0000 1.22
+++ MockTest.java 2 Oct 2003 23:21:31 -0000 1.23
@@ -33,11 +33,9 @@
}
public void testExpectManyAndVoid() throws Throwable {
- mockCallableFactory.createVoidCallableResult = mockInvokable;
+ mockCallableFactory.createVoidExpectationResult = mockInvokable;
- mockCallableFactory.expectCreateVoidCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS);
- mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
-
+ mockCallableFactory.expectCreateVoidExpectation(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS);
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expect(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS);
@@ -85,9 +83,8 @@
}
public void testExpectNoneAndVoid() throws Throwable {
- mockCallableFactory.expectCreateVoidCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS);
- mockCallableFactory.createVoidCallableResult = mockInvokable;
- mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
+ mockCallableFactory.expectCreateVoidExpectation(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS);
+ mockCallableFactory.createVoidExpectationResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expect(DummyInterface.METHOD_NOARG_NAME);
@@ -96,9 +93,8 @@
}
public void testExpectOneAndVoid() throws Throwable {
- mockCallableFactory.expectCreateVoidCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS);
- mockCallableFactory.createVoidCallableResult = mockInvokable;
- mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
+ mockCallableFactory.expectCreateVoidExpectation(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS);
+ mockCallableFactory.createVoidExpectationResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expect(DummyInterface.METHOD_ONEARG_NAME, DummyInterface.METHOD_ONEARG_ARGS[0]);
@@ -141,7 +137,7 @@
public void testMatchNoneAndVoid() throws Throwable {
mockCallableFactory.expectCreateVoidCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS);
- mockCallableFactory.createVoidCallableResult = mockInvokable;
+ mockCallableFactory.createVoidStubResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.match(DummyInterface.METHOD_NOARG_NAME);
@@ -171,7 +167,7 @@
public void testMatchOneAndVoid() throws Throwable {
mockCallableFactory.expectCreateVoidCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS);
- mockCallableFactory.createVoidCallableResult = mockInvokable;
+ mockCallableFactory.createVoidStubResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.match(DummyInterface.METHOD_ONEARG_NAME, DummyInterface.METHOD_ONEARG_ARGS[0]);
@@ -201,7 +197,7 @@
public void testMatchManyAndVoid() throws Throwable {
mockCallableFactory.expectCreateVoidCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS);
- mockCallableFactory.createVoidCallableResult = mockInvokable;
+ mockCallableFactory.createVoidStubResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.match(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS);
@@ -230,9 +226,8 @@
}
public void testExpectWithConstraint() throws Throwable {
- mockCallableFactory.expectCreateVoidCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS);
- mockCallableFactory.createVoidCallableResult = mockInvokable;
- mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
+ mockCallableFactory.expectCreateVoidExpectation(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS);
+ mockCallableFactory.createVoidExpectationResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expect(DummyInterface.METHOD_ONEARG_NAME, new IsEqual(DummyInterface.METHOD_ONEARG_ARGS[0]));
@@ -241,9 +236,8 @@
}
public void testExpectWithConstraintArray() throws Throwable {
- mockCallableFactory.expectCreateVoidCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS);
- mockCallableFactory.createVoidCallableResult = mockInvokable;
- mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
+ mockCallableFactory.expectCreateVoidExpectation(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS);
+ mockCallableFactory.createVoidExpectationResult = mockInvokable;
mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expect(DummyInterface.METHOD_ONEARG_NAME, new Constraint[] { new IsEqual(DummyInterface.METHOD_ONEARG_ARGS[0])});
|
|
From: Steve F. <sm...@us...> - 2003-10-02 23:21:36
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv23613/src/core/com/mockobjects/dynamic
Modified Files:
Mock.java InvokableFactory.java DefaultInvokableFactory.java
Log Message:
started wrapping Invokable creation to move towards new Invokable structure
Index: Mock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Mock.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Mock.java 2 Oct 2003 22:55:32 -0000 1.37
+++ Mock.java 2 Oct 2003 23:21:31 -0000 1.38
@@ -38,7 +38,7 @@
}
public void expect(String methodName, ConstraintMatcher args) {
- coreMock.add(callableFactory.createCallExpectation(callableFactory.createVoidCallable(methodName, args)));
+ coreMock.add(callableFactory.createVoidExpectation(methodName, args));
}
public void expectAndReturn(String methodName, ConstraintMatcher args, Object result) {
@@ -50,7 +50,7 @@
}
public void match(String methodName, ConstraintMatcher args) {
- coreMock.add(callableFactory.createVoidCallable(methodName, args));
+ coreMock.add(callableFactory.createVoidStub(methodName, args));
}
public void matchAndReturn(String methodName, ConstraintMatcher args, Object result) {
Index: InvokableFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/InvokableFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InvokableFactory.java 11 Sep 2003 21:39:01 -0000 1.1
+++ InvokableFactory.java 2 Oct 2003 23:21:31 -0000 1.2
@@ -5,5 +5,6 @@
Invokable createReturnCallable( String methodName, ConstraintMatcher constraints, Object result );
Invokable createThrowableCallable( String methodName, ConstraintMatcher constraints, Throwable throwable);
- Invokable createVoidCallable( String methodName, ConstraintMatcher constraints);
+ Invokable createVoidStub ( String methodName, ConstraintMatcher constraints);
+ Invokable createVoidExpectation ( String methodName, ConstraintMatcher constraints);
}
Index: DefaultInvokableFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/DefaultInvokableFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultInvokableFactory.java 11 Sep 2003 21:39:01 -0000 1.1
+++ DefaultInvokableFactory.java 2 Oct 2003 23:21:31 -0000 1.2
@@ -14,8 +14,12 @@
return createCallSignature(methodName, constraints, createThrowStub(throwable));
}
- public Invokable createVoidCallable(String methodName, ConstraintMatcher constraints) {
- return createCallSignature(methodName, constraints, createVoidStub());
+ public Invokable createVoidStub(String methodName, ConstraintMatcher constraints) {
+ return createCallSignature(methodName, constraints, new VoidStub());
+ }
+
+ public Invokable createVoidExpectation(String methodName, ConstraintMatcher constraints) {
+ return createCallExpectation(createCallSignature(methodName, constraints, new VoidStub()));
}
private Invokable createCallSignature(String methodName, ConstraintMatcher constraints, Invokable callable) {
@@ -28,10 +32,6 @@
private Invokable createThrowStub( Throwable exception ) {
return new ThrowStub(exception);
- }
-
- private Invokable createVoidStub() {
- return new VoidStub();
}
}
|
|
From: Steve F. <sm...@us...> - 2003-10-02 22:55:40
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv19557/src/core/com/mockobjects/dynamic
Modified Files:
CoreMock.java Mock.java DynamicMock.java Stub.java
Log Message:
renamed DynamicMock.expect() to add().
Index: CoreMock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/CoreMock.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CoreMock.java 1 Oct 2003 20:21:59 -0000 1.11
+++ CoreMock.java 2 Oct 2003 22:55:32 -0000 1.12
@@ -56,7 +56,7 @@
return this.name;
}
- public void expect(Invokable invocationMatcher) {
+ public void add(Invokable invocationMatcher) {
invocationDispatcher.add(invocationMatcher);
}
Index: Mock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Mock.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Mock.java 1 Oct 2003 20:21:59 -0000 1.36
+++ Mock.java 2 Oct 2003 22:55:32 -0000 1.37
@@ -38,27 +38,27 @@
}
public void expect(String methodName, ConstraintMatcher args) {
- coreMock.expect(callableFactory.createCallExpectation(callableFactory.createVoidCallable(methodName, args)));
+ coreMock.add(callableFactory.createCallExpectation(callableFactory.createVoidCallable(methodName, args)));
}
public void expectAndReturn(String methodName, ConstraintMatcher args, Object result) {
- coreMock.expect(callableFactory.createCallExpectation(callableFactory.createReturnCallable(methodName, args, result)));
+ coreMock.add(callableFactory.createCallExpectation(callableFactory.createReturnCallable(methodName, args, result)));
}
public void expectAndThrow(String methodName, ConstraintMatcher args, Throwable throwable) {
- coreMock.expect(callableFactory.createCallExpectation(callableFactory.createThrowableCallable(methodName, args, throwable)));
+ coreMock.add(callableFactory.createCallExpectation(callableFactory.createThrowableCallable(methodName, args, throwable)));
}
public void match(String methodName, ConstraintMatcher args) {
- coreMock.expect(callableFactory.createVoidCallable(methodName, args));
+ coreMock.add(callableFactory.createVoidCallable(methodName, args));
}
public void matchAndReturn(String methodName, ConstraintMatcher args, Object result) {
- coreMock.expect(callableFactory.createReturnCallable(methodName, args, result));
+ coreMock.add(callableFactory.createReturnCallable(methodName, args, result));
}
public void matchAndThrow(String methodName, ConstraintMatcher args, Throwable throwable) {
- coreMock.expect(callableFactory.createThrowableCallable(methodName, args, throwable));
+ coreMock.add(callableFactory.createThrowableCallable(methodName, args, throwable));
}
/*
Index: DynamicMock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/DynamicMock.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DynamicMock.java 1 Oct 2003 20:21:59 -0000 1.4
+++ DynamicMock.java 2 Oct 2003 22:55:32 -0000 1.5
@@ -7,7 +7,7 @@
public interface DynamicMock
extends Verifiable, InvocationHandler
{
- void expect(Invokable invokable);
+ void add(Invokable invokable);
Object proxy();
Index: Stub.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Stub.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Stub.java 20 Aug 2003 21:47:58 -0000 1.2
+++ Stub.java 2 Oct 2003 22:55:32 -0000 1.3
@@ -7,8 +7,6 @@
/**
* An object that stubs the behaviour of a method invocation on behalf of an
* {@link Invokable} object.
- *
- * @author montagu
*/
public interface Stub
{
|
|
From: Steve F. <sm...@us...> - 2003-10-02 22:55:40
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv19557/src/core/test/mockobjects/dynamic
Modified Files:
CoreMockTest.java
Log Message:
renamed DynamicMock.expect() to add().
Index: CoreMockTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/CoreMockTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CoreMockTest.java 1 Oct 2003 18:50:31 -0000 1.8
+++ CoreMockTest.java 2 Oct 2003 22:55:32 -0000 1.9
@@ -135,7 +135,7 @@
public void testAddAnInvokable() {
mockDispatcher.addInvokable.setExpected(mockInvokable);
- coreMock.expect(mockInvokable);
+ coreMock.add(mockInvokable);
mockDispatcher.verifyExpectations();
}
|
|
From: Steve F. <sm...@us...> - 2003-10-01 20:22:03
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv3112/src/core/com/mockobjects/dynamic
Modified Files:
CoreMock.java Mock.java DynamicMock.java
Log Message:
removed stub() from DynamicMock
Index: CoreMock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/CoreMock.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CoreMock.java 11 Sep 2003 21:39:01 -0000 1.10
+++ CoreMock.java 1 Oct 2003 20:21:59 -0000 1.11
@@ -60,10 +60,6 @@
invocationDispatcher.add(invocationMatcher);
}
- public void stub(Invokable invocationMatcher) {
- invocationDispatcher.add(invocationMatcher);
- }
-
public void reset() {
invocationDispatcher.clear();
}
Index: Mock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Mock.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Mock.java 1 Oct 2003 19:02:54 -0000 1.35
+++ Mock.java 1 Oct 2003 20:21:59 -0000 1.36
@@ -50,15 +50,15 @@
}
public void match(String methodName, ConstraintMatcher args) {
- coreMock.stub(callableFactory.createVoidCallable(methodName, args));
+ coreMock.expect(callableFactory.createVoidCallable(methodName, args));
}
public void matchAndReturn(String methodName, ConstraintMatcher args, Object result) {
- coreMock.stub(callableFactory.createReturnCallable(methodName, args, result));
+ coreMock.expect(callableFactory.createReturnCallable(methodName, args, result));
}
public void matchAndThrow(String methodName, ConstraintMatcher args, Throwable throwable) {
- coreMock.stub(callableFactory.createThrowableCallable(methodName, args, throwable));
+ coreMock.expect(callableFactory.createThrowableCallable(methodName, args, throwable));
}
/*
Index: DynamicMock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/DynamicMock.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DynamicMock.java 20 Aug 2003 21:51:27 -0000 1.3
+++ DynamicMock.java 1 Oct 2003 20:21:59 -0000 1.4
@@ -8,7 +8,6 @@
extends Verifiable, InvocationHandler
{
void expect(Invokable invokable);
- void stub(Invokable invokable);
Object proxy();
|
|
From: Steve F. <sm...@us...> - 2003-10-01 20:21:46
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/functional/test/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv3058/src/core/functional/test/mockobjects/dynamic
Modified Files:
DynamicMockExample.java
Log Message:
added another example
Index: DynamicMockExample.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/functional/test/mockobjects/dynamic/DynamicMockExample.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DynamicMockExample.java 1 Oct 2003 15:59:50 -0000 1.1
+++ DynamicMockExample.java 1 Oct 2003 20:21:42 -0000 1.2
@@ -24,6 +24,8 @@
Agent agent = new Agent((Market)mockMarket.proxy());
//
//
+// mockMarket.method("buyStock", "MSFT", new Integer(10)).void();
+//
// mockMarket.method("buyStock", "MSFT", new Integer(10)).returns(true)
// .expectOnce();
// //.expectNever();
|
|
From: Steve F. <sm...@us...> - 2003-10-01 19:02:57
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic In directory sc8-pr-cvs1:/tmp/cvs-serv18664/src/core/test/mockobjects/dynamic Removed Files: CallableArrayListTest.java CallSequenceTest.java Log Message: Removed unused classes. Cleaned up imports in Mock --- CallableArrayListTest.java DELETED --- --- CallSequenceTest.java DELETED --- |
|
From: Steve F. <sm...@us...> - 2003-10-01 19:02:57
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv18664/src/core/com/mockobjects/dynamic
Modified Files:
Mock.java
Removed Files:
AbstractCallableCollection.java CallableList.java
CallableCollection.java CallableArrayList.java
CallSequence.java
Log Message:
Removed unused classes. Cleaned up imports in Mock
Index: Mock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Mock.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Mock.java 11 Sep 2003 21:39:01 -0000 1.34
+++ Mock.java 1 Oct 2003 19:02:54 -0000 1.35
@@ -1,7 +1,5 @@
package com.mockobjects.dynamic;
-import junit.framework.AssertionFailedError;
-
import com.mockobjects.Verifiable;
import com.mockobjects.constraint.Constraint;
@@ -185,24 +183,6 @@
public void matchAndThrow(String methodName, int singleEqualArg, Throwable throwable) {
matchAndThrow(methodName,new Integer(singleEqualArg), throwable);
- }
-
- /** @deprecated @see OrderedMock
- */
- public void expect(String methodName, CallSequence deprecated) {
- throw new AssertionFailedError("method is deprecated! Use: new OrderedMock() instead...");
- }
-
- /** @deprecated @see OrderedMock
- */
- public void expectAndReturn(String methodName, CallSequence deprecated, Object result) {
- throw new AssertionFailedError("method is deprecated! Use: new OrderedMock() instead...");
- }
-
- /** @deprecated @see OrderedMock
- */
- public void expectAndThrow(String methodName, CallSequence deprecated, Throwable throwable) {
- throw new AssertionFailedError("method is deprecated! Use: new OrderedMock() instead...");
}
/** @deprecated @see expect
--- AbstractCallableCollection.java DELETED ---
--- CallableList.java DELETED ---
--- CallableCollection.java DELETED ---
--- CallableArrayList.java DELETED ---
--- CallSequence.java DELETED ---
|
|
From: Steve F. <sm...@us...> - 2003-10-01 18:50:49
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv15824/src/core/test/mockobjects/dynamic
Modified Files:
MockTest.java CoreMockTest.java
Removed Files:
InvocationDispatcherTest.java CallBagTest.java
Log Message:
Tidied up after integrating different session with Nat and Tim
Index: MockTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/MockTest.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- MockTest.java 1 Oct 2003 16:05:12 -0000 1.21
+++ MockTest.java 1 Oct 2003 18:50:31 -0000 1.22
@@ -5,10 +5,9 @@
import com.mockobjects.constraint.Constraint;
import com.mockobjects.constraint.IsEqual;
-import com.mockobjects.dynamic.*;
-import com.mockobjects.util.*;
-
-import junit.framework.*;
+import com.mockobjects.dynamic.C;
+import com.mockobjects.dynamic.ConstraintMatcher;
+import com.mockobjects.dynamic.Mock;
public class MockTest extends TestCase {
@@ -18,11 +17,10 @@
final ConstraintMatcher METHOD_ONEARG_CONSTRAINTS = C.args(C.eq("oneP1"));
final ConstraintMatcher METHOD_TWOARG_CONSTRAINTS = C.args(C.eq("twoP1"), C.eq("twoP2"));
- private MockCallableFactory mockCallableFactory = new MockCallableFactory();
- private MockCallableCollection mockCallables = new MockCallableCollection();
- private MockCallable mockCall = new MockCallable("call match");
+ private MockInvokableFactory mockCallableFactory = new MockInvokableFactory();
+ private MockInvocationDispatcher mockDispatcher = new MockInvocationDispatcher();
+ private MockInvokable mockInvokable = new MockInvokable();
- private DummyInterface proxy;
private Mock mock;
public MockTest(String name) throws Exception {
@@ -30,220 +28,227 @@
}
public void setUp() {
- mock = new Mock(mockCallableFactory, mockCallables, DummyInterface.class, MOCK_NAME);
- proxy = (DummyInterface)mock.proxy();
- mockCallableFactory.setupCreateCallExpectation(mockCall);
+ mock = new Mock(mockCallableFactory, mockDispatcher, DummyInterface.class, MOCK_NAME);
+ mockCallableFactory.createCallExpectationResult = mockInvokable;
}
public void testExpectManyAndVoid() throws Throwable {
- mockCallableFactory.addExpectedCreateVoidCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS);
- mockCallableFactory.setupCreateVoidCallable(mockCall);
- mockCallableFactory.addExpectedCreateCallExpectation(mockCall);
- mockCallables.addExpectedExpect(mockCall);
+ mockCallableFactory.createVoidCallableResult = mockInvokable;
+
+ mockCallableFactory.expectCreateVoidCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS);
+ mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
+
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expect(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS);
- Verifier.verifyObject(this);
+ verifyThis();
}
- public void testExpectNoneAndReturn() throws Throwable {
- mockCallableFactory.addExpectedCreateReturnCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS, DummyInterface.METHOD_NOARG_RESULT);
- mockCallableFactory.setupCreateReturnCallable(mockCall);
- mockCallableFactory.addExpectedCreateCallExpectation(mockCall);
- mockCallables.addExpectedExpect(mockCall);
+ private void verifyThis() {
+ mockCallableFactory.verify();
+ mockDispatcher.verifyExpectations();
+ mockInvokable.verifyExpectations();
+ }
+
+ public void testExpectNoneAndReturn() throws Throwable {
+ mockCallableFactory.expectCreateReturnCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS, DummyInterface.METHOD_NOARG_RESULT);
+ mockCallableFactory.createReturnCallableResult = mockInvokable;
+ mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expectAndReturn(DummyInterface.METHOD_NOARG_NAME, DummyInterface.METHOD_NOARG_RESULT);
- Verifier.verifyObject(this);
+ verifyThis();
}
public void testExpectNoneAndThrow() throws Throwable {
- mockCallableFactory.addExpectedCreateThrowableCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS, METHOD_EXCEPTION);
- mockCallableFactory.setupCreateThrowableCallable(mockCall);
- mockCallableFactory.addExpectedCreateCallExpectation(mockCall);
- mockCallables.addExpectedExpect(mockCall);
+ mockCallableFactory.expectCreateThrowableCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS, METHOD_EXCEPTION);
+ mockCallableFactory.createThrowableCallableResult = mockInvokable;
+ mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expectAndThrow(DummyInterface.METHOD_NOARG_NAME, METHOD_EXCEPTION);
- Verifier.verifyObject(this);
+ verifyThis();
}
public void testExpectOneAndThrow() throws Throwable {
- mockCallableFactory.addExpectedCreateThrowableCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, METHOD_EXCEPTION);
- mockCallableFactory.setupCreateThrowableCallable(mockCall);
- mockCallableFactory.addExpectedCreateCallExpectation(mockCall);
- mockCallables.addExpectedExpect(mockCall);
+ mockCallableFactory.expectCreateThrowableCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, METHOD_EXCEPTION);
+ mockCallableFactory.createThrowableCallableResult = mockInvokable;
+ mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expectAndThrow(DummyInterface.METHOD_ONEARG_NAME, DummyInterface.METHOD_ONEARG_ARGS[0], METHOD_EXCEPTION);
- Verifier.verifyObject(this);
+ verifyThis();
}
public void testExpectNoneAndVoid() throws Throwable {
- mockCallableFactory.addExpectedCreateVoidCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS);
- mockCallableFactory.setupCreateVoidCallable(mockCall);
- mockCallableFactory.addExpectedCreateCallExpectation(mockCall);
- mockCallables.addExpectedExpect(mockCall);
+ mockCallableFactory.expectCreateVoidCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS);
+ mockCallableFactory.createVoidCallableResult = mockInvokable;
+ mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expect(DummyInterface.METHOD_NOARG_NAME);
- Verifier.verifyObject(this);
+ verifyThis();
}
public void testExpectOneAndVoid() throws Throwable {
- mockCallableFactory.addExpectedCreateVoidCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS);
- mockCallableFactory.setupCreateVoidCallable(mockCall);
- mockCallableFactory.addExpectedCreateCallExpectation(mockCall);
- mockCallables.addExpectedExpect(mockCall);
+ mockCallableFactory.expectCreateVoidCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS);
+ mockCallableFactory.createVoidCallableResult = mockInvokable;
+ mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expect(DummyInterface.METHOD_ONEARG_NAME, DummyInterface.METHOD_ONEARG_ARGS[0]);
- Verifier.verifyObject(this);
+ verifyThis();
}
public void testExpectManyAndReturn() throws Throwable {
- mockCallableFactory.addExpectedCreateReturnCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, DummyInterface.METHOD_TWOARG_RESULT);
- mockCallableFactory.setupCreateReturnCallable(mockCall);
- mockCallableFactory.addExpectedCreateCallExpectation(mockCall);
- mockCallables.addExpectedExpect(mockCall);
+ mockCallableFactory.expectCreateReturnCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, DummyInterface.METHOD_TWOARG_RESULT);
+ mockCallableFactory.createReturnCallableResult = mockInvokable;
+ mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expectAndReturn(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, DummyInterface.METHOD_TWOARG_RESULT);
- Verifier.verifyObject(this);
+ verifyThis();
}
public void testExpectManyAndThrow() throws Throwable {
- mockCallableFactory.addExpectedCreateThrowableCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, METHOD_EXCEPTION);
- mockCallableFactory.setupCreateThrowableCallable(mockCall);
- mockCallableFactory.addExpectedCreateCallExpectation(mockCall);
- mockCallables.addExpectedExpect(mockCall);
+ mockCallableFactory.expectCreateThrowableCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, METHOD_EXCEPTION);
+ mockCallableFactory.createThrowableCallableResult = mockInvokable;
+ mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expectAndThrow(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, METHOD_EXCEPTION);
- Verifier.verifyObject(this);
+ verifyThis();
}
public void testExpectOneAndReturn() throws Throwable {
- mockCallableFactory.addExpectedCreateReturnCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, DummyInterface.METHOD_ONEARG_RESULT);
- mockCallableFactory.setupCreateReturnCallable(mockCall);
- mockCallableFactory.addExpectedCreateCallExpectation(mockCall);
- mockCallables.addExpectedExpect(mockCall);
+ mockCallableFactory.expectCreateReturnCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, DummyInterface.METHOD_ONEARG_RESULT);
+ mockCallableFactory.createReturnCallableResult = mockInvokable;
+ mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expectAndReturn(DummyInterface.METHOD_ONEARG_NAME, DummyInterface.METHOD_ONEARG_ARGS[0], DummyInterface.METHOD_ONEARG_RESULT);
- Verifier.verifyObject(this);
+ verifyThis();
}
public void testMatchNoneAndVoid() throws Throwable {
- mockCallableFactory.addExpectedCreateVoidCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS);
- mockCallableFactory.setupCreateVoidCallable(mockCall);
- mockCallables.addExpectedMatch(mockCall);
+ mockCallableFactory.expectCreateVoidCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS);
+ mockCallableFactory.createVoidCallableResult = mockInvokable;
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.match(DummyInterface.METHOD_NOARG_NAME);
- Verifier.verifyObject(this);
+ verifyThis();
}
public void testMatchNoneAndReturn() throws Throwable {
- mockCallableFactory.addExpectedCreateReturnCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS, DummyInterface.METHOD_NOARG_RESULT);
- mockCallableFactory.setupCreateReturnCallable(mockCall);
- mockCallables.addExpectedMatch(mockCall);
+ mockCallableFactory.expectCreateReturnCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS, DummyInterface.METHOD_NOARG_RESULT);
+ mockCallableFactory.createReturnCallableResult = mockInvokable;
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.matchAndReturn(DummyInterface.METHOD_NOARG_NAME, DummyInterface.METHOD_NOARG_RESULT);
- Verifier.verifyObject(this);
+ verifyThis();
}
public void testMatchNoneAndThrow() throws Throwable {
- mockCallableFactory.addExpectedCreateThrowableCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS, METHOD_EXCEPTION);
- mockCallableFactory.setupCreateThrowableCallable(mockCall);
- mockCallables.addExpectedMatch(mockCall);
+ mockCallableFactory.expectCreateThrowableCallable(DummyInterface.METHOD_NOARG_NAME, C.NO_ARGS, METHOD_EXCEPTION);
+ mockCallableFactory.createThrowableCallableResult = mockInvokable;
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.matchAndThrow(DummyInterface.METHOD_NOARG_NAME, METHOD_EXCEPTION);
- Verifier.verifyObject(this);
+ verifyThis();
}
public void testMatchOneAndVoid() throws Throwable {
- mockCallableFactory.addExpectedCreateVoidCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS);
- mockCallableFactory.setupCreateVoidCallable(mockCall);
- mockCallables.addExpectedMatch(mockCall);
+ mockCallableFactory.expectCreateVoidCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS);
+ mockCallableFactory.createVoidCallableResult = mockInvokable;
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.match(DummyInterface.METHOD_ONEARG_NAME, DummyInterface.METHOD_ONEARG_ARGS[0]);
- Verifier.verifyObject(this);
+ verifyThis();
}
public void testMatchOneAndReturn() throws Throwable {
- mockCallableFactory.addExpectedCreateReturnCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, DummyInterface.METHOD_ONEARG_RESULT);
- mockCallableFactory.setupCreateReturnCallable(mockCall);
- mockCallables.addExpectedMatch(mockCall);
+ mockCallableFactory.expectCreateReturnCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, DummyInterface.METHOD_ONEARG_RESULT);
+ mockCallableFactory.createReturnCallableResult = mockInvokable;
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.matchAndReturn(DummyInterface.METHOD_ONEARG_NAME, DummyInterface.METHOD_ONEARG_ARGS[0], DummyInterface.METHOD_ONEARG_RESULT);
- Verifier.verifyObject(this);
+ verifyThis();
}
public void testMatchOneAndThrow() throws Throwable {
- mockCallableFactory.addExpectedCreateThrowableCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, METHOD_EXCEPTION);
- mockCallableFactory.setupCreateThrowableCallable(mockCall);
- mockCallables.addExpectedMatch(mockCall);
+ mockCallableFactory.expectCreateThrowableCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS, METHOD_EXCEPTION);
+ mockCallableFactory.createThrowableCallableResult = mockInvokable;
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.matchAndThrow(DummyInterface.METHOD_ONEARG_NAME, DummyInterface.METHOD_ONEARG_ARGS[0], METHOD_EXCEPTION);
- Verifier.verifyObject(this);
+ verifyThis();
}
public void testMatchManyAndVoid() throws Throwable {
- mockCallableFactory.addExpectedCreateVoidCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS);
- mockCallableFactory.setupCreateVoidCallable(mockCall);
- mockCallables.addExpectedMatch(mockCall);
+ mockCallableFactory.expectCreateVoidCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS);
+ mockCallableFactory.createVoidCallableResult = mockInvokable;
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.match(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS);
- Verifier.verifyObject(this);
+ verifyThis();
}
public void testMatchManyAndReturn() throws Throwable {
- mockCallableFactory.addExpectedCreateReturnCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, DummyInterface.METHOD_TWOARG_RESULT);
- mockCallableFactory.setupCreateReturnCallable(mockCall);
- mockCallables.addExpectedMatch(mockCall);
+ mockCallableFactory.expectCreateReturnCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, DummyInterface.METHOD_TWOARG_RESULT);
+ mockCallableFactory.createReturnCallableResult = mockInvokable;
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.matchAndReturn(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, DummyInterface.METHOD_TWOARG_RESULT);
- Verifier.verifyObject(this);
+ verifyThis();
}
public void testMatchManyAndThrow() throws Throwable {
- mockCallableFactory.addExpectedCreateThrowableCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, METHOD_EXCEPTION);
- mockCallableFactory.setupCreateThrowableCallable(mockCall);
- mockCallables.addExpectedMatch(mockCall);
+ mockCallableFactory.expectCreateThrowableCallable(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, METHOD_EXCEPTION);
+ mockCallableFactory.createThrowableCallableResult = mockInvokable;
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.matchAndThrow(DummyInterface.METHOD_TWOARG_NAME, METHOD_TWOARG_CONSTRAINTS, METHOD_EXCEPTION);
- Verifier.verifyObject(this);
+ verifyThis();
}
public void testExpectWithConstraint() throws Throwable {
- mockCallableFactory.addExpectedCreateVoidCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS);
- mockCallableFactory.setupCreateVoidCallable(mockCall);
- mockCallableFactory.addExpectedCreateCallExpectation(mockCall);
- mockCallables.addExpectedExpect(mockCall);
+ mockCallableFactory.expectCreateVoidCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS);
+ mockCallableFactory.createVoidCallableResult = mockInvokable;
+ mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expect(DummyInterface.METHOD_ONEARG_NAME, new IsEqual(DummyInterface.METHOD_ONEARG_ARGS[0]));
- Verifier.verifyObject(this);
+ verifyThis();
}
public void testExpectWithConstraintArray() throws Throwable {
- mockCallableFactory.addExpectedCreateVoidCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS);
- mockCallableFactory.setupCreateVoidCallable(mockCall);
- mockCallableFactory.addExpectedCreateCallExpectation(mockCall);
- mockCallables.addExpectedExpect(mockCall);
+ mockCallableFactory.expectCreateVoidCallable(DummyInterface.METHOD_ONEARG_NAME, METHOD_ONEARG_CONSTRAINTS);
+ mockCallableFactory.createVoidCallableResult = mockInvokable;
+ mockCallableFactory.createCallExpectation.setExpected(mockInvokable);
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
mock.expect(DummyInterface.METHOD_ONEARG_NAME, new Constraint[] { new IsEqual(DummyInterface.METHOD_ONEARG_ARGS[0])});
- Verifier.verifyObject(this);
- mockCallables.verifyExpectations();
+ verifyThis();
+ mockDispatcher.verifyExpectations();
}
}
Index: CoreMockTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/CoreMockTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CoreMockTest.java 1 Oct 2003 16:04:19 -0000 1.7
+++ CoreMockTest.java 1 Oct 2003 18:50:31 -0000 1.8
@@ -4,18 +4,13 @@
package test.mockobjects.dynamic;
import test.mockobjects.dynamic.support.*;
-
-import test.mockobjects.dynamic.support.*;
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
import com.mockobjects.dynamic.CoreMock;
import com.mockobjects.dynamic.DynamicUtil;
+import com.mockobjects.dynamic.Invocation;
import com.mockobjects.util.AssertMo;
-import com.mockobjects.util.Verifier;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
public class CoreMockTest extends TestCase {
@@ -23,15 +18,15 @@
private DummyInterface proxy;
private CoreMock coreMock;
- private MockCallableCollection mockCallables = new MockCallableCollection();
- private MockCallable mockCallable = new MockCallable("coreMock mockCallable");
+ private MockInvocationDispatcher mockDispatcher = new MockInvocationDispatcher();
+ private MockInvokable mockInvokable = new MockInvokable();
public CoreMockTest(String name) {
super(name);
}
public void setUp() {
- coreMock = new CoreMock(DummyInterface.class, MOCK_NAME, mockCallables);
+ coreMock = new CoreMock(DummyInterface.class, MOCK_NAME, mockDispatcher);
try {
proxy = (DummyInterface)coreMock.proxy();
@@ -45,7 +40,7 @@
final String originalMessage = "original message";
Object arg = new AssertionFailedError(originalMessage);
- mockCallables.callResult = arg;
+ mockDispatcher.dispatchResult = arg;
try {
proxy.noArgVoidMethod();
@@ -58,36 +53,15 @@
public void testProxyReturnsConfiguredResult() throws Throwable {
final String RESULT = "configured result";
- mockCallables.callResult = RESULT;
+ mockDispatcher.dispatchResult = RESULT;
assertSame("result is returned by coreMock", RESULT, proxy.oneArgMethod("arg"));
}
- public void testProxySendsAllArgument() throws Throwable {
- mockCallables.addExpectedCall(DummyInterface.METHOD_TWOARG_NAME, DummyInterface.METHOD_TWOARG_ARGS);
-
- proxy.twoArgMethod(DummyInterface.METHOD_TWOARG_ARGS[0], DummyInterface.METHOD_TWOARG_ARGS[1]);
-
- // Can't use Verifier as we are verifying "verify"
- mockCallables.verifyExpectations();
- }
-
- public void testProxySendsEmptyArrayWhenNoArguments() throws Throwable {
- mockCallables.callResult = "result ignored";
-
- mockCallables.addExpectedCall(DummyInterface.METHOD_NOARGVOID_NAME, DummyInterface.METHOD_NOARGVOID_ARGS);
-
- proxy.noArgVoidMethod();
-
- Verifier.verifyObject(this);
- // Can't use Verifier as we are verifying "verify"
- mockCallables.verifyExpectations();
- }
-
public void testExceptionsPropagatedThroughProxy() throws Throwable {
final Throwable throwable = new DummyThrowable();
- mockCallables.callException = throwable;
+ mockDispatcher.dispatchThrowable = throwable;
try {
proxy.noArgVoidMethod();
@@ -99,49 +73,50 @@
}
public void testMockVerifies() throws Exception {
- mockCallables.setExpectedVerifyCalls(1);
+ mockDispatcher.verifyCalls.setExpected(1);
coreMock.verify();
// Can't use Verifier as we are verifying "verify"
- mockCallables.verifyExpectations();
+ mockDispatcher.verifyExpectations();
}
public void testProxyEquality() throws Exception {
- mockCallables.callResult = new Boolean(false);
+ mockDispatcher.dispatchResult = new Boolean(false);
- mockCallables.setExpectedCallCalls(0);
+ mockDispatcher.dispatchInvocation.setExpectNothing();
assertTrue("Proxy equality is implemented directly", proxy.equals(proxy));
-
- Verifier.verifyObject(this);
+ mockDispatcher.verifyExpectations();
}
public void testProxyInequality() throws Exception {
- mockCallables.callResult = new Boolean(false);
+ mockDispatcher.dispatchResult = new Boolean(false);
- mockCallables.addExpectedCall("equals", new Object[] {"not a proxy"});
+ mockDispatcher.dispatchInvocation.setExpected(
+ new Invocation("equals", new Class[] { Object.class }, boolean.class,
+ new Object[] { "not a proxy" }));
assertFalse("Should handle proxy inequality by calling through", proxy.equals("not a proxy"));
-
- Verifier.verifyObject(this);
+ mockDispatcher.verifyExpectations();
}
public void testProxyEqualityWithNull() throws Exception {
- mockCallables.callResult = new Boolean(true);
- mockCallables.addExpectedCall("equals", new Object[] {null});
+ mockDispatcher.dispatchResult = new Boolean(true);
+ mockDispatcher.dispatchInvocation.setExpected(
+ new Invocation("equals", new Class[] { Object.class }, boolean.class,
+ new Object[] { null }));
assertTrue("Proxy should handle null equality", proxy.equals(null));
-
- Verifier.verifyObject(this);
+ mockDispatcher.verifyExpectations();
}
public void testCallingGetMockNameOnProxyReturnsNameOfUnderlyingMock() {
- mockCallables.setExpectedCallCalls(0);
+ mockDispatcher.dispatchInvocation.setExpectNothing();
assertEquals("proxy.getMockName() returns name of underlying mock", MOCK_NAME, proxy.getMockName());
- Verifier.verifyObject(this);
+ mockDispatcher.verifyExpectations();
}
public void testGeneratesMockNameFromInterfaceNameIfNoNameSpecified() throws Exception {
@@ -157,40 +132,33 @@
coreMock.verify(); // should not fail on a proxyToString call
}
- public void testAddAnExpectation() {
- mockCallables.addExpectedExpect(mockCallable);
+ public void testAddAnInvokable() {
+ mockDispatcher.addInvokable.setExpected(mockInvokable);
- coreMock.expect(mockCallable);
+ coreMock.expect(mockInvokable);
- mockCallables.verifyExpectations();
+ mockDispatcher.verifyExpectations();
}
- public void testAddAStub() {
- mockCallables.addExpectedMatch(mockCallable);
-
- coreMock.stub(mockCallable);
-
- mockCallables.verifyExpectations();
- }
public void testReset() {
- mockCallables.resetCalls.setExpected(1);
+ mockDispatcher.clearCalls.setExpected(1);
coreMock.reset();
- mockCallables.verifyExpectations();
+ mockDispatcher.verifyExpectations();
}
public void testVerifyFailuresIncludeMockName() {
- mockCallables.verifyFailure = new AssertionFailedError("verify failure");
+ mockDispatcher.verifyFailure = new AssertionFailedError("verify failure");
- mockCallables.setExpectedVerifyCalls(1);
+ mockDispatcher.verifyCalls.setExpected(1);
try {
coreMock.verify();
} catch (AssertionFailedError expected) {
AssertMo.assertIncludes("Should include mock name", MOCK_NAME, expected.getMessage());
- mockCallables.verifyExpectations();
+ mockDispatcher.verifyExpectations();
return;
}
fail("Should have thrown exception");
--- InvocationDispatcherTest.java DELETED ---
--- CallBagTest.java DELETED ---
|
|
From: Steve F. <sm...@us...> - 2003-10-01 16:06:02
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic In directory sc8-pr-cvs1:/tmp/cvs-serv13251/src/core/test/mockobjects/dynamic Added Files: CallBagTest.java Log Message: |