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 b161d02ab..6d324cf2f 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 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")); + } } 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 000000000..6bf5cc695 --- /dev/null +++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-include-wildcard.xml @@ -0,0 +1,8 @@ + + + + +