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 2012/04/17 07:03:48 UTC
svn commit: r1326928 [2/2] - in /struts/struts2/trunk:
core/src/main/java/org/apache/struts2/
core/src/main/java/org/apache/struts2/config/
core/src/main/java/org/apache/struts2/dispatcher/
core/src/main/java/org/apache/struts2/views/freemarker/ core/s...
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/ChainResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/ChainResultTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/ChainResultTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/ChainResultTest.java Tue Apr 17 05:03:45 2012
@@ -40,7 +40,9 @@ public class ChainResultTest extends XWo
super.setUp();
// ensure we're using the default configuration, not simple config
- loadConfigurationProviders(new XmlConfigurationProvider("xwork-sample.xml"));
+ XmlConfigurationProvider configurationProvider = new XmlConfigurationProvider("xwork-sample.xml");
+ container.inject(configurationProvider);
+ loadConfigurationProviders(configurationProvider);
}
public void testNamespaceAndActionExpressionEvaluation() throws Exception {
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/DefaultClasstTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/DefaultClasstTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/DefaultClasstTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/DefaultClasstTest.java Tue Apr 17 05:03:45 2012
@@ -31,7 +31,9 @@ public class DefaultClasstTest extends X
super.setUp();
// ensure we're using the default configuration, not simple config
- loadConfigurationProviders(new XmlConfigurationProvider("xwork-sample.xml"));
+ XmlConfigurationProvider configurationProvider = new XmlConfigurationProvider("xwork-sample.xml");
+ container.inject(configurationProvider);
+ loadConfigurationProviders(configurationProvider);
}
public void testWildCardEvaluation() throws Exception {
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/LocaleAwareTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/LocaleAwareTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/LocaleAwareTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/LocaleAwareTest.java Tue Apr 17 05:03:45 2012
@@ -59,7 +59,10 @@ public class LocaleAwareTest extends XWo
@Override
protected void setUp() throws Exception {
- loadConfigurationProviders(new XmlConfigurationProvider("xwork-test-beans.xml"), new MockConfigurationProvider());
+ super.setUp();
+ XmlConfigurationProvider configurationProvider = new XmlConfigurationProvider("xwork-test-beans.xml");
+ container.inject(configurationProvider);
+ loadConfigurationProviders(configurationProvider, new MockConfigurationProvider());
ValueStack stack = container.getInstance(ValueStackFactory.class).createValueStack();
stack.getContext().put(ActionContext.CONTAINER, container);
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationTest.java Tue Apr 17 05:03:45 2012
@@ -44,6 +44,8 @@ public class ProxyInvocationTest extends
super.setUp();
// ensure we're using the default configuration, not simple config
- loadConfigurationProviders(new XmlConfigurationProvider("xwork-proxyinvoke.xml"));
+ XmlConfigurationProvider configurationProvider = new XmlConfigurationProvider("xwork-proxyinvoke.xml");
+ container.inject(configurationProvider);
+ loadConfigurationProviders(configurationProvider);
}
}
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/WildCardResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/WildCardResultTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/WildCardResultTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/WildCardResultTest.java Tue Apr 17 05:03:45 2012
@@ -32,7 +32,9 @@ public class WildCardResultTest extends
super.setUp();
// ensure we're using the default configuration, not simple config
- loadConfigurationProviders(new XmlConfigurationProvider("xwork-sample.xml"));
+ XmlConfigurationProvider configurationProvider = new XmlConfigurationProvider("xwork-sample.xml");
+ container.inject(configurationProvider);
+ loadConfigurationProviders(configurationProvider);
}
public void testWildCardEvaluation() throws Exception {
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationManagerTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationManagerTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationManagerTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationManagerTest.java Tue Apr 17 05:03:45 2012
@@ -19,10 +19,10 @@ package com.opensymphony.xwork2.config;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
+import com.opensymphony.xwork2.FileManager;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.config.providers.XWorkConfigurationProvider;
import com.opensymphony.xwork2.inject.ContainerBuilder;
-import com.opensymphony.xwork2.util.FileManager;
import com.opensymphony.xwork2.util.location.LocatableProperties;
import java.util.Properties;
@@ -37,11 +37,10 @@ import java.util.Properties;
public class ConfigurationManagerTest extends XWorkTestCase {
Mock configProviderMock;
-
+ private FileManager fileManager;
+ private Configuration configuration;
public void testConfigurationReload() {
- FileManager.setReloadingConfigs(true);
-
// now check that it reloads
configProviderMock.expectAndReturn("needsReload", Boolean.TRUE);
configProviderMock.expect("init", C.isA(Configuration.class));
@@ -49,7 +48,8 @@ public class ConfigurationManagerTest ex
configProviderMock.expect("loadPackages", C.ANY_ARGS);
configProviderMock.expect("destroy", C.ANY_ARGS);
configProviderMock.matchAndReturn("toString", "mock");
- configurationManager.getConfiguration();
+ configuration.getContainer().getInstance(FileManager.class).setReloadingConfigs(true);
+ configuration = configurationManager.getConfiguration();
configProviderMock.verify();
// this will be called in teardown
@@ -57,10 +57,10 @@ public class ConfigurationManagerTest ex
}
public void testNoConfigurationReload() {
- FileManager.setReloadingConfigs(false);
-
// now check that it doesn't try to reload
- configurationManager.getConfiguration();
+ configuration.getContainer().getInstance(FileManager.class).setReloadingConfigs(false);
+ configuration = configurationManager.getConfiguration();
+
configProviderMock.verify();
// this will be called in teardown
@@ -162,20 +162,20 @@ public class ConfigurationManagerTest ex
ConfigurationProvider mockProvider = (ConfigurationProvider) configProviderMock.proxy();
configurationManager.addContainerProvider(new XWorkConfigurationProvider());
configurationManager.addContainerProvider(mockProvider);
-
+
//the first time it always inits
configProviderMock.expect("init", C.isA(Configuration.class));
configProviderMock.expect("register", C.ANY_ARGS);
configProviderMock.expect("loadPackages", C.ANY_ARGS);
configProviderMock.matchAndReturn("toString", "mock");
-
- configurationManager.getConfiguration();
+
+ configuration = configurationManager.getConfiguration();
}
@Override
protected void tearDown() throws Exception {
configProviderMock.expect("destroy");
- FileManager.setReloadingConfigs(true);
super.tearDown();
}
+
}
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java Tue Apr 17 05:03:45 2012
@@ -207,7 +207,11 @@ public class ConfigurationTest extends X
}
public void testMultipleContainerProviders() throws Exception {
- System.out.println("-----");
+ // to start from scratch
+ configurationManager.destroyConfiguration();
+ // to build basic configuration
+ configurationManager.getConfiguration();
+
Mock mockContainerProvider = new Mock(ContainerProvider.class);
mockContainerProvider.expect("init", C.ANY_ARGS);
mockContainerProvider.expect("register", C.ANY_ARGS);
@@ -215,7 +219,11 @@ public class ConfigurationTest extends X
mockContainerProvider.matchAndReturn("toString", "foo");
mockContainerProvider.matchAndReturn("destroy", null);
mockContainerProvider.expectAndReturn("needsReload", true);
+ // the order of providers must be changed as just first is checked if reload is needed
configurationManager.addContainerProvider((ContainerProvider) mockContainerProvider.proxy());
+ XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-sample.xml");
+ container.inject(provider);
+ configurationManager.addContainerProvider(provider);
Configuration config = null;
try {
@@ -225,13 +233,11 @@ public class ConfigurationTest extends X
fail();
}
-
RuntimeConfiguration configuration = config.getRuntimeConfiguration();
// check that it has configuration from xml
assertNotNull(configuration.getActionConfig("/foo/bar", "Bar"));
- System.out.println("-----");
mockContainerProvider.verify();
}
@@ -302,9 +308,11 @@ public class ConfigurationTest extends X
super.setUp();
// ensure we're using the default configuration, not simple config
- loadConfigurationProviders(new XmlConfigurationProvider("xwork-sample.xml"));
+ XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-sample.xml");
+ container.inject(provider);
+ loadConfigurationProviders(provider);
}
-
+
public static class MyPackageProvider implements PackageProvider {
static Configuration config;
public void loadPackages() throws ConfigurationException {}
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationTestBase.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationTestBase.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationTestBase.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationTestBase.java Tue Apr 17 05:03:45 2012
@@ -15,6 +15,7 @@
*/
package com.opensymphony.xwork2.config.providers;
+import com.opensymphony.xwork2.FileManager;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.config.ConfigurationProvider;
@@ -36,6 +37,7 @@ public abstract class ConfigurationTestB
XmlConfigurationProvider prov = new XmlConfigurationProvider(filename, true);
prov.setObjectFactory(container.getInstance(ObjectFactory.class));
+ prov.setFileManager(container.getInstance(FileManager.class));
prov.init(configuration);
prov.loadPackages();
return prov;
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorParamOverridingTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorParamOverridingTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorParamOverridingTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorParamOverridingTest.java Tue Apr 17 05:03:45 2012
@@ -21,6 +21,7 @@ import com.opensymphony.xwork2.config.Ru
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.config.entities.InterceptorMapping;
import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
+import com.opensymphony.xwork2.util.fs.DefaultFileManager;
import java.util.ArrayList;
import java.util.List;
@@ -34,6 +35,7 @@ public class XmlConfigurationProviderInt
public void testInterceptorParamOveriding() throws Exception {
DefaultConfiguration conf = new DefaultConfiguration();
final XmlConfigurationProvider p = new XmlConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-interceptor-param-overriding.xml");
+ p.setFileManager(new DefaultFileManager());
conf.reload(new ArrayList<ConfigurationProvider>() {
{
add(new XWorkConfigurationProvider());
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorStackParamOverridingTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorStackParamOverridingTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorStackParamOverridingTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorStackParamOverridingTest.java Tue Apr 17 05:03:45 2012
@@ -6,6 +6,7 @@ import com.opensymphony.xwork2.config.Ru
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.config.entities.InterceptorMapping;
import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
+import com.opensymphony.xwork2.util.fs.DefaultFileManager;
import java.util.ArrayList;
import java.util.List;
@@ -21,6 +22,7 @@ public class XmlConfigurationProviderInt
public void testInterceptorStackParamOveriding() throws Exception {
DefaultConfiguration conf = new DefaultConfiguration();
final XmlConfigurationProvider p = new XmlConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-interceptor-stack-param-overriding.xml");
+ p.setFileManager(new DefaultFileManager());
configurationManager.addContainerProvider(p);
conf.reload(new ArrayList<ConfigurationProvider>(){
{
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorsTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorsTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorsTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorsTest.java Tue Apr 17 05:03:45 2012
@@ -97,7 +97,9 @@ public class XmlConfigurationProviderInt
}
public void testInterceptorDefaultRefs() throws ConfigurationException {
- loadConfigurationProviders(new XmlConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-interceptor-defaultref.xml"));
+ XmlConfigurationProvider provider = new XmlConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-interceptor-defaultref.xml");
+ container.inject(provider);
+ loadConfigurationProviders(provider);
// expectations - the inherited interceptor stack
// default package
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java Tue Apr 17 05:03:45 2012
@@ -15,13 +15,13 @@
*/
package com.opensymphony.xwork2.config.providers;
+import com.opensymphony.xwork2.FileManager;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.config.ConfigurationProvider;
import com.opensymphony.xwork2.config.RuntimeConfiguration;
import com.opensymphony.xwork2.config.entities.PackageConfig;
import com.opensymphony.xwork2.config.impl.MockConfiguration;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
-import com.opensymphony.xwork2.util.FileManager;
import org.w3c.dom.Document;
import java.io.File;
@@ -51,6 +51,7 @@ public class XmlConfigurationProviderTes
}
};
prov.setObjectFactory(container.getInstance(ObjectFactory.class));
+ prov.setFileManager(container.getInstance(FileManager.class));
prov.init(configuration);
List<Document> docs = prov.getDocuments();
assertEquals(3, docs.size());
@@ -73,7 +74,7 @@ public class XmlConfigurationProviderTes
}
public void testNeedsReload() throws Exception {
- FileManager.setReloadingConfigs(true);
+ container.getInstance(FileManager.class).setReloadingConfigs(true);
final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-actions.xml";
ConfigurationProvider provider = buildConfigurationProvider(filename);
@@ -149,7 +150,7 @@ public class XmlConfigurationProviderTes
public void testEmptySpaces() throws Exception {
final String filename = "com/opensymphony/xwork2/config/providers/xwork- test.xml";
- FileManager.setReloadingConfigs(true);
+ container.getInstance(FileManager.class).setReloadingConfigs(true);
ConfigurationProvider provider = buildConfigurationProvider(filename);
assertTrue(!provider.needsReload());
@@ -165,7 +166,7 @@ public class XmlConfigurationProviderTes
}
public void testConfigsInJarFiles() throws Exception {
- FileManager.setReloadingConfigs(true);
+ container.getInstance(FileManager.class).setReloadingConfigs(true);
testProvider("xwork-jar.xml");
testProvider("xwork-zip.xml");
testProvider("xwork - jar.xml");
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/AliasInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/AliasInterceptorTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/AliasInterceptorTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/AliasInterceptorTest.java Tue Apr 17 05:03:45 2012
@@ -46,7 +46,9 @@ public class AliasInterceptorTest extend
Map<String, Object> params = new HashMap<String, Object>();
params.put("aliasSource", "source here");
- loadConfigurationProviders(new XmlConfigurationProvider("xwork-sample.xml"));
+ XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-sample.xml");
+ container.inject(provider);
+ loadConfigurationProviders(provider);
ActionProxy proxy = actionProxyFactory.createActionProxy("", "aliasTest", params);
SimpleAction actionOne = (SimpleAction) proxy.getAction();
actionOne.setAliasSource("name to be copied");
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java Tue Apr 17 05:03:45 2012
@@ -339,7 +339,9 @@ public class ParametersInterceptorTest e
}
public void testNonexistentParametersGetLoggedInDevMode() throws Exception {
- loadConfigurationProviders(new XmlConfigurationProvider("xwork-test-beans.xml"),
+ XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-test-beans.xml");
+ container.inject(provider);
+ loadConfigurationProviders(provider,
new MockConfigurationProvider(Collections.singletonMap("devMode", "true")));
Map<String, Object> params = new HashMap<String, Object>();
params.put("not_a_property", "There is no action property named like this");
@@ -357,7 +359,9 @@ public class ParametersInterceptorTest e
}
public void testNonexistentParametersAreIgnoredInProductionMode() throws Exception {
- loadConfigurationProviders(new XmlConfigurationProvider("xwork-test-beans.xml"),
+ XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-test-beans.xml");
+ container.inject(provider);
+ loadConfigurationProviders(provider,
new MockConfigurationProvider(Collections.singletonMap("devMode", "false")));
Map<String, Object> params = new HashMap<String, Object>();
params.put("not_a_property", "There is no action property named like this");
@@ -571,7 +575,9 @@ public class ParametersInterceptorTest e
@Override
protected void setUp() throws Exception {
super.setUp();
- loadConfigurationProviders(new XmlConfigurationProvider("xwork-test-beans.xml"), new MockConfigurationProvider());
+ XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-test-beans.xml");
+ container.inject(provider);
+ loadConfigurationProviders(provider, new MockConfigurationProvider());
ActionConfig config = configuration.getRuntimeConfiguration().getActionConfig("", MockConfigurationProvider.PARAM_INTERCEPTOR_ACTION_NAME);
container.inject(config.getInterceptors().get(0).getInterceptor());
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java Tue Apr 17 05:03:45 2012
@@ -40,8 +40,11 @@ public class AnnotationWorkflowIntercept
private final AnnotationWorkflowInterceptor annotationWorkflow = new AnnotationWorkflowInterceptor();
@Override
- public void setUp() {
- loadConfigurationProviders(new XmlConfigurationProvider("xwork-default.xml"), new MockConfigurationProvider());
+ public void setUp() throws Exception{
+ super.setUp();
+ XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-default.xml");
+ container.inject(provider);
+ loadConfigurationProviders(provider, new MockConfigurationProvider());
}
public void testInterceptsBeforeAndAfter() throws Exception {
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/spring/ActionsFromSpringTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/spring/ActionsFromSpringTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/spring/ActionsFromSpringTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/spring/ActionsFromSpringTest.java Tue Apr 17 05:03:45 2012
@@ -19,7 +19,9 @@ public class ActionsFromSpringTest exten
super.setUp();
// Set up XWork
- loadConfigurationProviders(new XmlConfigurationProvider("com/opensymphony/xwork2/spring/actionContext-xwork.xml"));
+ XmlConfigurationProvider provider = new XmlConfigurationProvider("com/opensymphony/xwork2/spring/actionContext-xwork.xml");
+ container.inject(provider);
+ loadConfigurationProviders(provider);
appContext = ((SpringObjectFactory)container.getInstance(ObjectFactory.class)).appContext;
}
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/spring/interceptor/ActionAutowiringInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/spring/interceptor/ActionAutowiringInterceptorTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/spring/interceptor/ActionAutowiringInterceptorTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/spring/interceptor/ActionAutowiringInterceptorTest.java Tue Apr 17 05:03:45 2012
@@ -38,8 +38,10 @@ public class ActionAutowiringInterceptor
public void testSetAutowireType() throws Exception {
XmlConfigurationProvider prov = new XmlConfigurationProvider("xwork-default.xml");
+ container.inject(prov);
prov.setThrowExceptionOnDuplicateBeans(false);
XmlConfigurationProvider c = new XmlConfigurationProvider("com/opensymphony/xwork2/spring/xwork-autowire.xml");
+ container.inject(c);
loadConfigurationProviders(c, prov);
StaticWebApplicationContext appContext = new StaticWebApplicationContext();
Copied: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java (from r1326063, struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/FileManagerTest.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java?p2=struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java&p1=struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/FileManagerTest.java&r1=1326063&r2=1326928&rev=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/FileManagerTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java Tue Apr 17 05:03:45 2012
@@ -1,5 +1,6 @@
package com.opensymphony.xwork2.util;
+import com.opensymphony.xwork2.FileManager;
import com.opensymphony.xwork2.XWorkTestCase;
import java.io.InputStream;
@@ -12,7 +13,15 @@ import java.net.URL;
* @since <pre>02/18/2009</pre>
* @version 1.0
*/
-public class FileManagerTest extends XWorkTestCase {
+public class DefaultFileManagerTest extends XWorkTestCase {
+
+ private FileManager fileManager;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ fileManager = container.getInstance(FileManager.class);
+ }
public void testGetFileInJar() throws Exception {
testLoadFile("xwork-jar.xml");
@@ -26,11 +35,11 @@ public class FileManagerTest extends XWo
}
private void testLoadFile(String fileName) {
- FileManager.setReloadingConfigs(true);
- URL url = ClassLoaderUtil.getResource(fileName, FileManagerTest.class);
- InputStream file = FileManager.loadFile(url, true);
+ fileManager.setReloadingConfigs(true);
+ URL url = ClassLoaderUtil.getResource(fileName, DefaultFileManagerTest.class);
+ InputStream file = fileManager.loadFile(url);
assertNotNull(file);
- assertFalse(!FileManager.fileNeedsReloading(fileName));
+ assertFalse(!fileManager.fileNeedsReloading(fileName));
}
}
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java Tue Apr 17 05:03:45 2012
@@ -246,7 +246,9 @@ public class LocalizedTextUtilTest exten
@Override
protected void setUp() throws Exception {
super.setUp();
- loadConfigurationProviders(new XmlConfigurationProvider("xwork-sample.xml"));
+ XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-sample.xml");
+ container.inject(provider);
+ loadConfigurationProviders(provider);
ActionContext.getContext().setLocale(Locale.US);
}
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBeanActionTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBeanActionTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBeanActionTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBeanActionTest.java Tue Apr 17 05:03:45 2012
@@ -97,6 +97,8 @@ public class MyBeanActionTest extends XW
super.setUp();
// ensure we're using the default configuration, not simple config
- loadConfigurationProviders(new XmlConfigurationProvider("xwork-sample.xml"));
+ XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-sample.xml");
+ container.inject(provider);
+ loadConfigurationProviders(provider);
}
}
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java Tue Apr 17 05:03:45 2012
@@ -15,14 +15,29 @@
*/
package com.opensymphony.xwork2.validator;
-import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.AnnotatedTestBean;
+import com.opensymphony.xwork2.FileManager;
+import com.opensymphony.xwork2.SimpleAction;
+import com.opensymphony.xwork2.SimpleAnnotationAction;
+import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.test.AnnotationDataAware2;
import com.opensymphony.xwork2.test.AnnotationUser;
import com.opensymphony.xwork2.test.SimpleAnnotationAction2;
import com.opensymphony.xwork2.test.SimpleAnnotationAction3;
-import com.opensymphony.xwork2.util.FileManager;
-import com.opensymphony.xwork2.validator.validators.*;
+import com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator;
+import com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator;
+import com.opensymphony.xwork2.validator.validators.EmailValidator;
+import com.opensymphony.xwork2.validator.validators.ExpressionValidator;
+import com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator;
+import com.opensymphony.xwork2.validator.validators.RequiredFieldValidator;
+import com.opensymphony.xwork2.validator.validators.RequiredStringValidator;
+import com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator;
+import com.opensymphony.xwork2.validator.validators.URLValidator;
import org.easymock.EasyMock;
import java.util.List;
@@ -83,10 +98,11 @@ public class AnnotationActionValidatorMa
}
public void testGetValidatorsForGivenMethodNameWithoutReloading() throws ValidationException {
+ FileManager fileManager = container.getInstance(FileManager.class);
List validatorList = annotationActionValidatorManager.getValidators(SimpleAnnotationAction.class, alias, "execute");
//disable configuration reload/devmode
- FileManager.setReloadingConfigs(false);
+ fileManager.setReloadingConfigs(false);
//17 in the class level + 0 in the alias
assertEquals(12, validatorList.size());
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManagerTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManagerTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManagerTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManagerTest.java Tue Apr 17 05:03:45 2012
@@ -22,6 +22,7 @@ import com.opensymphony.xwork2.config.Co
import com.opensymphony.xwork2.test.DataAware2;
import com.opensymphony.xwork2.test.SimpleAction2;
import com.opensymphony.xwork2.test.SimpleAction3;
+import com.opensymphony.xwork2.util.fs.DefaultFileManager;
import com.opensymphony.xwork2.util.ValueStack;
import junit.framework.TestCase;
@@ -56,6 +57,8 @@ public class DefaultActionValidatorManag
mockValidatorFactory = new Mock(ValidatorFactory.class);
actionValidatorManager.setValidatorFactory((ValidatorFactory)mockValidatorFactory.proxy());
+ actionValidatorManager.setFileManager(new DefaultFileManager());
+
stubValueStack = new StubValueStack();
ActionContext.setContext(new ActionContext(new HashMap<String, Object>()));
ActionContext.getContext().setValueStack(stubValueStack);
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java Tue Apr 17 05:03:45 2012
@@ -177,7 +177,10 @@ public class DoubleRangeValidatorTest ex
@Override
protected void setUp() throws Exception {
- loadConfigurationProviders(new XmlConfigurationProvider("xwork-default.xml"), new MockConfigurationProvider());
+ super.setUp();
+ XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-default.xml");
+ container.inject(provider);
+ loadConfigurationProviders(provider, new MockConfigurationProvider());
val = new DoubleRangeFieldValidator();
val.setValueStack(ActionContext.getContext().getValueStack());
}
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java Tue Apr 17 05:03:45 2012
@@ -62,6 +62,9 @@ public class IntRangeValidatorTest exten
@Override
protected void setUp() throws Exception {
- loadConfigurationProviders(new XmlConfigurationProvider("xwork-test-beans.xml"), new MockConfigurationProvider());
+ super.setUp();
+ XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-test-beans.xml");
+ container.inject(provider);
+ loadConfigurationProviders(provider, new MockConfigurationProvider());
}
}
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java Tue Apr 17 05:03:45 2012
@@ -60,6 +60,9 @@ public class LongRangeValidatorTest exte
@Override
protected void setUp() throws Exception {
- loadConfigurationProviders(new XmlConfigurationProvider("xwork-test-beans.xml"), new MockConfigurationProvider());
+ super.setUp();
+ XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-test-beans.xml");
+ container.inject(provider);
+ loadConfigurationProviders(provider, new MockConfigurationProvider());
}
}
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java Tue Apr 17 05:03:45 2012
@@ -38,7 +38,9 @@ public class ModelDrivenValidationTest e
Map<String, Object> context = new HashMap<String, Object>();
context.put(ActionContext.PARAMETERS, params);
- loadConfigurationProviders(new XmlConfigurationProvider("xwork-sample.xml"));
+ XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-sample.xml");
+ container.inject(provider);
+ loadConfigurationProviders(provider);
ActionProxy proxy = actionProxyFactory.createActionProxy(null, "TestModelDrivenValidation", context);
assertEquals(Action.SUCCESS, proxy.execute());
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java Tue Apr 17 05:03:45 2012
@@ -60,6 +60,9 @@ public class ShortRangeValidatorTest ext
@Override
protected void setUp() throws Exception {
- loadConfigurationProviders(new XmlConfigurationProvider("xwork-test-beans.xml"), new MockConfigurationProvider());
+ super.setUp();
+ XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-test-beans.xml");
+ container.inject(provider);
+ loadConfigurationProviders(provider, new MockConfigurationProvider());
}
}
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java Tue Apr 17 05:03:45 2012
@@ -224,10 +224,13 @@ public class SimpleActionValidationTest
@Override
protected void setUp() throws Exception {
+ super.setUp();
origLocale = Locale.getDefault();
Locale.setDefault(Locale.US);
- loadConfigurationProviders(new XmlConfigurationProvider("xwork-test-beans.xml"), new MockConfigurationProvider());
+ XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-test-beans.xml");
+ container.inject(provider);
+ loadConfigurationProviders(provider, new MockConfigurationProvider());
}
@Override
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java?rev=1326928&r1=1326927&r2=1326928&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java Tue Apr 17 05:03:45 2012
@@ -110,7 +110,11 @@ public class ValidatorAnnotationTest ext
protected void setUp() throws Exception {
super.setUp();
- loadConfigurationProviders(new XmlConfigurationProvider("xwork-default.xml"), new XmlConfigurationProvider("xwork-test-validation.xml"));
+ XmlConfigurationProvider provider1 = new XmlConfigurationProvider("xwork-default.xml");
+ container.inject(provider1);
+ XmlConfigurationProvider provider2 = new XmlConfigurationProvider("xwork-test-validation.xml");
+ container.inject(provider2);
+ loadConfigurationProviders(provider1, provider2);
}
}