Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 07:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into WW-4435

Browse Source
This commit is contained in:
Lukasz Lenart
2014-12-21 20:48:51 +01:00
parent 43679fc3f4 702738693c
commit 73644d2ccf
3 changed files with 177 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
+6 -5
View File
@@ -426,10 +426,10 @@ public class DefaultActionInvocation implements ActionInvocation {
if (e.getReason() instanceof NoSuchMethodException) {
try {
String altMethodName = "do" + methodName.substring(0, 1).toUpperCase() + methodName.substring(1) + "()";
methodResult = ognlUtil.getValue(altMethodName, ActionContext.getContext().getContextMap(), action);
methodResult = ognlUtil.getValue(altMethodName, getStack().getContext(), action);
} catch (MethodFailedException e1) {
// if still method doesn't exist, try checking UnknownHandlers
if (e.getReason() instanceof NoSuchMethodException) {
if (e1.getReason() instanceof NoSuchMethodException) {
if (unknownHandlerManager.hasUnknownHandlers()) {
try {
methodResult = unknownHandlerManager.handleUnknownMethod(action, methodName);
@@ -438,6 +438,7 @@ public class DefaultActionInvocation implements ActionInvocation {
throw e;
}
} else {
// throw the original one
throw e;
}
// throw the original exception as UnknownHandlers weren't able to handle invocation as well
@@ -445,12 +446,12 @@ public class DefaultActionInvocation implements ActionInvocation {
throw e;
}
} else {
// exception isn't related to missing action method
throw e;
// exception isn't related to missing action method, throw it
throw e1;
}
}
} else {
// exception isn't related to missing action method
// exception isn't related to missing action method, throw it
throw e;
}
}
xwork-core/src/test/java/com/opensymphony/xwork2/DefaultActionInvocationTest.java
+168 -9
View File
@@ -106,6 +106,28 @@ public class DefaultActionInvocationTest extends XWorkTestCase {
assertEquals("success", result);
}
public void testInvokingExistingDoInputMethod() throws Exception {
// given
DefaultActionInvocation dai = new DefaultActionInvocation(new HashMap<String, Object>(), false) {
public ValueStack getStack() {
return new StubValueStack();
}
};
SimpleAction action = new SimpleAction();
MockActionProxy proxy = new MockActionProxy();
proxy.setMethod("with");
dai.proxy = proxy;
dai.ognlUtil = new OgnlUtil();
// when
String result = dai.invokeAction(action, null);
// then
assertEquals("with", result);
}
public void testInvokingMissingMethod() throws Exception {
// given
DefaultActionInvocation dai = new DefaultActionInvocation(new HashMap<String, Object>(), false) {
@@ -135,16 +157,16 @@ public class DefaultActionInvocationTest extends XWorkTestCase {
dai.unknownHandlerManager = uhm;
// when
Throwable expected = null;
Throwable actual = null;
try {
dai.invokeAction(action, null);
} catch (Exception e) {
expected = e;
actual = e;
}
// then
assertNotNull(expected);
assertTrue(expected instanceof NoSuchMethodException);
assertNotNull(actual);
assertTrue(actual instanceof NoSuchMethodException);
}
public void testInvokingExistingMethodThatThrowsException() throws Exception {
@@ -168,17 +190,154 @@ public class DefaultActionInvocationTest extends XWorkTestCase {
dai.ognlUtil = new OgnlUtil();
// when
// when
Throwable expected = null;
Throwable actual = null;
try {
dai.invokeAction(action, null);
} catch (Exception e) {
expected = e;
actual = e;
}
// then
assertNotNull(expected);
assertTrue(expected instanceof IllegalArgumentException);
assertNotNull(actual);
assertTrue(actual instanceof IllegalArgumentException);
}
public void testInvokingExistingDoMethodThatThrowsException() throws Exception {
// given
DefaultActionInvocation dai = new DefaultActionInvocation(new HashMap<String, Object>(), false) {
public ValueStack getStack() {
return new StubValueStack();
}
};
UnknownHandlerManager uhm = new DefaultUnknownHandlerManager() {
@Override
public boolean hasUnknownHandlers() {
return false;
}
};
SimpleAction action = new SimpleAction() {
@Override
public String doWith() throws Exception {
throw new IllegalArgumentException();
}
};
MockActionProxy proxy = new MockActionProxy();
proxy.setMethod("with");
dai.proxy = proxy;
dai.ognlUtil = new OgnlUtil();
dai.unknownHandlerManager = uhm;
// when
// when
Throwable actual = null;
try {
dai.invokeAction(action, null);
} catch (Exception e) {
actual = e;
}
// then
assertNotNull(actual);
assertTrue(actual instanceof IllegalArgumentException);
}
@Deprecated
public void testUnknownHandlerManagerThatThrowsException() throws Exception {
// given
DefaultActionInvocation dai = new DefaultActionInvocation(new HashMap<String, Object>(), false) {
public ValueStack getStack() {
return new StubValueStack();
}
};
UnknownHandlerManager uhm = new DefaultUnknownHandlerManager() {
@Override
public boolean hasUnknownHandlers() {
return true;
}
@Override
public Object handleUnknownMethod(Object action, String methodName) throws NoSuchMethodException {
throw new NoSuchMethodException();
}
};
SimpleAction action = new SimpleAction() {
@Override
public String doWith() throws Exception {
throw new IllegalArgumentException();
}
};
MockActionProxy proxy = new MockActionProxy();
proxy.setMethod("notExists");
dai.proxy = proxy;
dai.ognlUtil = new OgnlUtil();
dai.unknownHandlerManager = uhm;
// when
// when
Throwable actual = null;
try {
dai.invokeAction(action, null);
} catch (Exception e) {
actual = e;
}
// then
assertNotNull(actual);
assertTrue(actual instanceof NoSuchMethodException);
}
@Deprecated
public void testUnknownHandlerManagerThatReturnsNull() throws Exception {
// given
DefaultActionInvocation dai = new DefaultActionInvocation(new HashMap<String, Object>(), false) {
public ValueStack getStack() {
return new StubValueStack();
}
};
UnknownHandlerManager uhm = new DefaultUnknownHandlerManager() {
@Override
public boolean hasUnknownHandlers() {
return true;
}
@Override
public Object handleUnknownMethod(Object action, String methodName) throws NoSuchMethodException {
return null;
}
};
SimpleAction action = new SimpleAction() {
@Override
public String doWith() throws Exception {
throw new IllegalArgumentException();
}
};
MockActionProxy proxy = new MockActionProxy();
proxy.setMethod("notExists");
dai.proxy = proxy;
dai.ognlUtil = new OgnlUtil();
dai.unknownHandlerManager = uhm;
// when
// when
Throwable actual = null;
try {
dai.invokeAction(action, null);
} catch (Exception e) {
actual = e;
}
// then
assertNotNull(actual);
assertTrue(actual instanceof NoSuchMethodException);
}
}
xwork-core/src/test/java/com/opensymphony/xwork2/SimpleAction.java
+3
View File
@@ -249,6 +249,9 @@ public class SimpleAction extends ActionSupport {
return INPUT;
}
public String doWith() throws Exception {
return "with";
}
public long getLongFoo() {
return longFoo;