Menu
▾
▴
[MO-java-dev] CVS: mockobjects-java/src/core/test/mockobjects/dynamic CallMatchTest.java,1.3,1.4 MockCallableAddable.java,1.2,1.3 CallSequenceTest.java,1.8,1.9 CallBagTest.java,1.4,1.5 CallOnceExpectationTest.java,1.1,1.2 StubTest.java,1.2,1.3 MockCallable.java,1.2,1.3 MockTest.java,1.11,1.12
|
From: Steve F. <sm...@us...> - 2003-06-12 22:45:23
|
Update of /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv21757/src/core/test/mockobjects/dynamic
Modified Files:
CallMatchTest.java MockCallableAddable.java
CallSequenceTest.java CallBagTest.java
CallOnceExpectationTest.java StubTest.java MockCallable.java
MockTest.java
Log Message:
Removed 'mock' parameter from Callable.call()
Fixed up some of the field names in the mocks for testing dynamic mocks
Index: CallMatchTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/CallMatchTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CallMatchTest.java 19 May 2003 23:37:49 -0000 1.3
+++ CallMatchTest.java 12 Jun 2003 22:45:15 -0000 1.4
@@ -28,7 +28,7 @@
mockCallable.setExpectedCall(mock, METHOD_NAME, arguments);
mockCallable.setupCallReturn(result);
- callSignature.call(mock, METHOD_NAME, arguments);
+ callSignature.call(METHOD_NAME, arguments);
mockCallable.verifyExpectations();
}
@@ -45,7 +45,7 @@
mockCallable.setExpectedVerifyCalls(1);
mockCallable.setupCallReturn("result");
- callSignature.call(mock, "methodName", IGNORED_ARGS);
+ callSignature.call("methodName", IGNORED_ARGS);
callSignature.verify();
mockCallable.verifyExpectations();
@@ -54,8 +54,8 @@
public void testMultipleCallsSucceed() throws Throwable {
mockCallable.setupCallReturn("result");
- callSignature.call(mock, METHOD_NAME, IGNORED_ARGS);
- callSignature.call(mock, METHOD_NAME, IGNORED_ARGS);
+ callSignature.call(METHOD_NAME, IGNORED_ARGS);
+ callSignature.call(METHOD_NAME, IGNORED_ARGS);
mockCallable.verifyExpectations();
}
@@ -75,9 +75,9 @@
mockConstraintMatcher.setupMatches(true);
- callSignature.call(mock, METHOD_NAME, IGNORED_ARGS);
+ callSignature.call(METHOD_NAME, IGNORED_ARGS);
assertTrue("matches after first call", callSignature.matches(METHOD_NAME, IGNORED_ARGS));
- callSignature.call(mock, METHOD_NAME, IGNORED_ARGS);
+ callSignature.call(METHOD_NAME, IGNORED_ARGS);
assertTrue("matches after further calls", callSignature.matches(METHOD_NAME, IGNORED_ARGS));
mockCallable.verifyExpectations();
Index: MockCallableAddable.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/MockCallableAddable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MockCallableAddable.java 18 May 2003 20:59:38 -0000 1.2
+++ MockCallableAddable.java 12 Jun 2003 22:45:15 -0000 1.3
@@ -1,10 +1,11 @@
package test.mockobjects.dynamic;
-import com.mockobjects.*;
-
+import com.mockobjects.ExpectationCounter;
+import com.mockobjects.ExpectationList;
+import com.mockobjects.MockObject;
+import com.mockobjects.ReturnValues;
import com.mockobjects.dynamic.Callable;
import com.mockobjects.dynamic.CallableAddable;
-import com.mockobjects.dynamic.Mock;
import com.mockobjects.util.NotImplementedException;
//Mock modified for []args
@@ -21,9 +22,8 @@
private ReturnValues myActualGetDescriptionReturnValues = new ReturnValues(true);
private ExpectationCounter myCallCalls = new ExpectationCounter("com.mockobjects.dynamic.CallableAddable CallCalls");
private ReturnValues myActualCallReturnValues = new ReturnValues(true);
- private ExpectationList myCallParameter0Values = new ExpectationList("com.mockobjects.dynamic.CallableAddable CallParameter0Values");
- private ExpectationList myCallParameter1Values = new ExpectationList("com.mockobjects.dynamic.CallableAddable CallParameter1Values");
- private ExpectationList myCallParameter2Values = new ExpectationList("com.mockobjects.dynamic.CallableAddable CallParameter2Values");
+ private ExpectationList myCallMethodNames = new ExpectationList("com.mockobjects.dynamic.CallableAddable methodName");
+ private ExpectationList myCallArguments = new ExpectationList("com.mockobjects.dynamic.CallableAddable arguments");
private ExpectationCounter myVerifyCalls = new ExpectationCounter("com.mockobjects.dynamic.CallableAddable VerifyCalls");
public void reset() {
@@ -99,18 +99,16 @@
myCallCalls.setExpected(calls);
}
- public void addExpectedCall(Mock arg0, String arg1, Object[] arg2) {
- myCallParameter0Values.addExpected(arg0);
- myCallParameter1Values.addExpected(arg1);
- myCallParameter2Values.addExpectedMany(arg2);
+ public void addExpectedCall(String methodName, Object[] args) {
+ myCallMethodNames.addExpected(methodName);
+ myCallArguments.addExpectedMany(args);
}
- public Object call(Mock arg0, String arg1, Object[] arg2)
+ public Object call(String methodName, Object[] args)
throws Throwable {
myCallCalls.inc();
- myCallParameter0Values.addActual(arg0);
- myCallParameter1Values.addActual(arg1);
- myCallParameter2Values.addActualMany(arg2);
+ myCallMethodNames.addActual(methodName);
+ myCallArguments.addActualMany(args);
Object nextReturnValue = myActualCallReturnValues.getNext();
@@ -140,9 +138,8 @@
myMatchesParameter1Values.verify();
myGetDescriptionCalls.verify();
myCallCalls.verify();
- myCallParameter0Values.verify();
- myCallParameter1Values.verify();
- myCallParameter2Values.verify();
+ myCallMethodNames.verify();
+ myCallArguments.verify();
myVerifyCalls.verify();
}
}
Index: CallSequenceTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/CallSequenceTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CallSequenceTest.java 20 May 2003 00:05:24 -0000 1.8
+++ CallSequenceTest.java 12 Jun 2003 22:45:16 -0000 1.9
@@ -46,7 +46,7 @@
callSequence.addExpect(mockCallable);
try {
- callSequence.call(unusedMock, "hello", new String[0]);
+ callSequence.call("hello", new String[0]);
} catch (Throwable ex) {
assertSame("exception is caught by mock", throwable, ex);
}
@@ -54,7 +54,7 @@
public void testCallFailsOnEmptyList() throws Throwable {
try {
- callSequence.call(unusedMock, "missingMethod", new Object[0]);
+ callSequence.call("missingMethod", new Object[0]);
} catch (AssertionFailedError ex) {
AssertMo.assertIncludes("reports empty set in error message", "no methods", ex.getMessage());
@@ -68,10 +68,10 @@
mockCallable.setupMatchesReturn(true);
mockCallable.setupCallReturn(METHOD_A_RESULT);
callSequence.addExpect(mockCallable);
- callSequence.call(unusedMock, "willdefinitelyMatch", new Object[0]);
+ callSequence.call("willdefinitelyMatch", new Object[0]);
try {
- callSequence.call(unusedMock, "oneMethodTooMany", new Object[0]);
+ callSequence.call("oneMethodTooMany", new Object[0]);
} catch (AssertionFailedError ex) {
AssertMo.assertIncludes("reports one method call too many", "too many", ex.getMessage());
@@ -92,7 +92,7 @@
callSequence.addExpect(methodA);
callSequence.addExpect(methodB);
- assertSame("expected result from method A", METHOD_A_RESULT, callSequence.call(unusedMock, METHOD_A_NAME, METHOD_A_ARGS));
+ assertSame("expected result from method A", METHOD_A_RESULT, callSequence.call(METHOD_A_NAME, METHOD_A_ARGS));
methodA.verifyExpectations();
methodB.verifyExpectations();
@@ -109,7 +109,7 @@
callSequence.addExpect(methodB);
try {
- assertSame("expected result from method B", METHOD_B_RESULT, callSequence.call(unusedMock, METHOD_B_NAME, METHOD_B_ARGS));
+ assertSame("expected result from method B", METHOD_B_RESULT, callSequence.call(METHOD_B_NAME, METHOD_B_ARGS));
} catch (AssertionFailedError ex) {
String message = ex.getMessage();
AssertMo.assertIncludes("Should have expected error message", "Unexpected call: methodB", message);
@@ -135,7 +135,7 @@
callSequence.addExpect(mockCallable);
- assertSame("result is returned by mock", result, callSequence.call(unusedMock, "method", new Object[0]));
+ assertSame("result is returned by mock", result, callSequence.call("method", new Object[0]));
}
public void testEmptySetVerifies() throws Exception {
@@ -159,7 +159,7 @@
callSequence.addExpect(methodB);
try {
- callSequence.call(unusedMock, methodCName, methodCArgs);
+ callSequence.call(methodCName, methodCArgs);
} catch (AssertionFailedError ex) {
AssertMo.assertIncludes("method name is in error message", "methodC", ex.getMessage());
AssertMo.assertIncludes("argument is in error message (1)", methodCArgs[0], ex.getMessage());
@@ -213,6 +213,6 @@
callSequence.addExpect(new CallOnceExpectation(anotherMethodASignature));
assertSame("expected result from method B, as expect has precendence over match", "result2",
- callSequence.call(unusedMock, METHOD_A_NAME, METHOD_A_ARGS));
+ callSequence.call(METHOD_A_NAME, METHOD_A_ARGS));
}
}
Index: CallBagTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/CallBagTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CallBagTest.java 20 May 2003 00:05:24 -0000 1.4
+++ CallBagTest.java 12 Jun 2003 22:45:16 -0000 1.5
@@ -29,7 +29,7 @@
public void testCallFailsOnEmptySet() throws Throwable {
try {
- callSet.call(unusedMock, "missingMethod", new Object[0]);
+ callSet.call("missingMethod", new Object[0]);
} catch (AssertionFailedError ex) {
AssertMo.assertIncludes("reports empty set in error message", "no methods", ex.getMessage());
@@ -51,7 +51,7 @@
callSet.addExpect(methodB);
assertSame("expected result from method A", METHOD_A_RESULT,
- callSet.call(unusedMock, METHOD_A_NAME, METHOD_A_ARGS));
+ callSet.call(METHOD_A_NAME, METHOD_A_ARGS));
methodA.verifyExpectations();
methodB.verifyExpectations();
@@ -66,7 +66,7 @@
callSet.addExpect(new CallOnceExpectation(anotherMethodASignature));
assertSame("expected result from method B, as expect has precendence over match", "result2",
- callSet.call(unusedMock, METHOD_A_NAME, METHOD_A_ARGS));
+ callSet.call(METHOD_A_NAME, METHOD_A_ARGS));
}
public void testCallPassedToContainedElementsOtherOrder()
@@ -84,7 +84,7 @@
callSet.addExpect(methodB);
assertSame("expected result from method B", METHOD_B_RESULT,
- callSet.call(unusedMock, METHOD_B_NAME, METHOD_B_ARGS));
+ callSet.call(METHOD_B_NAME, METHOD_B_ARGS));
methodA.verifyExpectations();
methodB.verifyExpectations();
@@ -98,7 +98,7 @@
callSet.addExpect(mockCallable);
- assertSame("result is returned by mock", result, callSet.call(unusedMock, "method", new Object[0]));
+ assertSame("result is returned by mock", result, callSet.call("method", new Object[0]));
}
public void testCallableThrowableThrown()
@@ -111,7 +111,7 @@
callSet.addExpect(mockCallable);
try {
- callSet.call(unusedMock, "hello", new String[0]);
+ callSet.call("hello", new String[0]);
} catch (Throwable ex) {
assertSame("exception is caught by mock", throwable, ex);
}
@@ -138,7 +138,7 @@
callSet.addExpect(methodB);
try {
- callSet.call(unusedMock, methodCName, methodCArgs);
+ callSet.call(methodCName, methodCArgs);
} catch (AssertionFailedError ex) {
AssertMo.assertIncludes("method name is in error message", "methodC", ex.getMessage());
AssertMo.assertIncludes("argument is in error message (1)", methodCArgs[0], ex.getMessage());
Index: CallOnceExpectationTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/CallOnceExpectationTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CallOnceExpectationTest.java 20 May 2003 00:05:24 -0000 1.1
+++ CallOnceExpectationTest.java 12 Jun 2003 22:45:16 -0000 1.2
@@ -49,7 +49,7 @@
mockCallable.setupCallReturn( RESULT );
mockCallable.setExpectedVerifyCalls(1);
- call.call( ignoredMock, METHOD_NAME, ARGS );
+ call.call( METHOD_NAME, ARGS );
call.verify();
mockCallable.verifyExpectations();
@@ -66,7 +66,7 @@
mockCallable.setExpectedCall(ignoredMock, METHOD_NAME, ARGS);
mockCallable.setupCallReturn(RESULT);
- call.call( ignoredMock, METHOD_NAME, ARGS );
+ call.call( METHOD_NAME, ARGS );
mockCallable.verifyExpectations();
}
@@ -76,7 +76,7 @@
mockCallable.setupCallReturn(RESULT);
assertTrue( "First time should match", call.matches(METHOD_NAME, ARGS));
- call.call(ignoredMock, METHOD_NAME, ARGS);
+ call.call(METHOD_NAME, ARGS);
assertFalse( "Second time should not match", call.matches(METHOD_NAME, ARGS));
}
@@ -84,7 +84,7 @@
mockCallable.setupCallReturn(RESULT);
assertSame( "should return decorated's result",
- RESULT, call.call( ignoredMock, METHOD_NAME, ARGS ) );
+ RESULT, call.call( METHOD_NAME, ARGS ) );
mockCallable.verifyExpectations();
}
@@ -95,7 +95,7 @@
mockCallable.setupCallThrow(exception);
try {
- call.call( ignoredMock, METHOD_NAME, ARGS );
+ call.call( METHOD_NAME, ARGS );
fail("expected decorated's throwable to be thrown");
}
catch( DummyThrowable ex ) {
Index: StubTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/StubTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StubTest.java 18 May 2003 20:59:38 -0000 1.2
+++ StubTest.java 12 Jun 2003 22:45:16 -0000 1.3
@@ -21,11 +21,10 @@
ReturnStub stub = new ReturnStub(result);
String ignoredMethodName = "methodName";
- Mock ignoredMock = null;
Object[] ignoredArgs = new Object[0];
assertSame( "Should be the same result object",
- result, stub.call( ignoredMock, ignoredMethodName, ignoredArgs ) );
+ result, stub.call( ignoredMethodName, ignoredArgs ) );
}
public void testThrowStub() {
@@ -33,11 +32,10 @@
ThrowStub stub = new ThrowStub(throwable);
String ignoredMethodName = "methodName";
- Mock ignoredMock = null;
Object[] ignoredArgs = new Object[0];
try {
- stub.call( ignoredMock, ignoredMethodName, ignoredArgs );
+ stub.call( ignoredMethodName, ignoredArgs );
}
catch( Throwable t ) {
assertSame( "Should be the same throwable", throwable, t );
Index: MockCallable.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/MockCallable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MockCallable.java 18 May 2003 20:59:37 -0000 1.2
+++ MockCallable.java 12 Jun 2003 22:45:16 -0000 1.3
@@ -10,7 +10,6 @@
public class MockCallable implements Callable {
private ExpectationCounter callCount = new ExpectationCounter("call.count");
- private ExpectationValue callMock = new ExpectationValue("call.mock");
private ExpectationValue callMethodName = new ExpectationValue("call.methodName");
private ExpectationList callArgs = new ExpectationList("call.args");
private ReturnValue callResult = new ReturnValue("call.return");
@@ -32,7 +31,6 @@
}
public void setExpectedCall( Mock mock, String methodName, Object[] args ) {
- callMock.setExpected(mock);
callMethodName.setExpected(methodName);
callArgs.addExpectedMany(args);
}
@@ -45,8 +43,7 @@
callThrow = thrown;
}
- public Object call(Mock mock, String methodName, Object[] args) throws Throwable {
- callMock.setActual(mock);
+ public Object call(String methodName, Object[] args) throws Throwable {
callMethodName.setActual(methodName);
callArgs.addActualMany(args);
callCount.inc();
Index: MockTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/dynamic/MockTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MockTest.java 19 May 2003 23:56:23 -0000 1.11
+++ MockTest.java 12 Jun 2003 22:45:16 -0000 1.12
@@ -344,7 +344,7 @@
}
public void testMockProxySendsAllArgument() throws Throwable {
- mockCallableAddable.addExpectedCall(mock, METHOD_TWOARG_NAME, METHOD_TWOARG_ARGS);
+ mockCallableAddable.addExpectedCall(METHOD_TWOARG_NAME, METHOD_TWOARG_ARGS);
mockCallableAddable.setupCall("result ignored");
proxy.twoArgMethod(METHOD_TWOARG_ARGS[0], METHOD_TWOARG_ARGS[1]);
@@ -354,7 +354,7 @@
public void testMockProxySendsEmptyArrayWhenNoArguments()
throws Exception {
- mockCallableAddable.addExpectedCall(mock, METHOD_NOARG_NAME, METHOD_NOARG_ARGS);
+ mockCallableAddable.addExpectedCall(METHOD_NOARG_NAME, METHOD_NOARG_ARGS);
mockCallableAddable.setupCall("result ignored");
proxy.noArgMethodVoid();
|
