Repository: struts Updated Branches: refs/heads/master 3bbe68134 -> a4abb3474
WW-4518 Drops deprecated API from ActionProxyFactory Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a4abb347 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a4abb347 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a4abb347 Branch: refs/heads/master Commit: a4abb3474dd3df0532bb0adf8e32ad2c3bedc9a5 Parents: 3bbe681 Author: Lukasz Lenart <[email protected]> Authored: Tue Jun 23 09:26:27 2015 +0200 Committer: Lukasz Lenart <[email protected]> Committed: Tue Jun 23 09:26:27 2015 +0200 ---------------------------------------------------------------------- .../opensymphony/xwork2/ActionProxyFactory.java | 34 ++------------------ .../opensymphony/xwork2/ActionNestingTest.java | 6 ++-- .../opensymphony/xwork2/ChainResultTest.java | 3 +- .../opensymphony/xwork2/DefaultClasstTest.java | 12 +++---- .../opensymphony/xwork2/LocaleAwareTest.java | 4 +-- .../xwork2/ProxyInvocationTest.java | 2 +- .../opensymphony/xwork2/WildCardResultTest.java | 6 ++-- .../xwork2/config/ConfigurationTest.java | 24 +++++++------- .../interceptor/AliasInterceptorTest.java | 2 +- .../interceptor/PreResultListenerTest.java | 6 ++-- .../AnnotationWorkflowInterceptorTest.java | 4 +-- .../xwork2/spring/ActionsFromSpringTest.java | 12 +++---- .../xwork2/util/LocalizedTextUtilTest.java | 17 +++++++--- .../xwork2/util/MyBeanActionTest.java | 5 ++- .../validator/DateRangeValidatorTest.java | 2 +- .../validator/DoubleRangeValidatorTest.java | 8 ++--- .../validator/ExpressionValidatorTest.java | 10 +++--- .../xwork2/validator/IntRangeValidatorTest.java | 2 +- .../validator/LongRangeValidatorTest.java | 2 +- .../validator/ModelDrivenValidationTest.java | 2 +- .../validator/ShortRangeValidatorTest.java | 2 +- .../validator/SimpleActionValidationTest.java | 14 ++++---- .../validator/ValidatorAnnotationTest.java | 18 +++++------ .../interceptor/TokenInterceptorTest.java | 2 +- .../apache/struts2/views/jsp/URLTagTest.java | 2 +- 25 files changed, 87 insertions(+), 114 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/main/java/com/opensymphony/xwork2/ActionProxyFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionProxyFactory.java b/core/src/main/java/com/opensymphony/xwork2/ActionProxyFactory.java index 5cf4de0..9fba8f4 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ActionProxyFactory.java +++ b/core/src/main/java/com/opensymphony/xwork2/ActionProxyFactory.java @@ -37,40 +37,12 @@ public interface ActionProxyFactory { * * @param namespace the namespace of the action, can be <tt>null</tt> * @param actionName the name of the action - * @param extraContext a Map of extra parameters to be provided to the ActionProxy, can be <tt>null</tt> - * @return ActionProxy the created action proxy - * @deprecated Since 2.1.1, use {@link #createActionProxy(String,String,String,Map) instead} - */ - @Deprecated public ActionProxy createActionProxy(String namespace, String actionName, Map<String, Object> extraContext); - - /** - * Creates an {@link ActionProxy} for the given namespace and action name by looking up the configuration.The ActionProxy - * should be fully initialized when it is returned, including having an {@link ActionInvocation} instance associated. - * <p/> - * <b>Note:</b> This is the most used create method. - * - * @param namespace the namespace of the action, can be <tt>null</tt> - * @param actionName the name of the action * @param methodName the name of the method to execute * @param extraContext a Map of extra parameters to be provided to the ActionProxy, can be <tt>null</tt> * @return ActionProxy the created action proxy * @since 2.1.1 */ - public ActionProxy createActionProxy(String namespace, String actionName, String methodName, Map<String, Object> extraContext); - - /** - * Creates an {@link ActionProxy} for the given namespace and action name by looking up the configuration.The ActionProxy - * should be fully initialized when it is returned, including having an {@link ActionInvocation} instance associated. - * - * @param namespace the namespace of the action, can be <tt>null</tt> - * @param actionName the name of the action - * @param extraContext a Map of extra parameters to be provided to the ActionProxy, can be <tt>null</tt> - * @param executeResult flag which tells whether the result should be executed after the action - * @param cleanupContext flag which tells whether the original context should be preserved during execution of the proxy. - * @return ActionProxy the created action proxy - * @deprecated Since 2.1.1, use {@link #createActionProxy(String,String,String,Map,boolean,boolean)} instead - */ - @Deprecated public ActionProxy createActionProxy(String namespace, String actionName, Map<String, Object> extraContext, boolean executeResult, boolean cleanupContext); + ActionProxy createActionProxy(String namespace, String actionName, String methodName, Map<String, Object> extraContext); /** * Creates an {@link ActionProxy} for the given namespace and action name by looking up the configuration.The ActionProxy @@ -85,7 +57,7 @@ public interface ActionProxyFactory { * @return ActionProxy the created action proxy * @since 2.1.1 */ - public ActionProxy createActionProxy(String namespace, String actionName, String methodName, Map<String, Object> extraContext, boolean executeResult, boolean cleanupContext); + ActionProxy createActionProxy(String namespace, String actionName, String methodName, Map<String, Object> extraContext, boolean executeResult, boolean cleanupContext); /** @@ -101,7 +73,7 @@ public interface ActionProxyFactory { * @return ActionProxy the created action proxy * @since 2.1.1 */ - public ActionProxy createActionProxy(ActionInvocation actionInvocation, String namespace, String actionName, String methodName, + ActionProxy createActionProxy(ActionInvocation actionInvocation, String namespace, String actionName, String methodName, boolean executeResult, boolean cleanupContext); } http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/ActionNestingTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/ActionNestingTest.java b/core/src/test/java/com/opensymphony/xwork2/ActionNestingTest.java index ee996e5..a98a9fc 100644 --- a/core/src/test/java/com/opensymphony/xwork2/ActionNestingTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/ActionNestingTest.java @@ -67,7 +67,7 @@ public class ActionNestingTest extends XWorkTestCase { public void testNestedContext() throws Exception { assertEquals(context, ActionContext.getContext()); - ActionProxy proxy = actionProxyFactory.createActionProxy(NAMESPACE, SIMPLE_ACTION_NAME, null); + ActionProxy proxy = actionProxyFactory.createActionProxy(NAMESPACE, SIMPLE_ACTION_NAME, null, null); proxy.execute(); assertEquals(context, ActionContext.getContext()); } @@ -76,7 +76,7 @@ public class ActionNestingTest extends XWorkTestCase { ValueStack stack = ActionContext.getContext().getValueStack(); assertEquals(VALUE, stack.findValue(KEY)); - ActionProxy proxy = actionProxyFactory.createActionProxy(NAMESPACE, NO_STACK_ACTION_NAME, null); + ActionProxy proxy = actionProxyFactory.createActionProxy(NAMESPACE, NO_STACK_ACTION_NAME, null, null); proxy.execute(); stack = ActionContext.getContext().getValueStack(); assertEquals(stack.findValue(KEY), VALUE); @@ -90,7 +90,7 @@ public class ActionNestingTest extends XWorkTestCase { HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.VALUE_STACK, stack); - ActionProxy proxy = actionProxyFactory.createActionProxy(NAMESPACE, STACK_ACTION_NAME, extraContext); + ActionProxy proxy = actionProxyFactory.createActionProxy(NAMESPACE, STACK_ACTION_NAME, null, extraContext); proxy.execute(); assertEquals(context, ActionContext.getContext()); assertEquals(stack, ActionContext.getContext().getValueStack()); http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/ChainResultTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/ChainResultTest.java b/core/src/test/java/com/opensymphony/xwork2/ChainResultTest.java index 73d10a8..adf165c 100644 --- a/core/src/test/java/com/opensymphony/xwork2/ChainResultTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/ChainResultTest.java @@ -76,12 +76,13 @@ public class ChainResultTest extends XWorkTestCase { } public void testRecursiveChain() throws Exception { - ActionProxy proxy = actionProxyFactory.createActionProxy("", "InfiniteRecursionChain", null); + ActionProxy proxy = actionProxyFactory.createActionProxy("", "InfiniteRecursionChain", null, null); try { proxy.execute(); fail("did not detected repeated chain to an action"); } catch (XWorkException e) { + assertTrue(true); } } http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/DefaultClasstTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/DefaultClasstTest.java b/core/src/test/java/com/opensymphony/xwork2/DefaultClasstTest.java index dd2bb06..7d4a2f5 100644 --- a/core/src/test/java/com/opensymphony/xwork2/DefaultClasstTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/DefaultClasstTest.java @@ -37,23 +37,23 @@ public class DefaultClasstTest extends XWorkTestCase { } public void testWildCardEvaluation() throws Exception { - ActionProxy proxy = actionProxyFactory.createActionProxy("Abstract-crud", "edit", null); + ActionProxy proxy = actionProxyFactory.createActionProxy("Abstract-crud", "edit", null, null); assertEquals("com.opensymphony.xwork2.SimpleAction", proxy.getConfig().getClassName()); - proxy = actionProxyFactory.createActionProxy("/example", "edit", null); + proxy = actionProxyFactory.createActionProxy("/example", "edit", null, null); assertEquals("com.opensymphony.xwork2.ModelDrivenAction", proxy.getConfig().getClassName()); - proxy = actionProxyFactory.createActionProxy("/example2", "override", null); + proxy = actionProxyFactory.createActionProxy("/example2", "override", null, null); assertEquals("com.opensymphony.xwork2.ModelDrivenAction", proxy.getConfig().getClassName()); - proxy = actionProxyFactory.createActionProxy("/example2/subItem", "save", null); + proxy = actionProxyFactory.createActionProxy("/example2/subItem", "save", null, null); assertEquals("com.opensymphony.xwork2.ModelDrivenAction", proxy.getConfig().getClassName()); - proxy = actionProxyFactory.createActionProxy("/example2", "list", null); + proxy = actionProxyFactory.createActionProxy("/example2", "list", null, null); assertEquals("com.opensymphony.xwork2.ModelDrivenAction", proxy.getConfig().getClassName()); - proxy = actionProxyFactory.createActionProxy("/example3", "list", null); + proxy = actionProxyFactory.createActionProxy("/example3", "list", null, null); assertEquals("com.opensymphony.xwork2.SimpleAction", proxy.getConfig().getClassName()); } http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/LocaleAwareTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/LocaleAwareTest.java b/core/src/test/java/com/opensymphony/xwork2/LocaleAwareTest.java index 15b1050..955492f 100644 --- a/core/src/test/java/com/opensymphony/xwork2/LocaleAwareTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/LocaleAwareTest.java @@ -33,7 +33,7 @@ public class LocaleAwareTest extends XWorkTestCase { public void testGetText() { try { - ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.FOO_ACTION_NAME, null); + ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.FOO_ACTION_NAME, null, null); ActionContext.getContext().setLocale(Locale.US); TextProvider localeAware = (TextProvider) proxy.getAction(); @@ -46,7 +46,7 @@ public class LocaleAwareTest extends XWorkTestCase { public void testLocaleGetText() { try { - ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.FOO_ACTION_NAME, null); + ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.FOO_ACTION_NAME, null, null); ActionContext.getContext().setLocale(Locale.GERMANY); TextProvider localeAware = (TextProvider) proxy.getAction(); http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/ProxyInvocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/ProxyInvocationTest.java b/core/src/test/java/com/opensymphony/xwork2/ProxyInvocationTest.java index 0e7e208..94ec3de 100644 --- a/core/src/test/java/com/opensymphony/xwork2/ProxyInvocationTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/ProxyInvocationTest.java @@ -20,7 +20,7 @@ public class ProxyInvocationTest extends XWorkTestCase { public void testProxyInvocation() throws Exception { ActionProxy proxy = actionProxyFactory - .createActionProxy("", "ProxyInvocation", createDummyContext()); + .createActionProxy("", "ProxyInvocation", null, createDummyContext()); ActionInvocation invocation = proxy.getInvocation(); String result = invocation.invokeActionOnly(); http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/WildCardResultTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/WildCardResultTest.java b/core/src/test/java/com/opensymphony/xwork2/WildCardResultTest.java index c478f49..6bb853f6 100644 --- a/core/src/test/java/com/opensymphony/xwork2/WildCardResultTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/WildCardResultTest.java @@ -39,17 +39,17 @@ public class WildCardResultTest extends XWorkTestCase { public void testWildCardEvaluation() throws Exception { ActionContext.setContext(null); - ActionProxy proxy = actionProxyFactory.createActionProxy(null, "WildCard", null); + ActionProxy proxy = actionProxyFactory.createActionProxy(null, "WildCard", null, null); assertEquals("success", proxy.execute()); assertEquals(VoidResult.class, proxy.getInvocation().getResult().getClass()); ActionContext.setContext(null); - proxy = actionProxyFactory.createActionProxy(null, "WildCardInput", null); + proxy = actionProxyFactory.createActionProxy(null, "WildCardInput", null, null); assertEquals("input", proxy.execute()); assertEquals(MockResult.class, proxy.getInvocation().getResult().getClass()); ActionContext.setContext(null); - proxy = actionProxyFactory.createActionProxy(null, "WildCardError", null); + proxy = actionProxyFactory.createActionProxy(null, "WildCardError", null, null); assertEquals("error", proxy.execute()); assertEquals(MockResult.class, proxy.getInvocation().getResult().getClass()); } http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java b/core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java index f6b9c19..e8bf7d1 100644 --- a/core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java @@ -44,14 +44,14 @@ public class ConfigurationTest extends XWorkTestCase { public void testAbstract() { try { - actionProxyFactory.createActionProxy("/abstract", "test", null); + actionProxyFactory.createActionProxy("/abstract", "test", null, null); fail(); } catch (Exception e) { // this is what we expected } try { - ActionProxy proxy = actionProxyFactory.createActionProxy("/nonAbstract", "test", null); + ActionProxy proxy = actionProxyFactory.createActionProxy("/nonAbstract", "test", null, null); assertTrue(proxy.getActionName().equals("test")); assertTrue(proxy.getConfig().getClassName().equals(SimpleAction.class.getName())); } catch (Exception e) { @@ -68,7 +68,7 @@ public class ConfigurationTest extends XWorkTestCase { extraContext.put(ActionContext.PARAMETERS, params); try { - ActionProxy proxy = actionProxyFactory.createActionProxy("/does/not/exist", "Foo", extraContext); + ActionProxy proxy = actionProxyFactory.createActionProxy("/does/not/exist", "Foo", null, extraContext); proxy.execute(); assertEquals("this is blah", proxy.getInvocation().getStack().findValue("[1].blah")); } catch (Exception e) { @@ -118,7 +118,7 @@ public class ConfigurationTest extends XWorkTestCase { public void testGlobalResults() { try { - ActionProxy proxy = actionProxyFactory.createActionProxy("", "Foo", null); + ActionProxy proxy = actionProxyFactory.createActionProxy("", "Foo", null, null); assertNotNull(proxy.getConfig().getResults().get("login")); } catch (Exception e) { e.printStackTrace(); @@ -128,7 +128,7 @@ public class ConfigurationTest extends XWorkTestCase { public void testInterceptorParamInehritanceOverride() { try { - ActionProxy proxy = actionProxyFactory.createActionProxy("/foo/bar", "TestInterceptorParamInehritanceOverride", null); + ActionProxy proxy = actionProxyFactory.createActionProxy("/foo/bar", "TestInterceptorParamInehritanceOverride", null, null); assertEquals(1, proxy.getConfig().getInterceptors().size()); MockInterceptor testInterceptor = (MockInterceptor) proxy.getConfig().getInterceptors().get(0).getInterceptor(); @@ -143,7 +143,7 @@ public class ConfigurationTest extends XWorkTestCase { public void testInterceptorParamInheritance() { try { - ActionProxy proxy = actionProxyFactory.createActionProxy("/foo/bar", "TestInterceptorParamInheritance", null); + ActionProxy proxy = actionProxyFactory.createActionProxy("/foo/bar", "TestInterceptorParamInheritance", null, null); assertEquals(1, proxy.getConfig().getInterceptors().size()); MockInterceptor testInterceptor = (MockInterceptor) proxy.getConfig().getInterceptors().get(0).getInterceptor(); @@ -158,7 +158,7 @@ public class ConfigurationTest extends XWorkTestCase { public void testInterceptorParamOverride() { try { - ActionProxy proxy = actionProxyFactory.createActionProxy("", "TestInterceptorParamOverride", null); + ActionProxy proxy = actionProxyFactory.createActionProxy("", "TestInterceptorParamOverride", null, null); assertEquals(1, proxy.getConfig().getInterceptors().size()); MockInterceptor testInterceptor = (MockInterceptor) proxy.getConfig().getInterceptors().get(0).getInterceptor(); @@ -173,7 +173,7 @@ public class ConfigurationTest extends XWorkTestCase { public void testInterceptorParams() { try { - ActionProxy proxy = actionProxyFactory.createActionProxy("", "TestInterceptorParam", null); + ActionProxy proxy = actionProxyFactory.createActionProxy("", "TestInterceptorParam", null, null); assertEquals(1, proxy.getConfig().getInterceptors().size()); MockInterceptor testInterceptor = (MockInterceptor) proxy.getConfig().getInterceptors().get(0).getInterceptor(); @@ -277,11 +277,11 @@ public class ConfigurationTest extends XWorkTestCase { public void testMultipleInheritance() { try { ActionProxy proxy; - proxy = actionProxyFactory.createActionProxy("multipleInheritance", "test", null); + proxy = actionProxyFactory.createActionProxy("multipleInheritance", "test", null, null); assertNotNull(proxy); - proxy = actionProxyFactory.createActionProxy("multipleInheritance", "Foo", null); + proxy = actionProxyFactory.createActionProxy("multipleInheritance", "Foo", null, null); assertNotNull(proxy); - proxy = actionProxyFactory.createActionProxy("multipleInheritance", "testMultipleInheritance", null); + proxy = actionProxyFactory.createActionProxy("multipleInheritance", "testMultipleInheritance", null, null); assertNotNull(proxy); assertEquals(5, proxy.getConfig().getInterceptors().size()); assertEquals(2, proxy.getConfig().getResults().size()); @@ -293,7 +293,7 @@ public class ConfigurationTest extends XWorkTestCase { public void testPackageExtension() { try { - ActionProxy proxy = actionProxyFactory.createActionProxy("/foo/bar", "Bar", null); + ActionProxy proxy = actionProxyFactory.createActionProxy("/foo/bar", "Bar", null, null); assertEquals(5, proxy.getConfig().getInterceptors().size()); } catch (Exception e) { e.printStackTrace(); http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/interceptor/AliasInterceptorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/interceptor/AliasInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/AliasInterceptorTest.java index 00077be..751f84a 100644 --- a/core/src/test/java/com/opensymphony/xwork2/interceptor/AliasInterceptorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/interceptor/AliasInterceptorTest.java @@ -49,7 +49,7 @@ public class AliasInterceptorTest extends XWorkTestCase { XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-sample.xml"); container.inject(provider); loadConfigurationProviders(provider); - ActionProxy proxy = actionProxyFactory.createActionProxy("", "aliasTest", params); + ActionProxy proxy = actionProxyFactory.createActionProxy("", "aliasTest", null, params); SimpleAction actionOne = (SimpleAction) proxy.getAction(); actionOne.setAliasSource("name to be copied"); actionOne.setFoo(17); http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/interceptor/PreResultListenerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/interceptor/PreResultListenerTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/PreResultListenerTest.java index 9682741..411b6af 100644 --- a/core/src/test/java/com/opensymphony/xwork2/interceptor/PreResultListenerTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/interceptor/PreResultListenerTest.java @@ -41,7 +41,7 @@ public class PreResultListenerTest extends XWorkTestCase { public void testPreResultListenersAreCalled() throws Exception { - ActionProxy proxy = actionProxyFactory.createActionProxy("package", "action", new HashMap<String, Object>(), false, true); + ActionProxy proxy = actionProxyFactory.createActionProxy("package", "action", null, new HashMap<String, Object>(), false, true); ActionInvocation invocation = proxy.getInvocation(); Mock preResultListenerMock1 = new Mock(PreResultListener.class); preResultListenerMock1.expect("beforeResult", C.args(C.eq(invocation), C.eq(Action.SUCCESS))); @@ -51,7 +51,7 @@ public class PreResultListenerTest extends XWorkTestCase { } public void testPreResultListenersAreCalledInOrder() throws Exception { - ActionProxy proxy = actionProxyFactory.createActionProxy("package", "action", new HashMap<String, Object>(), false, true); + ActionProxy proxy = actionProxyFactory.createActionProxy("package", "action", null, new HashMap<String, Object>(), false, true); ActionInvocation invocation = proxy.getInvocation(); CountPreResultListener listener1 = new CountPreResultListener(); CountPreResultListener listener2 = new CountPreResultListener(); @@ -84,8 +84,6 @@ public class PreResultListenerTest extends XWorkTestCase { /** * Tells whether the ConfigurationProvider should reload its configuration - * - * @return */ public boolean needsReload() { return false; http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java index e8b8d4f..7b39267 100644 --- a/core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java @@ -48,14 +48,14 @@ public class AnnotationWorkflowInterceptorTest extends XWorkTestCase { } public void testInterceptsBeforeAndAfter() throws Exception { - ActionProxy proxy = actionProxyFactory.createActionProxy("", ANNOTATED_ACTION, null); + ActionProxy proxy = actionProxyFactory.createActionProxy("", ANNOTATED_ACTION, null, null); assertEquals(Action.SUCCESS, proxy.execute()); AnnotatedAction action = (AnnotatedAction)proxy.getInvocation().getAction(); assertEquals("baseBefore-before-execute-beforeResult-after", action.log); } public void testInterceptsShortcircuitedAction() throws Exception { - ActionProxy proxy = actionProxyFactory.createActionProxy("", SHORTCIRCUITED_ACTION, null); + ActionProxy proxy = actionProxyFactory.createActionProxy("", SHORTCIRCUITED_ACTION, null, null); assertEquals("shortcircuit", proxy.execute()); ShortcircuitedAction action = (ShortcircuitedAction)proxy.getInvocation().getAction(); assertEquals("baseBefore-before", action.log); http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/spring/ActionsFromSpringTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/spring/ActionsFromSpringTest.java b/core/src/test/java/com/opensymphony/xwork2/spring/ActionsFromSpringTest.java index f6cbecd..fcb79a1 100644 --- a/core/src/test/java/com/opensymphony/xwork2/spring/ActionsFromSpringTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/spring/ActionsFromSpringTest.java @@ -26,7 +26,7 @@ public class ActionsFromSpringTest extends XWorkTestCase { } public void testLoadSimpleAction() throws Exception { - ActionProxy proxy = actionProxyFactory.createActionProxy(null, "simpleAction", null); + ActionProxy proxy = actionProxyFactory.createActionProxy(null, "simpleAction", null, null); Object action = proxy.getAction(); Action expected = (Action) appContext.getBean("simple-action"); @@ -35,19 +35,19 @@ public class ActionsFromSpringTest extends XWorkTestCase { } public void testLoadActionWithDependencies() throws Exception { - ActionProxy proxy = actionProxyFactory.createActionProxy(null, "dependencyAction", null); + ActionProxy proxy = actionProxyFactory.createActionProxy(null, "dependencyAction", null, null); SimpleAction action = (SimpleAction) proxy.getAction(); assertEquals("injected", action.getBlah()); } public void testProxiedActionIsNotStateful() throws Exception { - ActionProxy proxy = actionProxyFactory.createActionProxy(null, "proxiedAction", null); + ActionProxy proxy = actionProxyFactory.createActionProxy(null, "proxiedAction", null, null); SimpleAction action = (SimpleAction) proxy.getAction(); action.setBlah("Hello World"); - proxy = actionProxyFactory.createActionProxy(null, "proxiedAction", null); + proxy = actionProxyFactory.createActionProxy(null, "proxiedAction", null, null); action = (SimpleAction) proxy.getAction(); // If the action is a singleton, this test will fail @@ -60,7 +60,7 @@ public class ActionsFromSpringTest extends XWorkTestCase { } public void testAutoProxiedAction() throws Exception { - ActionProxy proxy = actionProxyFactory.createActionProxy(null, "autoProxiedAction", null); + ActionProxy proxy = actionProxyFactory.createActionProxy(null, "autoProxiedAction", null, null); SimpleAction action = (SimpleAction) proxy.getAction(); @@ -69,7 +69,7 @@ public class ActionsFromSpringTest extends XWorkTestCase { } public void testActionWithSpringResult() throws Exception { - ActionProxy proxy = actionProxyFactory.createActionProxy(null, "simpleActionSpringResult", null); + ActionProxy proxy = actionProxyFactory.createActionProxy(null, "simpleActionSpringResult", null, null); proxy.execute(); http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java b/core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java index 540b89d..1205852 100644 --- a/core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java @@ -20,7 +20,12 @@ import com.opensymphony.xwork2.*; import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider; import com.opensymphony.xwork2.test.ModelDrivenAction2; import com.opensymphony.xwork2.test.TestBean2; +import org.apache.struts2.util.DateFormatter; +import org.springframework.format.annotation.DateTimeFormat; +import javax.swing.text.Style; +import java.text.DateFormat; +import java.text.ParseException; import java.util.Date; import java.util.HashMap; import java.util.Locale; @@ -113,7 +118,7 @@ public class LocalizedTextUtilTest extends XWorkTestCase { public void testAddDefaultResourceBundle() { String text = LocalizedTextUtil.findDefaultText("foo.range", Locale.getDefault()); - assertNull("Found message when it should not be available.", null); + assertNull("Found message when it should not be available.", text); LocalizedTextUtil.addDefaultResourceBundle("com/opensymphony/xwork2/SimpleAction"); @@ -124,7 +129,7 @@ public class LocalizedTextUtilTest extends XWorkTestCase { public void testAddDefaultResourceBundle2() throws Exception { LocalizedTextUtil.addDefaultResourceBundle("com/opensymphony/xwork2/SimpleAction"); - ActionProxy proxy = actionProxyFactory.createActionProxy("/", "packagelessAction", new HashMap<String, Object>(), false, true); + ActionProxy proxy = actionProxyFactory.createActionProxy("/", "packagelessAction", null, new HashMap<String, Object>(), false, true); proxy.execute(); } @@ -191,12 +196,14 @@ public class LocalizedTextUtilTest extends XWorkTestCase { assertEquals("There is no Action mapped for namespace blah and action name AddUser.", message); } - public void testLocalizedDateFormatIsUsed() { + public void testLocalizedDateFormatIsUsed() throws ParseException { LocalizedTextUtil.addDefaultResourceBundle("com/opensymphony/xwork2/util/LocalizedTextUtilTest"); - Object[] params = new Object[]{new Date()}; + Date date = DateFormat.getDateInstance(DateFormat.SHORT, Locale.US).parse("01/01/2015"); + Object[] params = new Object[]{ date }; String usDate = LocalizedTextUtil.findDefaultText("test.format.date", Locale.US, params); String germanDate = LocalizedTextUtil.findDefaultText("test.format.date", Locale.GERMANY, params); - assertFalse(usDate.equals(germanDate)); + assertEquals(usDate, "1/1/15"); + assertEquals(germanDate, "01.01.15"); } public void testXW377() { http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/util/MyBeanActionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/util/MyBeanActionTest.java b/core/src/test/java/com/opensymphony/xwork2/util/MyBeanActionTest.java index 9289de6..0d8e6d9 100644 --- a/core/src/test/java/com/opensymphony/xwork2/util/MyBeanActionTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/util/MyBeanActionTest.java @@ -39,7 +39,7 @@ public class MyBeanActionTest extends XWorkTestCase { extraContext.put(ActionContext.PARAMETERS, params); try { - ActionProxy proxy = actionProxyFactory.createActionProxy("", "MyBean", extraContext); + ActionProxy proxy = actionProxyFactory.createActionProxy("", "MyBean", null, extraContext); proxy.execute(); assertEquals(2, Integer.parseInt(proxy.getInvocation().getStack().findValue("beanList.size").toString())); assertEquals(MyBean.class.getName(), proxy.getInvocation().getStack().findValue("beanList.get(0)").getClass().getName()); @@ -67,13 +67,12 @@ public class MyBeanActionTest extends XWorkTestCase { extraContext.put(ActionContext.PARAMETERS, params); try { - ActionProxy proxy = actionProxyFactory.createActionProxy("", "MyBean", extraContext); + ActionProxy proxy = actionProxyFactory.createActionProxy("", "MyBean", null, extraContext); proxy.execute(); MyBeanAction action = (MyBeanAction) proxy.getInvocation().getAction(); assertEquals(2, Integer.parseInt(proxy.getInvocation().getStack().findValue("beanMap.size").toString())); - Map map = (Map) proxy.getInvocation().getStack().findValue("beanMap"); assertEquals(true, action.getBeanMap().containsKey(1234567890L)); assertEquals(true, action.getBeanMap().containsKey(1234567891L)); http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java index ee05539..1169606 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java @@ -45,7 +45,7 @@ public class DateRangeValidatorTest extends XWorkTestCase { params.put("date", date.getTime()); context.put(ActionContext.PARAMETERS, params); - ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, context); + ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, null, context); proxy.execute(); assertTrue(((ValidationAware) proxy.getAction()).hasFieldErrors()); http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java index b506d8d..5fdbf40 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java @@ -29,7 +29,7 @@ public class DoubleRangeValidatorTest extends XWorkTestCase { params.put("percentage", 100.0123d); context.put(ActionContext.PARAMETERS, params); - ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, context); + ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, null, context); proxy.execute(); assertTrue(((ValidationAware) proxy.getAction()).hasFieldErrors()); @@ -50,13 +50,11 @@ public class DoubleRangeValidatorTest extends XWorkTestCase { params.put("percentage", 1.234567d); context.put(ActionContext.PARAMETERS, params); - ActionProxy proxy = actionProxyFactory.createActionProxy("", "percentage", context); + ActionProxy proxy = actionProxyFactory.createActionProxy("", "percentage", null, context); proxy.execute(); assertTrue(((ValidationAware) proxy.getAction()).hasFieldErrors()); Map<String, List<String>> errors = ((ValidationAware) proxy.getAction()).getFieldErrors(); - Iterator it = errors.entrySet().iterator(); - List<String> errorMessages = errors.get("percentage"); assertNull("Expected no double range validation error message.", errorMessages); } @@ -187,7 +185,7 @@ public class DoubleRangeValidatorTest extends XWorkTestCase { params.put("percentage", 100.0123d); context.put(ActionContext.PARAMETERS, params); - ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.EXPRESSION_VALIDATION_ACTION, context); + ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.EXPRESSION_VALIDATION_ACTION, null, context); proxy.execute(); assertTrue(((ValidationAware) proxy.getAction()).hasFieldErrors()); http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java index bf260c9..8dfc8cd 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java @@ -68,7 +68,7 @@ public class ExpressionValidatorTest extends XWorkTestCase { HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); - ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, extraContext); + ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, null, extraContext); proxy.execute(); assertTrue(((ValidationAware) proxy.getAction()).hasActionErrors()); @@ -81,7 +81,7 @@ public class ExpressionValidatorTest extends XWorkTestCase { } public void testExpressionValidatorSuccess() throws Exception { - HashMap<String, Object> params = new HashMap<String, Object>(); + HashMap<String, Object> params = new HashMap<>(); //make it not fail params.put("date", "12/23/2002"); @@ -91,12 +91,12 @@ public class ExpressionValidatorTest extends XWorkTestCase { HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); - ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, extraContext); + ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, null, extraContext); proxy.execute(); assertFalse(((ValidationAware) proxy.getAction()).hasActionErrors()); } - public void testGetSetExpresion() { + public void testGetSetExpression() { ExpressionValidator ev = new ExpressionValidator(); ev.setExpression("{top}"); assertEquals("{top}", ev.getExpression()); @@ -110,7 +110,7 @@ public class ExpressionValidatorTest extends XWorkTestCase { ev.setValidatorContext(new DelegatingValidatorContext(mock.proxy())); ev.setExpression("{top}"); ev.setValueStack(ActionContext.getContext().getValueStack()); - ev.validate("Hello"); // {top} will evalute to Hello that is not a Boolean + ev.validate("Hello"); // {top} will evaluate to Hello that is not a Boolean mock.verify(); } http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java index 0ec7ac9..d096e1e 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java @@ -44,7 +44,7 @@ public class IntRangeValidatorTest extends XWorkTestCase { extraContext.put(ActionContext.PARAMETERS, params); try { - ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, extraContext); + ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, null, extraContext); proxy.execute(); assertTrue(((ValidationAware) proxy.getAction()).hasFieldErrors()); http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java index 78b8f9a..5d10079 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java @@ -42,7 +42,7 @@ public class LongRangeValidatorTest extends XWorkTestCase { extraContext.put(ActionContext.PARAMETERS, params); try { - ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, extraContext); + ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, null, extraContext); proxy.execute(); assertTrue(((ValidationAware) proxy.getAction()).hasFieldErrors()); http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java index 1ced1f5..50d8f5d 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java @@ -41,7 +41,7 @@ public class ModelDrivenValidationTest extends XWorkTestCase { XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-sample.xml"); container.inject(provider); loadConfigurationProviders(provider); - ActionProxy proxy = actionProxyFactory.createActionProxy(null, "TestModelDrivenValidation", context); + ActionProxy proxy = actionProxyFactory.createActionProxy(null, "TestModelDrivenValidation", null, context); assertEquals(Action.SUCCESS, proxy.execute()); ModelDrivenAction action = (ModelDrivenAction) proxy.getAction(); http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java index 1861271..123ad3b 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java @@ -42,7 +42,7 @@ public class ShortRangeValidatorTest extends XWorkTestCase { extraContext.put(ActionContext.PARAMETERS, params); try { - ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, extraContext); + ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, null, extraContext); proxy.execute(); assertTrue(((ValidationAware) proxy.getAction()).hasFieldErrors()); http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java index 19094c2..d5433e0 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java @@ -43,11 +43,11 @@ public class SimpleActionValidationTest extends XWorkTestCase { params.put("date", "12/23/2002"); params.put("percentage", "1.23456789"); - HashMap<String, Object> extraContext = new HashMap<String, Object>(); + HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); try { - ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, extraContext); + ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, null, extraContext); proxy.execute(); ValidationAware validationAware = (ValidationAware) proxy.getAction(); @@ -56,7 +56,7 @@ public class SimpleActionValidationTest extends XWorkTestCase { // put in an out-of-range value to see if the old validators still work ActionContext.setContext(new ActionContext(new HashMap<String, Object>())); params.put("bar", "42"); - proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ALIAS_NAME, extraContext); + proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ALIAS_NAME, null, extraContext); proxy.execute(); validationAware = (ValidationAware) proxy.getAction(); assertTrue(validationAware.hasFieldErrors()); @@ -94,7 +94,7 @@ public class SimpleActionValidationTest extends XWorkTestCase { extraContext.put(ActionContext.PARAMETERS, params); try { - ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, extraContext); + ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, null, extraContext); proxy.execute(); assertTrue(((ValidationAware) proxy.getAction()).hasFieldErrors()); @@ -119,7 +119,7 @@ public class SimpleActionValidationTest extends XWorkTestCase { extraContext.put(ActionContext.PARAMETERS, params); try { - ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, extraContext); + ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, null, extraContext); ValueStack stack = ActionContext.getContext().getValueStack(); ActionContext.setContext(new ActionContext(stack.getContext())); ActionContext.getContext().setLocale(Locale.US); @@ -168,7 +168,7 @@ public class SimpleActionValidationTest extends XWorkTestCase { extraContext.put(ActionContext.PARAMETERS, params); try { - ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, extraContext); + ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, null, extraContext); proxy.execute(); assertTrue(((ValidationAware) proxy.getAction()).hasFieldErrors()); @@ -203,7 +203,7 @@ public class SimpleActionValidationTest extends XWorkTestCase { extraContext.put(ActionContext.PARAMETERS, params); try { - ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_SUBPROPERTY_NAME, extraContext); + ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_SUBPROPERTY_NAME, null, extraContext); proxy.execute(); assertTrue(((ValidationAware) proxy.getAction()).hasFieldErrors()); http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java ---------------------------------------------------------------------- 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 009dbb7..acd6844 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java @@ -25,7 +25,7 @@ public class ValidatorAnnotationTest extends XWorkTestCase { HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); - ActionProxy proxy = actionProxyFactory.createActionProxy("", "notAnnotatedMethod", extraContext); + ActionProxy proxy = actionProxyFactory.createActionProxy("", "notAnnotatedMethod", null, extraContext); proxy.execute(); assertFalse(((ValidationAware) proxy.getAction()).hasActionErrors()); @@ -34,12 +34,11 @@ public class ValidatorAnnotationTest extends XWorkTestCase { } public void testNotAnnotatedMethodSuccess2() throws Exception { - HashMap<String, Object> params = new HashMap<>(); HashMap<String, Object> extraContext = new HashMap<>(); - extraContext.put(ActionContext.PARAMETERS, params); + extraContext.put(ActionContext.PARAMETERS, new HashMap<String, Object>()); - ActionProxy proxy = actionProxyFactory.createActionProxy("", "notAnnotatedMethod", extraContext); + ActionProxy proxy = actionProxyFactory.createActionProxy("", "notAnnotatedMethod", null, extraContext); proxy.execute(); assertFalse(((ValidationAware) proxy.getAction()).hasActionErrors()); @@ -48,12 +47,11 @@ public class ValidatorAnnotationTest extends XWorkTestCase { } public void testAnnotatedMethodFailure() throws Exception { - HashMap<String, Object> params = new HashMap<>(); HashMap<String, Object> extraContext = new HashMap<>(); - extraContext.put(ActionContext.PARAMETERS, params); + extraContext.put(ActionContext.PARAMETERS, new HashMap<String, Object>()); - ActionProxy proxy = actionProxyFactory.createActionProxy("", "annotatedMethod", extraContext); + ActionProxy proxy = actionProxyFactory.createActionProxy("", "annotatedMethod", null, extraContext); proxy.execute(); assertTrue(((ValidationAware) proxy.getAction()).hasActionErrors()); Collection errors = ((ValidationAware) proxy.getAction()).getActionErrors(); @@ -73,7 +71,7 @@ public class ValidatorAnnotationTest extends XWorkTestCase { HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); - ActionProxy proxy = actionProxyFactory.createActionProxy("", "annotatedMethod", extraContext); + ActionProxy proxy = actionProxyFactory.createActionProxy("", "annotatedMethod", null, extraContext); proxy.execute(); assertFalse(((ValidationAware) proxy.getAction()).hasActionErrors()); } @@ -87,7 +85,7 @@ public class ValidatorAnnotationTest extends XWorkTestCase { HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); - ActionProxy proxy = actionProxyFactory.createActionProxy("", "annotatedMethod", extraContext); + ActionProxy proxy = actionProxyFactory.createActionProxy("", "annotatedMethod", null, extraContext); proxy.execute(); assertFalse(((ValidationAware) proxy.getAction()).hasActionErrors()); } @@ -101,7 +99,7 @@ public class ValidatorAnnotationTest extends XWorkTestCase { HashMap<String, Object> extraContext = new HashMap<>(); extraContext.put(ActionContext.PARAMETERS, params); - ActionProxy proxy = actionProxyFactory.createActionProxy("", "annotatedMethod", extraContext); + ActionProxy proxy = actionProxyFactory.createActionProxy("", "annotatedMethod", null, extraContext); proxy.execute(); assertFalse(((ValidationAware) proxy.getAction()).hasActionErrors()); } http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java ---------------------------------------------------------------------- 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 fb812a1..1b60f38 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java @@ -126,6 +126,6 @@ public class TokenInterceptorTest extends StrutsInternalTestCase { } protected ActionProxy buildProxy(String actionName) throws Exception { - return actionProxyFactory.createActionProxy("", actionName, extraContext, true, true); + return actionProxyFactory.createActionProxy("", actionName, null, extraContext, true, true); } } http://git-wip-us.apache.org/repos/asf/struts/blob/a4abb347/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java index 50bf576..fb82be2 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java @@ -571,7 +571,7 @@ public class URLTagTest extends AbstractUITagTest { ActionContext.getContext().setActionInvocation(new DefaultActionInvocation(null, true)); DefaultActionProxyFactory apFactory = new DefaultActionProxyFactory(); apFactory.setContainer(container); - ActionProxy ap = apFactory.createActionProxy("/", "hello", null); + ActionProxy ap = apFactory.createActionProxy("/", "hello", null, null); ActionContext.getContext().getActionInvocation().init(ap); request.setScheme("http");
