root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fixed method count in AbstractMethodMockingControl's IllegalStateException message 

Issue: SPR-10885
This commit is contained in:
Juergen Hoeller 2013-09-02 17:09:29 +02:00
parent 5639aa7064
commit 55961544a7
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj
View File

@ -97,36 +97,34 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth
public void verify() { public void verify() {
if (verified != calls.size()) { if (verified != calls.size()) {
throw new IllegalStateException("Expected " + calls.size() throw new IllegalStateException("Expected " + calls.size() + " calls, received " + verified);
+ " calls, received " + verified);
} }
} }
/** /**
* Validate the call and provide the expected return value * Validate the call and provide the expected return value.
* @param lastSig
* @param args
* @return
*/ */
public Object respond(String lastSig, Object[] args) { public Object respond(String lastSig, Object[] args) {
Call call = nextCall(); Call call = nextCall();
CallResponse responseType = call.responseType; CallResponse responseType = call.responseType;
if (responseType == CallResponse.return_) { if (responseType == CallResponse.return_) {
return call.returnValue(lastSig, args); return call.returnValue(lastSig, args);
} else if(responseType == CallResponse.throw_) { }
return (RuntimeException)call.throwException(lastSig, args); else if (responseType == CallResponse.throw_) {
} else if(responseType == CallResponse.nothing) { return call.throwException(lastSig, args);
}
else if (responseType == CallResponse.nothing) {
// do nothing // do nothing
} }
throw new IllegalStateException("Behavior of " + call + " not specified"); throw new IllegalStateException("Behavior of " + call + " not specified");
} }
private Call nextCall() { private Call nextCall() {
if (verified > calls.size() - 1) { verified++;
throw new IllegalStateException("Expected " + calls.size() if (verified > calls.size()) {
+ " calls, received " + verified); throw new IllegalStateException("Expected " + calls.size() + " calls, received " + verified);
} }
return calls.get(verified++); return calls.get(verified);
} }
public void expectCall(String lastSig, Object lastArgs[]) { public void expectCall(String lastSig, Object lastArgs[]) {
@ -171,7 +169,8 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth
expectations.expectCall(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs()); expectations.expectCall(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs());
// Return value doesn't matter // Return value doesn't matter
return null; return null;
} else { }
else {
return expectations.respond(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs()); return expectations.respond(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs());
} }
} }