You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2015/09/28 20:52:57 UTC
[08/33] struts git commit: Fixes tests
Fixes tests
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c1928ad0
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c1928ad0
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c1928ad0
Branch: refs/heads/master
Commit: c1928ad06bdfbe245b1ed7d5bfeb07ed9bface37
Parents: c3f4457
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon Aug 31 18:36:04 2015 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon Aug 31 18:36:04 2015 +0200
----------------------------------------------------------------------
.../XmlConfigurationProviderAllowedMethodsTest.java | 14 +++++++-------
.../config/providers/xwork-test-allowed-methods.xml | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/c1928ad0/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderAllowedMethodsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderAllowedMethodsTest.java b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderAllowedMethodsTest.java
index 6a55e75..11f779a 100644
--- a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderAllowedMethodsTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderAllowedMethodsTest.java
@@ -27,12 +27,12 @@ public class XmlConfigurationProviderAllowedMethodsTest extends ConfigurationTes
assertEquals(5, actionConfigs.size());
ActionConfig action = (ActionConfig) actionConfigs.get("Default");
- assertEquals(1, action.getAllowedMethods().size());
+ assertEquals(0, action.getAllowedMethods().size());
assertTrue(action.isAllowedMethod("execute"));
- assertTrue(action.isAllowedMethod("foo"));
- assertTrue(action.isAllowedMethod("bar"));
- assertTrue(action.isAllowedMethod("baz"));
- assertTrue(action.isAllowedMethod("xyz"));
+ assertFalse(action.isAllowedMethod("foo"));
+ assertFalse(action.isAllowedMethod("bar"));
+ assertFalse(action.isAllowedMethod("baz"));
+ assertFalse(action.isAllowedMethod("xyz"));
action = (ActionConfig) actionConfigs.get("Boring");
assertEquals(0, action.getAllowedMethods().size());
@@ -59,7 +59,7 @@ public class XmlConfigurationProviderAllowedMethodsTest extends ConfigurationTes
assertFalse(action.isAllowedMethod("xyz"));
action = (ActionConfig) actionConfigs.get("Baz");
- assertEquals(2, action.getAllowedMethods().size());
+ assertEquals(3, action.getAllowedMethods().size());
assertFalse(action.isAllowedMethod("execute"));
assertTrue(action.isAllowedMethod("foo"));
assertTrue(action.isAllowedMethod("bar"));
@@ -114,7 +114,7 @@ public class XmlConfigurationProviderAllowedMethodsTest extends ConfigurationTes
assertFalse(action.isAllowedMethod("xyz"));
action = (ActionConfig) actionConfigs.get("Baz");
- assertEquals(2, action.getAllowedMethods().size());
+ assertEquals(3, action.getAllowedMethods().size());
assertFalse(action.isAllowedMethod("execute"));
assertTrue(action.isAllowedMethod("foo"));
assertTrue(action.isAllowedMethod("bar"));
http://git-wip-us.apache.org/repos/asf/struts/blob/c1928ad0/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml
index 7851408..4059d62 100644
--- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml
@@ -25,7 +25,7 @@
</action>
</package>
- <package name="strict" strict-method-invocation="true">
+ <package name="strict">
<action name="Default">
</action>