From 607fd00af00fb9a677dc69fdebcc42efedea735d Mon Sep 17 00:00:00 2001 From: gregh3269 Date: Thu, 4 Aug 2016 09:49:44 +0100 Subject: [PATCH] ConversionErrorInterceptor to extend MethodFilterIntercept See WW-4676 --- .../interceptor/ConversionErrorInterceptorTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 0e34ae1f9..33adf7ea4 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"));