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 2016/01/05 08:16:46 UTC
struts git commit: WW-3710 Adds test to proof support for wildcards
in
Repository: struts
Updated Branches:
refs/heads/master 110d63fed -> d862d5b96
WW-3710 Adds test to proof support for wildcards in <include/>
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d862d5b9
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d862d5b9
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d862d5b9
Branch: refs/heads/master
Commit: d862d5b96def2b571e26bc8b2ccfbd69cdae3681
Parents: 110d63f
Author: Lukasz Lenart <lu...@apache.org>
Authored: Tue Jan 5 08:16:26 2016 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Tue Jan 5 08:16:26 2016 +0100
----------------------------------------------------------------------
.../providers/XmlConfigurationProviderTest.java | 16 ++++++++++++++++
.../providers/xwork-test-include-wildcard.xml | 8 ++++++++
2 files changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/d862d5b9/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
index b161d02..6d324cf 100644
--- a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
@@ -31,6 +31,7 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
public class XmlConfigurationProviderTest extends ConfigurationTestBase {
@@ -198,4 +199,19 @@ public class XmlConfigurationProviderTest extends ConfigurationTestBase {
assertTrue(!provider.needsReload());
}
+ public void testIncludeWithWildcard() throws Exception {
+ String configFile = "com/opensymphony/xwork2/config/providers/xwork-test-include-wildcard.xml";
+ buildConfigurationProvider(configFile);
+
+ Set<String> loadedFileNames = configuration.getLoadedFileNames();
+ assertEquals(8, loadedFileNames.size());
+ assertTrue(loadedFileNames.contains("com/opensymphony/xwork2/config/providers/xwork-include-after-package.xml"));
+ assertTrue(loadedFileNames.contains("com/opensymphony/xwork2/config/providers/xwork-include-after-package-2.xml"));
+ assertTrue(loadedFileNames.contains("com/opensymphony/xwork2/config/providers/xwork-include-before-package.xml"));
+ assertTrue(loadedFileNames.contains("com/opensymphony/xwork2/config/providers/xwork-include-before-package-2.xml"));
+ assertTrue(loadedFileNames.contains("com/opensymphony/xwork2/config/providers/xwork-include-parent.xml"));
+ assertTrue(loadedFileNames.contains("com/opensymphony/xwork2/config/providers/xwork-test-include-wildcard.xml"));
+ assertTrue(loadedFileNames.contains("xwork-test-beans.xml"));
+ assertTrue(loadedFileNames.contains("xwork-test-default.xml"));
+ }
}
http://git-wip-us.apache.org/repos/asf/struts/blob/d862d5b9/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-include-wildcard.xml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-include-wildcard.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-include-wildcard.xml
new file mode 100644
index 0000000..6bf5cc6
--- /dev/null
+++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-include-wildcard.xml
@@ -0,0 +1,8 @@
+<!DOCTYPE xwork PUBLIC
+ "-//Apache Struts//XWork 2.1//EN"
+ "http://struts.apache.org/dtds/xwork-2.1.dtd"
+ >
+
+<xwork>
+ <include file="com/opensymphony/xwork2/config/providers/xwork-include-*.xml"/>
+</xwork>