Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4DEFE200B45 for ; Fri, 15 Jul 2016 15:18:47 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4C553160A61; Fri, 15 Jul 2016 13:18:47 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 965BD160A89 for ; Fri, 15 Jul 2016 15:18:46 +0200 (CEST) Received: (qmail 34409 invoked by uid 500); 15 Jul 2016 13:18:30 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 33079 invoked by uid 99); 15 Jul 2016 13:18:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jul 2016 13:18:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E5C34EE689; Fri, 15 Jul 2016 13:18:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lukaszlenart@apache.org To: commits@struts.apache.org Date: Fri, 15 Jul 2016 13:19:15 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [48/50] [abbrv] struts git commit: Fixes test to use HttpParameters instead of Map archived-at: Fri, 15 Jul 2016 13:18:47 -0000 Fixes test to use HttpParameters instead of Map Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b48082a8 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b48082a8 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b48082a8 Branch: refs/heads/master Commit: b48082a8115dee04f33c6db29aacee64973424c6 Parents: 31826bc Author: Lukasz Lenart Authored: Sat Mar 12 16:14:45 2016 +0100 Committer: Lukasz Lenart Committed: Sat Mar 12 16:14:45 2016 +0100 ---------------------------------------------------------------------- .../interceptor/MessageStorePreResultListenerTest.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/b48082a8/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java b/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java index 4e46b3a..3737c46 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java @@ -6,6 +6,7 @@ import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionSupport; 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; @@ -96,7 +97,6 @@ public class MessageStorePreResultListenerTest extends StrutsInternalTestCase { MessageStorePreResultListener listener = new MessageStorePreResultListener(interceptor); - Map paramMap = new LinkedHashMap(); Map sessionMap = new LinkedHashMap(); ActionSupport action = new ActionSupport(); @@ -108,7 +108,7 @@ public class MessageStorePreResultListenerTest 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); HttpSession mockedSession = EasyMock.createControl().createMock(HttpSession.class); @@ -172,7 +172,6 @@ public class MessageStorePreResultListenerTest extends StrutsInternalTestCase { MessageStorePreResultListener listener = new MessageStorePreResultListener(interceptor); - Map paramMap = new LinkedHashMap(); Map sessionMap = new LinkedHashMap(); ActionSupport action = new ActionSupport(); @@ -184,8 +183,8 @@ public class MessageStorePreResultListenerTest 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); HttpSession mockedSession = EasyMock.createControl().createMock(HttpSession.class); HttpServletRequest mockedRequest = EasyMock.createControl().createMock(HttpServletRequest.class);