Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-31 19:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes test

Browse Source
This commit is contained in:
Lukasz Lenart
2015-10-05 21:10:19 +02:00
parent 582bb32e4b
commit 9640c2b3a1
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java
+13 -11
View File
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpSession;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsInternalTestCase;
import org.apache.struts2.TestConfigurationProvider;
import org.apache.struts2.dispatcher.HttpParameters;
import org.apache.struts2.util.TokenHelper;
import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest;
import org.apache.struts2.views.jsp.StrutsMockHttpSession;
@@ -47,9 +48,9 @@ public class TokenInterceptorTest extends StrutsInternalTestCase {
ActionContext oldContext;
HttpSession httpSession;
Map extraContext;
Map params;
Map session;
Map<String, Object> extraContext;
Map<String, String> params;
Map<String, Object> session;
StrutsMockHttpServletRequest request;
@@ -61,21 +62,21 @@ public class TokenInterceptorTest extends StrutsInternalTestCase {
public void testNoTokenInSession() throws Exception {
assertEquals(oldContext, ActionContext.getContext());
ActionProxy proxy = buildProxy(getActionName());
setToken(request);
ActionProxy proxy = buildProxy(getActionName());
ActionContext.getContext().getSession().clear();
assertEquals(TokenInterceptor.INVALID_TOKEN_CODE, proxy.execute());
}
public void testTokenInterceptorSuccess() throws Exception {
ActionProxy proxy = buildProxy(getActionName());
setToken(request);
ActionProxy proxy = buildProxy(getActionName());
assertEquals(Action.SUCCESS, proxy.execute());
}
public void testCAllExecute2Times() throws Exception {
ActionProxy proxy = buildProxy(getActionName());
public void testCallExecute2Times() throws Exception {
setToken(request);
ActionProxy proxy = buildProxy(getActionName());
assertEquals(Action.SUCCESS, proxy.execute());
ActionProxy proxy2 = buildProxy(getActionName());
@@ -102,16 +103,17 @@ public class TokenInterceptorTest extends StrutsInternalTestCase {
request.getParameterMap().put(TokenHelper.DEFAULT_TOKEN_NAME, new String[]{
token
});
extraContext.put(ActionContext.PARAMETERS, HttpParameters.create(params).build());
}
protected void setUp() throws Exception {
loadConfigurationProviders(new TestConfigurationProvider());
session = new TreeMap();
params = new TreeMap();
extraContext = new TreeMap();
session = new TreeMap<>();
params = new TreeMap<>();
extraContext = new TreeMap<>();
extraContext.put(ActionContext.SESSION, session);
extraContext.put(ActionContext.PARAMETERS, params);
extraContext.put(ActionContext.PARAMETERS, HttpParameters.createEmpty().build());
request = new StrutsMockHttpServletRequest();
httpSession = new StrutsMockHttpSession();