ConversionErrorInterceptor to extend MethodFilterIntercept See WW-4676
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6b229018 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6b229018 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6b229018 Branch: refs/heads/master Commit: 6b22901814e38cdcc7be53c7c36bdc18ae0706bf Parents: d9fe140 Author: gregh3269 <gregh3...@gmail.com> Authored: Thu Aug 4 09:49:44 2016 +0100 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Wed Sep 28 10:36:39 2016 +0200 ---------------------------------------------------------------------- .../xwork2/interceptor/ConversionErrorInterceptorTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/6b229018/core/src/test/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptorTest.java index 0e34ae1..33adf7e 100644 --- a/core/src/test/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptorTest.java @@ -48,7 +48,7 @@ public class ConversionErrorInterceptorTest extends XWorkTestCase { stack.push(action); mockInvocation.matchAndReturn("getAction", action); assertNull(action.getFieldErrors().get("foo")); - interceptor.intercept(invocation); + interceptor.doIntercept(invocation); assertTrue(action.hasFieldErrors()); assertNotNull(action.getFieldErrors().get("foo")); } @@ -61,7 +61,7 @@ public class ConversionErrorInterceptorTest extends XWorkTestCase { stack.push(action); mockInvocation.matchAndReturn("getAction", action); assertNull(action.getFieldErrors().get(fieldName)); - interceptor.intercept(invocation); + interceptor.doIntercept(invocation); assertTrue(action.hasFieldErrors()); // This fails! assertNotNull(action.getFieldErrors().get(fieldName)); } @@ -76,7 +76,7 @@ public class ConversionErrorInterceptorTest extends XWorkTestCase { assertNull(action.getFieldErrors().get("foo")); assertEquals(55, stack.findValue("foo")); - interceptor.intercept(mai); + interceptor.doIntercept(mai); assertTrue(action.hasFieldErrors()); assertNotNull(action.getFieldErrors().get("foo")); @@ -100,7 +100,7 @@ public class ConversionErrorInterceptorTest extends XWorkTestCase { assertNull(action.getFieldErrors().get("foo")); assertEquals(55, stack.findValue("foo")); - interceptor.intercept(mai); + interceptor.doIntercept(mai); assertTrue(action.hasFieldErrors()); assertNotNull(action.getFieldErrors().get("foo"));