Anonymous avatar Anonymous committed 5fda531

- unit tests now run fine on both
- mvn clean test
- ant clean test

- make test cases that needs clean up extends off XWorkTestCase

git-svn-id: http://svn.opensymphony.com/svn/xwork/branches/xwork_1-2/src@1330 e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (3)

test/com/opensymphony/xwork/ProxyInvocationTest.java

 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.TestCase;
-
-import com.opensymphony.xwork.config.ConfigurationManager;
 import com.opensymphony.xwork.config.entities.ActionConfig;
 
 /**
  * Contribed by: Ruben Inoto
  * @version $Date$ $Id$
  */
-public class ProxyInvocationTest extends TestCase {
+public class ProxyInvocationTest extends XWorkTestCase {
 
     /**
      * Sets a ProxyObjectFactory as ObjectFactory (so the FooAction will always be retrieved
             return bean;
         }
     }
-    
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        // ensure we're using the default configuration, not simple config
-        ConfigurationManager.clearConfigurationProviders();
-        ConfigurationManager.getConfiguration().reload();
-    }
 }

test/com/opensymphony/xwork/interceptor/ExceptionMappingInterceptorTest.java

 import com.opensymphony.xwork.config.entities.ExceptionMappingConfig;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import com.opensymphony.xwork.validator.ValidationException;
-import junit.framework.TestCase;
 
 import java.util.HashMap;
 
  * 
  * @author Matthew E. Porter (matthew dot porter at metissian dot com)
  */
-public class ExceptionMappingInterceptorTest extends TestCase {
+public class ExceptionMappingInterceptorTest extends XWorkTestCase {
 
     ActionInvocation invocation;
     ExceptionMappingInterceptor interceptor;

test/com/opensymphony/xwork/interceptor/ParametersInterceptorTest.java

 import com.opensymphony.xwork.config.providers.MockConfigurationProvider;
 import com.opensymphony.xwork.mock.MockActionInvocation;
 import com.opensymphony.xwork.util.OgnlValueStack;
-import junit.framework.TestCase;
 
 import java.util.HashMap;
 import java.util.Map;
  *
  * @author Jason Carreira
  */
-public class ParametersInterceptorTest extends TestCase {
+public class ParametersInterceptorTest extends XWorkTestCase {
 
     public void testParameterNameAware() {
         ParametersInterceptor pi = new ParametersInterceptor();
     }
 
     protected void setUp() throws Exception {
+    	super.setUp();
         ConfigurationManager.clearConfigurationProviders();
         ConfigurationManager.addConfigurationProvider(new MockConfigurationProvider());
         ConfigurationManager.getConfiguration().reload();
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.