From 059ebc72c2e58bb96e586bda797e55ed43a806c9 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Wed, 25 Nov 2015 19:03:36 +0100 Subject: [PATCH] Updates tests --- .../DateTextFieldInterceptorTest.java | 2 +- .../FileUploadInterceptorTest.java | 13 +++++----- .../MessageStoreInterceptorTest.java | 26 +++++++------------ .../ServletConfigInterceptorTest.java | 6 ++--- .../interceptor/TokenInterceptorTest.java | 8 +++--- .../apache/struts2/EmbeddedJSPResultTest.java | 6 +++-- .../apache/struts2/StrutsJUnit4TestCase.java | 3 ++- .../apache/struts2/StrutsRestTestCase.java | 4 ++- .../org/apache/struts2/StrutsTestCase.java | 3 ++- .../portlet/result/PortletResultTest.java | 5 ++-- 10 files changed, 39 insertions(+), 37 deletions(-) diff --git a/core/src/test/java/org/apache/struts2/interceptor/DateTextFieldInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/DateTextFieldInterceptorTest.java index aa50b6fed..b68319dda 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/DateTextFieldInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/DateTextFieldInterceptorTest.java @@ -57,7 +57,7 @@ public class DateTextFieldInterceptorTest extends StrutsInternalTestCase { assertTrue(parameters.contains("name")); assertEquals(1, parameters.getNames().size()); Date date = new SimpleDateFormat("yyyy-MM-dd").parse("2000-06-15"); - assertEquals(date, parameters.get("name").getValue()); + assertEquals(date, parameters.get("name").getObject()); } } diff --git a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java index b6ed4fb37..c660d55c6 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java @@ -259,10 +259,11 @@ public class FileUploadInterceptorTest extends StrutsInternalTestCase { assertTrue(!action.hasErrors()); - assertTrue(param.size() == 3); - File[] files = (File[]) param.get("file"); - String[] fileContentTypes = (String[]) param.get("fileContentType"); - String[] fileRealFilenames = (String[]) param.get("fileFileName"); + HttpParameters parameters = mai.getInvocationContext().getParameters(); + assertTrue(parameters.getNames().size() == 3); + File[] files = (File[]) parameters.get("file").getObject(); + String[] fileContentTypes = parameters.get("fileContentType").getMultipleValue(); + String[] fileRealFilenames = parameters.get("fileFileName").getMultipleValue(); assertNotNull(files); assertNotNull(fileContentTypes); @@ -320,8 +321,8 @@ public class FileUploadInterceptorTest extends StrutsInternalTestCase { HttpParameters parameters = mai.getInvocationContext().getParameters(); assertEquals(3, parameters.getNames().size()); File[] files = (File[]) parameters.get("file").getObject(); - String[] fileContentTypes = (String[]) param.get("fileContentType"); - String[] fileRealFilenames = (String[]) param.get("fileFileName"); + String[] fileContentTypes = parameters.get("fileContentType").getMultipleValue(); + String[] fileRealFilenames = parameters.get("fileFileName").getMultipleValue(); assertNotNull(files); assertNotNull(fileContentTypes); diff --git a/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java index 2fc64428f..a3784d38e 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java @@ -29,6 +29,7 @@ import java.util.Map; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsInternalTestCase; +import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.result.ServletActionRedirectResult; import org.easymock.EasyMock; @@ -65,7 +66,6 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase { interceptor.setOperationMode(MessageStoreInterceptor.STORE_MODE); - Map paramMap = new LinkedHashMap(); Map sessionMap = new LinkedHashMap(); ActionSupport action = new ActionSupport(); @@ -77,8 +77,8 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase { action.addFieldError("field2", "some field error 2"); ActionContext actionContext = new ActionContext(new HashMap()); - actionContext.put(ActionContext.PARAMETERS, paramMap); - actionContext.put(ActionContext.SESSION, sessionMap); + actionContext.setParameters(HttpParameters.createEmpty().build()); + actionContext.setSession(sessionMap); // Mock (ActionInvocation) ActionInvocation mockActionInvocation = EasyMock.createControl().createMock(ActionInvocation.class); @@ -133,15 +133,13 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase { interceptor.setAllowRequestParameterSwitch(true); interceptor.setOperationMode(MessageStoreInterceptor.STORE_MODE); - Map paramMap = new LinkedHashMap(); - ActionSupport action = new ActionSupport(); action.addActionError("some action error 1"); action.addActionMessage("some action message 1"); action.addFieldError("field2", "some field error 2"); ActionContext actionContext = new ActionContext(new HashMap()); - actionContext.put(ActionContext.PARAMETERS, paramMap); + actionContext.setParameters(HttpParameters.createEmpty().build()); // Mock (ActionInvocation) ActionInvocation mockActionInvocation = EasyMock.createControl().createMock(ActionInvocation.class); @@ -179,7 +177,6 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase { mockActionInvocation.invoke(); EasyMock.expectLastCall().andReturn(Action.SUCCESS); - Map paramsMap = new LinkedHashMap(); Map sessionMap = new LinkedHashMap(); List actionErrors = new ArrayList(); @@ -203,7 +200,7 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase { ActionContext actionContext = new ActionContext(new HashMap()); - actionContext.put(ActionContext.PARAMETERS, paramsMap); + actionContext.setParameters(HttpParameters.createEmpty().build()); actionContext.put(ActionContext.SESSION, sessionMap); mockActionInvocation.getInvocationContext(); @@ -244,7 +241,6 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase { interceptor.setOperationMode(MessageStoreInterceptor.AUTOMATIC_MODE); - Map paramMap = new LinkedHashMap(); Map sessionMap = new LinkedHashMap(); ActionSupport action = new ActionSupport(); @@ -256,7 +252,7 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase { action.addFieldError("field2", "some field error 2"); ActionContext actionContext = new ActionContext(new HashMap()); - actionContext.put(ActionContext.PARAMETERS, paramMap); + actionContext.setParameters(HttpParameters.createEmpty().build()); actionContext.put(ActionContext.SESSION, sessionMap); // Mock (ActionInvocation) @@ -319,7 +315,7 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase { actionContext = new ActionContext(new HashMap()); - actionContext.put(ActionContext.PARAMETERS, paramMap); + actionContext.setParameters(HttpParameters.createEmpty().build()); actionContext.put(ActionContext.SESSION, sessionMap); mockActionInvocation.getInvocationContext(); @@ -360,7 +356,7 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase { paramMap.put("operationMode", new String[] { MessageStoreInterceptor.RETRIEVE_MODE }); ActionContext actionContext = new ActionContext(new HashMap()); - actionContext.put(ActionContext.PARAMETERS, paramMap); + actionContext.setParameters(HttpParameters.create(paramMap).build()); ActionInvocation mockActionInvocation = EasyMock.createControl().createMock(ActionInvocation.class); mockActionInvocation.getInvocationContext(); @@ -383,7 +379,7 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase { paramMap.put("operationMode", new String[] { MessageStoreInterceptor.STORE_MODE }); ActionContext actionContext = new ActionContext(new HashMap()); - actionContext.put(ActionContext.PARAMETERS, paramMap); + actionContext.setParameters(HttpParameters.create(paramMap).build()); ActionInvocation mockActionInvocation = EasyMock.createControl().createMock(ActionInvocation.class); mockActionInvocation.getInvocationContext(); @@ -402,10 +398,8 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase { public void testRequestOperationMode3() throws Exception { - Map paramMap = new LinkedHashMap(); - ActionContext actionContext = new ActionContext(new HashMap()); - actionContext.put(ActionContext.PARAMETERS, paramMap); + actionContext.setParameters(HttpParameters.createEmpty().build()); ActionInvocation mockActionInvocation = EasyMock.createControl().createMock(ActionInvocation.class); mockActionInvocation.getInvocationContext(); diff --git a/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java index 58a17a75a..982d7b10b 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java @@ -89,10 +89,10 @@ public class ServletConfigInterceptorTest extends StrutsInternalTestCase { MockActionInvocation mai = createActionInvocation(mock); - Map param = new HashMap(); - mai.getInvocationContext().setParameters(HttpParameters.createEmpty().build()); + HttpParameters param = HttpParameters.createEmpty().build(); + mai.getInvocationContext().setParameters(param); - mock.setParameters((Map)param); + mock.setParameters(param); control.setVoidCallable(); control.replay(); diff --git a/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java index d67e69318..5f29e1bed 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java @@ -49,7 +49,7 @@ public class TokenInterceptorTest extends StrutsInternalTestCase { ActionContext oldContext; HttpSession httpSession; Map extraContext; - Map params; + Map params; Map session; StrutsMockHttpServletRequest request; @@ -62,8 +62,8 @@ public class TokenInterceptorTest extends StrutsInternalTestCase { public void testNoTokenInSession() throws Exception { assertEquals(oldContext, ActionContext.getContext()); - setToken(request); ActionProxy proxy = buildProxy(getActionName()); + setToken(request); ActionContext.getContext().getSession().clear(); assertEquals(TokenInterceptor.INVALID_TOKEN_CODE, proxy.execute()); } @@ -74,7 +74,7 @@ public class TokenInterceptorTest extends StrutsInternalTestCase { assertEquals(Action.SUCCESS, proxy.execute()); } - public void testCallExecute2Times() throws Exception { + public void testCAllExecute2Times() throws Exception { setToken(request); ActionProxy proxy = buildProxy(getActionName()); assertEquals(Action.SUCCESS, proxy.execute()); @@ -128,6 +128,6 @@ public class TokenInterceptorTest extends StrutsInternalTestCase { } protected ActionProxy buildProxy(String actionName) throws Exception { - return actionProxyFactory.createActionProxy("", actionName, null, extraContext, true, true); + return actionProxyFactory.createActionProxy("", actionName, null, extraContext); } } diff --git a/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java b/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java index 2fde6f7b1..10cb89252 100644 --- a/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java +++ b/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java @@ -31,8 +31,10 @@ import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.finder.ClassLoaderInterface; import com.opensymphony.xwork2.util.finder.ClassLoaderInterfaceDelegate; import com.opensymphony.xwork2.util.fs.DefaultFileManager; +import com.sun.net.httpserver.HttpsParameters; import junit.framework.TestCase; import org.apache.commons.lang3.StringUtils; +import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.views.util.DefaultUrlHelper; import org.apache.struts2.views.util.UrlHelper; import org.easymock.EasyMock; @@ -248,7 +250,7 @@ public class EmbeddedJSPResultTest extends TestCase { EasyMock.expect(request.getParameterMap()).andReturn(params).anyTimes(); EasyMock.expect(request.getParameter("username")).andAnswer(new IAnswer() { public String answer() throws Throwable { - return ((String[]) params.get("username"))[0]; + return ActionContext.getContext().getParameters().get("username").getValue(); } }); EasyMock.expect(request.getAttribute("something")).andReturn("somethingelse").anyTimes(); @@ -257,7 +259,7 @@ public class EmbeddedJSPResultTest extends TestCase { ActionContext actionContext = new ActionContext(new HashMap()); ActionContext.setContext(actionContext); - actionContext.setParameters(params); + actionContext.setParameters(HttpParameters.create(params).build()); ServletActionContext.setRequest(request); ServletActionContext.setResponse(response); ServletActionContext.setServletContext(context); diff --git a/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java b/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java index f0ab85756..1e9221cac 100644 --- a/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java +++ b/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java @@ -33,6 +33,7 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory; import com.opensymphony.xwork2.util.logging.jdk.JdkLoggerFactory; import org.apache.commons.lang3.StringUtils; import org.apache.struts2.dispatcher.Dispatcher; +import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.dispatcher.mapper.ActionMapper; import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.apache.struts2.util.StrutsTestCaseHelper; @@ -158,7 +159,7 @@ public abstract class StrutsJUnit4TestCase extends XWorkJUnit4TestCase { namespace, name, method, new HashMap(), true, false); ActionContext invocationContext = proxy.getInvocation().getInvocationContext(); - invocationContext.setParameters(new HashMap(request.getParameterMap())); + invocationContext.setParameters(HttpParameters.create(request.getParameterMap()).build()); // set the action context to the one used by the proxy ActionContext.setContext(invocationContext); diff --git a/plugins/junit/src/main/java/org/apache/struts2/StrutsRestTestCase.java b/plugins/junit/src/main/java/org/apache/struts2/StrutsRestTestCase.java index 9292366a1..e5f689f0f 100644 --- a/plugins/junit/src/main/java/org/apache/struts2/StrutsRestTestCase.java +++ b/plugins/junit/src/main/java/org/apache/struts2/StrutsRestTestCase.java @@ -4,7 +4,9 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.ActionProxyFactory; import com.opensymphony.xwork2.config.Configuration; +import com.sun.net.httpserver.HttpsParameters; import org.apache.struts2.dispatcher.Dispatcher; +import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; @@ -103,7 +105,7 @@ public class StrutsRestTestCase extends StrutsJUnit4TestCase { ActionContext invocationContext = proxy.getInvocation().getInvocationContext(); invocationContext.getContextMap().put(ServletActionContext.ACTION_MAPPING, mapping); - invocationContext.setParameters(new HashMap(request.getParameterMap())); + invocationContext.setParameters(HttpParameters.create(request.getParameterMap()).build()); // set the action context to the one used by the proxy ActionContext.setContext(invocationContext); diff --git a/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java b/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java index add0df0a6..6e21bf4c2 100644 --- a/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java +++ b/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java @@ -30,6 +30,7 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory; import org.apache.logging.log4j.LogManager; import com.opensymphony.xwork2.util.logging.jdk.JdkLoggerFactory; import org.apache.struts2.dispatcher.Dispatcher; +import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.dispatcher.mapper.ActionMapper; import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.apache.struts2.util.StrutsTestCaseHelper; @@ -152,7 +153,7 @@ public abstract class StrutsTestCase extends XWorkTestCase { } protected void initActionContext(ActionContext actionContext) { - actionContext.setParameters(new HashMap(request.getParameterMap())); + actionContext.setParameters(HttpParameters.create(request.getParameterMap()).build()); initSession(actionContext); applyAdditionalParams(actionContext); // set the action context to the one used by the proxy diff --git a/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java b/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java index 717040dd2..b1297e380 100644 --- a/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java +++ b/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java @@ -23,8 +23,10 @@ package org.apache.struts2.portlet.result; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionProxy; +import com.sun.net.httpserver.HttpsParameters; import junit.textui.TestRunner; import org.apache.struts2.StrutsStatics; +import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.portlet.PortletConstants; import org.apache.struts2.portlet.PortletPhase; import org.jmock.Mock; @@ -68,12 +70,11 @@ public class PortletResultTest extends MockObjectTestCase implements StrutsStati mockCtx = mock(PortletContext.class); mockProxy = mock(ActionProxy.class); - Map paramMap = new HashMap(); Map sessionMap = new HashMap(); Map context = new HashMap(); context.put(SESSION, sessionMap); - context.put(PARAMETERS, paramMap); + context.put(PARAMETERS, HttpParameters.createEmpty().build()); context.put(STRUTS_PORTLET_CONTEXT, mockCtx.proxy()); ActionContext.setContext(new ActionContext(context));