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 2014/05/14 08:28:01 UTC
[50/50] [abbrv] git commit: Updates tests to match new requirements
Updates tests to match new requirements
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/83b76b0f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/83b76b0f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/83b76b0f
Branch: refs/heads/feature/exclude-object-class
Commit: 83b76b0fe83411d93dc2c534c8c47dc53f0dca82
Parents: d1d81f8
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed May 14 08:26:43 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed May 14 08:26:43 2014 +0200
----------------------------------------------------------------------
.../org/apache/struts2/TestConfigurationProvider.java | 5 +++++
xwork-core/src/test/resources/xwork-class-param-test.xml | 11 +++++++++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/83b76b0f/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
index cd42ed5..9323f02 100644
--- a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
+++ b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
@@ -24,6 +24,8 @@ package org.apache.struts2;
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.DefaultActionProxyFactory;
+import com.opensymphony.xwork2.DefaultExcludedPatternsChecker;
+import com.opensymphony.xwork2.ExcludedPatternsChecker;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.ConfigurationException;
@@ -164,5 +166,8 @@ public class TestConfigurationProvider implements ConfigurationProvider {
if (!builder.contains(ActionProxyFactory.class)) {
builder.factory(ActionProxyFactory.class, DefaultActionProxyFactory.class);
}
+ if (!builder.contains(ExcludedPatternsChecker.class)) {
+ builder.factory(ExcludedPatternsChecker.class, DefaultExcludedPatternsChecker.class);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/83b76b0f/xwork-core/src/test/resources/xwork-class-param-test.xml
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/resources/xwork-class-param-test.xml b/xwork-core/src/test/resources/xwork-class-param-test.xml
new file mode 100644
index 0000000..f12c083
--- /dev/null
+++ b/xwork-core/src/test/resources/xwork-class-param-test.xml
@@ -0,0 +1,11 @@
+<!DOCTYPE xwork PUBLIC
+ "-//Apache Struts//XWork 2.0//EN"
+ "http://struts.apache.org/dtds/xwork-2.0.dtd">
+
+<xwork>
+
+ <constant name="devMode" value="true" />
+ <constant name="ognlExcludedClasses" value="java.lang.Object,java.lang.Runtime" />
+ <constant name="overrideExcludedPatterns" value="not-existing-pattern"/>
+
+</xwork>
\ No newline at end of file