You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2012/02/26 10:52:12 UTC
svn commit: r1293795 -
/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java
Author: lukaszlenart
Date: Sun Feb 26 09:52:12 2012
New Revision: 1293795
URL: http://svn.apache.org/viewvc?rev=1293795&view=rev
Log:
WW-3753 - adheres AnnotationActionValidatorManager to ActionValidatorManager interface's contract
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java?rev=1293795&r1=1293794&r2=1293795&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java Sun Feb 26 09:52:12 2012
@@ -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 AnnotationValidationInterce
}
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 AnnotationValidationInterce
}
public void testShouldNotSkipBase() throws Exception {
- mockActionProxy.expectAndReturn("getMethod", "dontSkipMeBase");
mockActionProxy.expectAndReturn("getActionName", "foo");
mockActionProxy.expectAndReturn("getMethod", "execute");
mockActionProxy.expectAndReturn("getConfig", config);