Author: musachy
Date: Tue Aug 18 00:36:15 2009
New Revision: 805237
URL: http://svn.apache.org/viewvc?rev=805237&view=rev
Log:
Fix tests
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormTest.java?rev=805237&r1=805236&r2=805237&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormTest.java
Tue Aug 18 00:36:15 2009
@@ -25,8 +25,14 @@
import org.apache.struts2.TestAction;
import org.apache.struts2.views.jsp.AbstractUITagTest;
+import org.easymock.EasyMock;
import com.opensymphony.xwork2.validator.validators.RequiredFieldValidator;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
/**
* <code>FormTest</code>
@@ -43,4 +49,21 @@
assertEquals(1, v.size());
assertEquals(RequiredFieldValidator.class, v.get(0).getClass());
}
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ ActionConfig config = new ActionConfig.Builder("", "name", "").build();
+ ActionInvocation invocation =
EasyMock.createNiceMock(ActionInvocation.class);
+ ActionProxy proxy = EasyMock.createNiceMock(ActionProxy.class);
+
+ EasyMock.expect(invocation.getProxy()).andReturn(proxy).anyTimes();
+ EasyMock.expect(invocation.getAction()).andReturn(null).anyTimes();
+
EasyMock.expect(invocation.invoke()).andReturn(Action.SUCCESS).anyTimes();
+ EasyMock.expect(proxy.getMethod()).andReturn("execute").anyTimes();
+ EasyMock.expect(proxy.getConfig()).andReturn(config).anyTimes();
+
+ ActionContext.getContext().setActionInvocation(invocation);
+ }
}
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=805237&r1=805236&r2=805237&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
Tue Aug 18 00:36:15 2009
@@ -22,11 +22,10 @@
package org.apache.struts2.interceptor.validation;
import org.apache.struts2.StrutsTestCase;
+import org.easymock.EasyMock;
import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.Validateable;
+import com.opensymphony.xwork2.*;
import com.opensymphony.xwork2.config.entities.ActionConfig;
public class AnnotationValidationInterceptorTest extends StrutsTestCase {
@@ -48,10 +47,14 @@
mockActionInvocation.matchAndReturn("getProxy", (ActionProxy)
mockActionProxy.proxy());
mockActionInvocation.matchAndReturn("getAction", test);
mockActionInvocation.expect("invoke");
+
+ ActionContext.getContext().setActionInvocation((ActionInvocation)
mockActionInvocation.proxy());
}
public void testShouldNotSkip() throws Exception {
mockActionProxy.expectAndReturn("getMethod", "execute");
+ mockActionProxy.expectAndReturn("getActionName", "foo");
+ mockActionProxy.expectAndReturn("getMethod", "execute");
mockActionProxy.expectAndReturn("getConfig", config);
mockActionProxy.expectAndReturn("getMethod", "execute");
interceptor.doIntercept((ActionInvocation)mockActionInvocation.proxy());
@@ -84,6 +87,8 @@
public void testShouldNotSkipBase() throws Exception {
mockActionProxy.expectAndReturn("getMethod", "dontSkipMeBase");
+ mockActionProxy.expectAndReturn("getActionName", "foo");
+ mockActionProxy.expectAndReturn("getMethod", "execute");
mockActionProxy.expectAndReturn("getConfig", config);
mockActionProxy.expectAndReturn("getMethod", "dontSkipMeBase");
interceptor.doIntercept((ActionInvocation)mockActionInvocation.proxy());
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java?rev=805237&r1=805236&r2=805237&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java
Tue Aug 18 00:36:15 2009
@@ -33,10 +33,9 @@
import org.apache.struts2.components.Form;
import org.apache.struts2.views.jsp.AbstractUITagTest;
import org.apache.struts2.views.jsp.ActionTag;
+import org.easymock.EasyMock;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.*;
import com.opensymphony.xwork2.config.RuntimeConfiguration;
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.config.entities.InterceptorMapping;
@@ -762,5 +761,21 @@
put("configProviders", TestConfigurationProvider.class.getName());
}});
ActionContext.getContext().setValueStack(stack);
+
+ ActionConfig config = new ActionConfig.Builder("", "name", "").build();
+ ActionInvocation invocation =
EasyMock.createNiceMock(ActionInvocation.class);
+ ActionProxy proxy = EasyMock.createNiceMock(ActionProxy.class);
+
+ EasyMock.expect(invocation.getProxy()).andReturn(proxy).anyTimes();
+ EasyMock.expect(invocation.getAction()).andReturn(null).anyTimes();
+
EasyMock.expect(invocation.invoke()).andReturn(Action.SUCCESS).anyTimes();
+ EasyMock.expect(proxy.getMethod()).andReturn("execute").anyTimes();
+ EasyMock.expect(proxy.getConfig()).andReturn(config).anyTimes();
+
+
+ EasyMock.replay(invocation);
+ EasyMock.replay(proxy);
+
+ ActionContext.getContext().setActionInvocation(invocation);
}
}
