svn commit: r760103 - in /struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation: AnnotationValidationInterceptorTest.java JSONValidationInterceptorTest.java

[musachy]

Author: musachy
Date: Mon Mar 30 18:57:28 2009
New Revision: 760103

URL: http://svn.apache.org/viewvc?rev=760103&view=rev
Log:
WW-2996 Fix emory Leak when SlashesInActionNames is enabled and wildcards are 
used in actionnames

Modified:
    
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java
    
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.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=760103&r1=760102&r2=760103&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
 Mon Mar 30 18:57:28 2009
@@ -27,6 +27,7 @@
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.ActionProxy;
 import com.opensymphony.xwork2.Validateable;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
 
 public class AnnotationValidationInterceptorTest extends StrutsTestCase {
 
@@ -34,12 +35,14 @@
     private Mock mockActionInvocation;
     private Mock mockActionProxy;
     private TestAction test;
+    private ActionConfig config;
 
     public void setUp() throws Exception {
         super.setUp();
         test = new TestAction();
         interceptor = new AnnotationValidationInterceptor();
         container.inject(interceptor);
+        config = new ActionConfig.Builder("", "foo", "").build();
         mockActionInvocation = new Mock(ActionInvocation.class);
         mockActionProxy = new Mock(ActionProxy.class);
         mockActionInvocation.matchAndReturn("getProxy", (ActionProxy) 
mockActionProxy.proxy());
@@ -49,7 +52,7 @@
 
     public void testShouldNotSkip() throws Exception {
         mockActionProxy.expectAndReturn("getMethod", "execute");
-        mockActionProxy.expectAndReturn("getActionName", "foo");
+        mockActionProxy.expectAndReturn("getConfig", config);
         mockActionProxy.expectAndReturn("getMethod", "execute");
         
interceptor.doIntercept((ActionInvocation)mockActionInvocation.proxy());
         mockActionProxy.verify();
@@ -81,7 +84,7 @@
 
     public void testShouldNotSkipBase() throws Exception {
         mockActionProxy.expectAndReturn("getMethod", "dontSkipMeBase");
-        mockActionProxy.expectAndReturn("getActionName", "foo");
+        mockActionProxy.expectAndReturn("getConfig", config);
         mockActionProxy.expectAndReturn("getMethod", "dontSkipMeBase");
         
interceptor.doIntercept((ActionInvocation)mockActionInvocation.proxy());
         mockActionProxy.verify();

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java?rev=760103&r1=760102&r2=760103&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
 Mon Mar 30 18:57:28 2009
@@ -38,6 +38,7 @@
 import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
 import com.opensymphony.xwork2.mock.MockActionInvocation;
 import com.opensymphony.xwork2.mock.MockActionProxy;
 import com.opensymphony.xwork2.util.ValueStack;
@@ -128,6 +129,7 @@
 
     protected void setUp() throws Exception {
         super.setUp();
+        ActionConfig config = new ActionConfig.Builder("", "name", "").build();
         this.action = new TestAction();
         this.interceptor = new JSONValidationInterceptor();
         this.validationInterceptor = new AnnotationValidationInterceptor();
@@ -152,6 +154,7 @@
         MockActionProxy proxy = new MockActionProxy();
         proxy.setMethod("execute");
         proxy.setAction(action);
+        proxy.setConfig(config);
         invocation.setProxy(proxy);
     }