From 5aa97c1b4be54c2bf39ce8769f1074d811816cd3 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Sun, 26 Feb 2012 09:52:12 +0000 Subject: [PATCH] WW-3753 - adheres AnnotationActionValidatorManager to ActionValidatorManager interface's contract git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1293795 13f79535-47bb-0310-9956-ffa450edef68 --- .../AnnotationValidationInterceptorTest.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java index 324f89b48..bf6e6512a 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java @@ -21,12 +21,12 @@ package org.apache.struts2.interceptor.validation; -import org.apache.struts2.StrutsTestCase; -import org.easymock.EasyMock; - import com.mockobjects.dynamic.Mock; -import com.opensymphony.xwork2.*; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.config.entities.ActionConfig; +import org.apache.struts2.StrutsTestCase; public class AnnotationValidationInterceptorTest extends StrutsTestCase { @@ -52,7 +52,6 @@ public class AnnotationValidationInterceptorTest extends StrutsTestCase { } public void testShouldNotSkip() throws Exception { - mockActionProxy.expectAndReturn("getMethod", "execute"); mockActionProxy.expectAndReturn("getActionName", "foo"); mockActionProxy.expectAndReturn("getMethod", "execute"); mockActionProxy.expectAndReturn("getConfig", config); @@ -86,7 +85,6 @@ public class AnnotationValidationInterceptorTest extends StrutsTestCase { } public void testShouldNotSkipBase() throws Exception { - mockActionProxy.expectAndReturn("getMethod", "dontSkipMeBase"); mockActionProxy.expectAndReturn("getActionName", "foo"); mockActionProxy.expectAndReturn("getMethod", "execute"); mockActionProxy.expectAndReturn("getConfig", config);