From bda06c8baa2f65b6e340a7a8bc24a635a865bbcd Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Mon, 5 Oct 2015 14:38:02 +0200 Subject: [PATCH] Fixes test --- .../xwork2/validator/ValidatorAnnotationTest.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java index acd684401..cfaa765f5 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java @@ -5,6 +5,7 @@ import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.interceptor.ValidationAware; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider; +import org.apache.struts2.dispatcher.HttpParameters; import java.util.Collection; import java.util.HashMap; @@ -23,7 +24,7 @@ public class ValidatorAnnotationTest extends XWorkTestCase { params.put("bar", "7"); HashMap extraContext = new HashMap<>(); - extraContext.put(ActionContext.PARAMETERS, params); + extraContext.put(ActionContext.PARAMETERS, HttpParameters.create(params).build()); ActionProxy proxy = actionProxyFactory.createActionProxy("", "notAnnotatedMethod", null, extraContext); proxy.execute(); @@ -36,7 +37,7 @@ public class ValidatorAnnotationTest extends XWorkTestCase { public void testNotAnnotatedMethodSuccess2() throws Exception { HashMap extraContext = new HashMap<>(); - extraContext.put(ActionContext.PARAMETERS, new HashMap()); + extraContext.put(ActionContext.PARAMETERS, HttpParameters.createEmpty().build()); ActionProxy proxy = actionProxyFactory.createActionProxy("", "notAnnotatedMethod", null, extraContext); proxy.execute(); @@ -49,7 +50,7 @@ public class ValidatorAnnotationTest extends XWorkTestCase { public void testAnnotatedMethodFailure() throws Exception { HashMap extraContext = new HashMap<>(); - extraContext.put(ActionContext.PARAMETERS, new HashMap()); + extraContext.put(ActionContext.PARAMETERS, HttpParameters.createEmpty().build()); ActionProxy proxy = actionProxyFactory.createActionProxy("", "annotatedMethod", null, extraContext); proxy.execute(); @@ -69,7 +70,7 @@ public class ValidatorAnnotationTest extends XWorkTestCase { params.put("param2", "key2"); HashMap extraContext = new HashMap<>(); - extraContext.put(ActionContext.PARAMETERS, params); + extraContext.put(ActionContext.PARAMETERS, HttpParameters.create(params).build()); ActionProxy proxy = actionProxyFactory.createActionProxy("", "annotatedMethod", null, extraContext); proxy.execute(); @@ -83,7 +84,7 @@ public class ValidatorAnnotationTest extends XWorkTestCase { params.put("param2", "key2"); HashMap extraContext = new HashMap<>(); - extraContext.put(ActionContext.PARAMETERS, params); + extraContext.put(ActionContext.PARAMETERS, HttpParameters.create(params).build()); ActionProxy proxy = actionProxyFactory.createActionProxy("", "annotatedMethod", null, extraContext); proxy.execute(); @@ -97,7 +98,7 @@ public class ValidatorAnnotationTest extends XWorkTestCase { params.put("param1", "key1"); HashMap extraContext = new HashMap<>(); - extraContext.put(ActionContext.PARAMETERS, params); + extraContext.put(ActionContext.PARAMETERS, HttpParameters.create(params).build()); ActionProxy proxy = actionProxyFactory.createActionProxy("", "annotatedMethod", null, extraContext); proxy.execute();