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=1338643&r1=1338642&r2=1338643&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 May 15 11:05:50 2012 @@ -15,7 +15,7 @@ */ package com.opensymphony.xwork2.config.providers; -import com.opensymphony.xwork2.FileManager; +import com.opensymphony.xwork2.FileManagerFactory; import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.config.ConfigurationProvider; import com.opensymphony.xwork2.config.RuntimeConfiguration; @@ -51,7 +51,7 @@ public class XmlConfigurationProviderTes } }; prov.setObjectFactory(container.getInstance(ObjectFactory.class)); - prov.setFileManager(container.getInstance(FileManager.class)); + prov.setFileManagerFactory(container.getInstance(FileManagerFactory.class)); prov.init(configuration); List<Document> docs = prov.getDocuments(); assertEquals(3, docs.size()); @@ -74,7 +74,7 @@ public class XmlConfigurationProviderTes } public void testNeedsReload() throws Exception { - container.getInstance(FileManager.class).setReloadingConfigs(true); + container.getInstance(FileManagerFactory.class).getFileManager().setReloadingConfigs(true); final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-actions.xml"; ConfigurationProvider provider = buildConfigurationProvider(filename); @@ -150,7 +150,7 @@ public class XmlConfigurationProviderTes public void testEmptySpaces() throws Exception { final String filename = "com/opensymphony/xwork2/config/providers/xwork- test.xml"; - container.getInstance(FileManager.class).setReloadingConfigs(true); + container.getInstance(FileManagerFactory.class).getFileManager().setReloadingConfigs(true); ConfigurationProvider provider = buildConfigurationProvider(filename); assertTrue(!provider.needsReload()); @@ -166,7 +166,7 @@ public class XmlConfigurationProviderTes } public void testConfigsInJarFiles() throws Exception { - container.getInstance(FileManager.class).setReloadingConfigs(true); + container.getInstance(FileManagerFactory.class).getFileManager().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/util/DefaultFileManagerTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java?rev=1338643&r1=1338642&r2=1338643&view=diff ============================================================================== --- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java (original) +++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java Tue May 15 11:05:50 2012 @@ -1,6 +1,7 @@ package com.opensymphony.xwork2.util; import com.opensymphony.xwork2.FileManager; +import com.opensymphony.xwork2.FileManagerFactory; import com.opensymphony.xwork2.XWorkTestCase; import java.io.InputStream; @@ -20,7 +21,7 @@ public class DefaultFileManagerTest exte @Override public void setUp() throws Exception { super.setUp(); - fileManager = container.getInstance(FileManager.class); + fileManager = container.getInstance(FileManagerFactory.class).getFileManager(); } public void testGetFileInJar() throws Exception { Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/URLUtilTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/URLUtilTest.java?rev=1338643&r1=1338642&r2=1338643&view=diff ============================================================================== --- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/URLUtilTest.java (original) +++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/URLUtilTest.java Tue May 15 11:05:50 2012 @@ -1,124 +1,128 @@ package com.opensymphony.xwork2.util; +import com.opensymphony.xwork2.FileManager; +import com.opensymphony.xwork2.util.fs.DefaultFileManager; import junit.framework.TestCase; -import java.net.URL; +import java.io.IOException; import java.net.MalformedURLException; -import java.net.URLStreamHandlerFactory; -import java.net.URLStreamHandler; +import java.net.URL; import java.net.URLConnection; -import java.io.IOException; +import java.net.URLStreamHandler; +import java.net.URLStreamHandlerFactory; public class URLUtilTest extends TestCase { + private FileManager fileManager; + public void testSimpleFile() throws MalformedURLException { URL url = new URL("file:c:/somefile.txt"); - URL outputURL = URLUtil.normalizeToFileProtocol(url); + URL outputURL = fileManager.normalizeToFileProtocol(url); assertNull(outputURL); } public void testJarFile() throws MalformedURLException { URL url = new URL("jar:file:/c:/somefile.jar!/"); - URL outputURL = URLUtil.normalizeToFileProtocol(url); + URL outputURL = fileManager.normalizeToFileProtocol(url); assertNotNull(outputURL); assertEquals("file:/c:/somefile.jar", outputURL.toExternalForm()); url = new URL("jar:file:/c:/somefile.jar!/somestuf/bla/bla"); - outputURL = URLUtil.normalizeToFileProtocol(url); + outputURL = fileManager.normalizeToFileProtocol(url); assertEquals("file:/c:/somefile.jar", outputURL.toExternalForm()); url = new URL("jar:file:c:/somefile.jar!/somestuf/bla/bla"); - outputURL = URLUtil.normalizeToFileProtocol(url); + outputURL = fileManager.normalizeToFileProtocol(url); assertEquals("file:c:/somefile.jar", outputURL.toExternalForm()); } public void testJarFileWithJarWordInsidePath() throws MalformedURLException { URL url = new URL("jar:file:/c:/workspace/projar/somefile.jar!/"); - URL outputURL = URLUtil.normalizeToFileProtocol(url); + URL outputURL = fileManager.normalizeToFileProtocol(url); assertNotNull(outputURL); assertEquals("file:/c:/workspace/projar/somefile.jar", outputURL.toExternalForm()); url = new URL("jar:file:/c:/workspace/projar/somefile.jar!/somestuf/bla/bla"); - outputURL = URLUtil.normalizeToFileProtocol(url); + outputURL = fileManager.normalizeToFileProtocol(url); assertEquals("file:/c:/workspace/projar/somefile.jar", outputURL.toExternalForm()); url = new URL("jar:file:c:/workspace/projar/somefile.jar!/somestuf/bla/bla"); - outputURL = URLUtil.normalizeToFileProtocol(url); + outputURL = fileManager.normalizeToFileProtocol(url); assertEquals("file:c:/workspace/projar/somefile.jar", outputURL.toExternalForm()); } public void testZipFile() throws MalformedURLException { URL url = new URL("zip:/c:/somefile.zip!/"); - URL outputURL = URLUtil.normalizeToFileProtocol(url); + URL outputURL = fileManager.normalizeToFileProtocol(url); assertNotNull(outputURL); assertEquals("file:/c:/somefile.zip", outputURL.toExternalForm()); url = new URL("zip:/c:/somefile.zip!/somestuf/bla/bla"); - outputURL = URLUtil.normalizeToFileProtocol(url); + outputURL = fileManager.normalizeToFileProtocol(url); assertEquals("file:/c:/somefile.zip", outputURL.toExternalForm()); url = new URL("zip:c:/somefile.zip!/somestuf/bla/bla"); - outputURL = URLUtil.normalizeToFileProtocol(url); + outputURL = fileManager.normalizeToFileProtocol(url); assertEquals("file:c:/somefile.zip", outputURL.toExternalForm()); } public void testWSJarFile() throws MalformedURLException { URL url = new URL("wsjar:file:/c:/somefile.jar!/"); - URL outputURL = URLUtil.normalizeToFileProtocol(url); + URL outputURL = fileManager.normalizeToFileProtocol(url); assertNotNull(outputURL); assertEquals("file:/c:/somefile.jar", outputURL.toExternalForm()); url = new URL("wsjar:file:/c:/somefile.jar!/somestuf/bla/bla"); - outputURL = URLUtil.normalizeToFileProtocol(url); + outputURL = fileManager.normalizeToFileProtocol(url); assertEquals("file:/c:/somefile.jar", outputURL.toExternalForm()); url = new URL("wsjar:file:c:/somefile.jar!/somestuf/bla/bla"); - outputURL = URLUtil.normalizeToFileProtocol(url); + outputURL = fileManager.normalizeToFileProtocol(url); assertEquals("file:c:/somefile.jar", outputURL.toExternalForm()); } public void testVsFile() throws MalformedURLException { URL url = new URL("vfsfile:/c:/somefile.jar!/"); - URL outputURL = URLUtil.normalizeToFileProtocol(url); + URL outputURL = fileManager.normalizeToFileProtocol(url); assertNotNull(outputURL); assertEquals("file:/c:/somefile.jar", outputURL.toExternalForm()); url = new URL("vfsfile:/c:/somefile.jar!/somestuf/bla/bla"); - outputURL = URLUtil.normalizeToFileProtocol(url); + outputURL = fileManager.normalizeToFileProtocol(url); assertEquals("file:/c:/somefile.jar", outputURL.toExternalForm()); url = new URL("vfsfile:c:/somefile.jar!/somestuf/bla/bla"); - outputURL = URLUtil.normalizeToFileProtocol(url); + outputURL = fileManager.normalizeToFileProtocol(url); assertEquals("file:c:/somefile.jar", outputURL.toExternalForm()); url = new URL("vfszip:/c:/somefile.war/somelibrary.jar"); - outputURL = URLUtil.normalizeToFileProtocol(url); + outputURL = fileManager.normalizeToFileProtocol(url); assertEquals("file:/c:/somefile.war/somelibrary.jar", outputURL.toExternalForm()); } public void testJBossFile() throws MalformedURLException { URL url = new URL("vfszip:/c:/somefile.jar!/"); - URL outputURL = URLUtil.normalizeToFileProtocol(url); + URL outputURL = fileManager.normalizeToFileProtocol(url); assertNotNull(outputURL); assertEquals("file:/c:/somefile.jar", outputURL.toExternalForm()); url = new URL("vfszip:/c:/somefile.jar!/somestuf/bla/bla"); - outputURL = URLUtil.normalizeToFileProtocol(url); + outputURL = fileManager.normalizeToFileProtocol(url); assertEquals("file:/c:/somefile.jar", outputURL.toExternalForm()); url = new URL("vfsmemory:c:/somefile.jar!/somestuf/bla/bla"); - outputURL = URLUtil.normalizeToFileProtocol(url); + outputURL = fileManager.normalizeToFileProtocol(url); assertEquals("file:c:/somefile.jar", outputURL.toExternalForm()); url = new URL("vfsmemory:/c:/somefile.war/somelibrary.jar"); - outputURL = URLUtil.normalizeToFileProtocol(url); + outputURL = fileManager.normalizeToFileProtocol(url); assertEquals("file:/c:/somefile.war/somelibrary.jar", outputURL.toExternalForm()); } @@ -138,6 +142,8 @@ public class URLUtilTest extends TestCas } catch (Throwable e) { //the factory cant be set multiple times..just ignore exception no biggie } + + this.fileManager = new DefaultFileManager(); } public void testVerifyUrl() { @@ -151,9 +157,12 @@ public class URLUtilTest extends TestCas assertEquals(true, URLUtil.verifyUrl("https://www.opensymphony.com:443/login";)); assertEquals(true, URLUtil.verifyUrl("http://localhost:8080/myapp";)); } +/* + + TODO lukaszlenart: move to DefaultFileManagerTest (or separate class) public void testIsJarURL() throws Exception { - assertTrue(URLUtil.isJarURL(new URL("jar:file:/c:/somelibrary.jar!/com/opensymphony"))); + assertTrue(fileManager.isJarURL(new URL("jar:file:/c:/somelibrary.jar!/com/opensymphony"))); assertTrue(URLUtil.isJarURL(new URL("zip:/c:/somelibrary.jar!/com/opensymphony"))); assertTrue(URLUtil.isJarURL(new URL("wsjar:/c:/somelibrary.jar!/com/opensymphony"))); assertTrue(URLUtil.isJarURL(new URL("vfsfile:/c:/somelibrary.jar!/com/opensymphony"))); @@ -166,4 +175,5 @@ public class URLUtilTest extends TestCas assertFalse(URLUtil.isJBossUrl(new URL("jar:file:/c:/somelibrary.jar"))); assertTrue(URLUtil.isJBossUrl(new URL("vfsmemory:/c:/somewar.war/somelibrary.jar"))); } +*/ } Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/UrlUtilTest2.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/UrlUtilTest2.java?rev=1338643&r1=1338642&r2=1338643&view=diff ============================================================================== --- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/UrlUtilTest2.java (original) +++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/UrlUtilTest2.java Tue May 15 11:05:50 2012 @@ -1,5 +1,7 @@ package com.opensymphony.xwork2.util; +import com.opensymphony.xwork2.FileManager; +import com.opensymphony.xwork2.util.fs.DefaultFileManager; import junit.framework.TestCase; import java.io.IOException; @@ -12,10 +14,14 @@ import java.util.jar.JarInputStream; * registered URLStreamHandlerFactory would make them fail */ public class UrlUtilTest2 extends TestCase { + public void testOpenWithJarProtocol() throws IOException { + FileManager fileManager = new DefaultFileManager(); + URL url = ClassLoaderUtil.getResource("xwork-jar.jar", URLUtil.class); URL jarUrl = new URL("jar", "", url.toExternalForm() + "!/"); - URL outputURL = URLUtil.normalizeToFileProtocol(jarUrl); + URL outputURL = fileManager.normalizeToFileProtocol(jarUrl); + assertNotNull(outputURL); assertUrlCanBeOpened(outputURL); } Added: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java?rev=1338643&view=auto ============================================================================== --- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java (added) +++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java Tue May 15 11:05:50 2012 @@ -0,0 +1,129 @@ +package com.opensymphony.xwork2.util.fs; + +import com.opensymphony.xwork2.FileManager; +import com.opensymphony.xwork2.FileManagerFactory; +import com.opensymphony.xwork2.XWorkTestCase; +import com.opensymphony.xwork2.inject.Container; +import com.opensymphony.xwork2.inject.Scope; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; + +public class DefaultFileManagerFactoryTest extends XWorkTestCase { + + static FileManager fileManager; + + public void testCreateDefaultFileManager() throws Exception { + // given + fileManager = null; + FileManagerFactory factory = new DefaultFileManagerFactory(new DummyContainer()); + + // when + FileManager fm = factory.getFileManager(); + + // then + assertTrue(fm instanceof DefaultFileManager); + } + + public void testCreateDummyFileManager() throws Exception { + // given + fileManager = new DummyFileManager(); + FileManagerFactory factory = new DefaultFileManagerFactory(new DummyContainer()); + + // when + FileManager fm = factory.getFileManager(); + + // then + assertTrue(fm instanceof DummyFileManager); + } + + public void testFileManagerFactoryWithRealConfig() throws Exception { + // given + FileManagerFactory factory = new DefaultFileManagerFactory(container); + + // when + FileManager fm = factory.getFileManager(); + + // then + assertTrue(fm instanceof DefaultFileManager); + } +} + +class DummyContainer implements Container { + public void inject(Object o) { + } + + public <T> T inject(Class<T> implementation) { + return null; + } + + public <T> T getInstance(Class<T> type, String name) { + if ("dummy".equals(name)) { + return (T) DefaultFileManagerFactoryTest.fileManager; + } + return null; + } + + public <T> T getInstance(Class<T> type) { + return null; + } + + public Set<String> getInstanceNames(Class<?> type) { + if (DefaultFileManagerFactoryTest.fileManager != null) { + return new HashSet<String>() { + { + add("dummy"); + } + }; + } + return null; + } + + public void setScopeStrategy(Scope.Strategy scopeStrategy) { + } + + public void removeScopeStrategy() { + } +} + +class DummyFileManager implements FileManager { + + public void setReloadingConfigs(boolean reloadingConfigs) { + } + + public boolean isReloadingConfigs() { + return false; + } + + public boolean fileNeedsReloading(String fileName) { + return false; + } + + public boolean fileNeedsReloading(URL fileUrl) { + return false; + } + + public InputStream loadFile(URL fileUrl) { + return null; + } + + public void monitorFile(URL fileUrl) { + } + + public URL normalizeToFileProtocol(URL url) { + return null; + } + + public boolean support() { + return true; + } + + public Collection<? extends URL> getAllPhysicalUrls(URL url) throws IOException { + return null; + } +} + 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=1338643&r1=1338642&r2=1338643&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 May 15 11:05:50 2012 @@ -21,6 +21,7 @@ import com.opensymphony.xwork2.ActionInv import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.AnnotatedTestBean; import com.opensymphony.xwork2.FileManager; +import com.opensymphony.xwork2.FileManagerFactory; import com.opensymphony.xwork2.SimpleAction; import com.opensymphony.xwork2.SimpleAnnotationAction; import com.opensymphony.xwork2.XWorkTestCase; @@ -98,7 +99,7 @@ public class AnnotationActionValidatorMa } public void testGetValidatorsForGivenMethodNameWithoutReloading() throws ValidationException { - FileManager fileManager = container.getInstance(FileManager.class); + FileManager fileManager = container.getInstance(FileManagerFactory.class).getFileManager(); List validatorList = annotationActionValidatorManager.getValidators(SimpleAnnotationAction.class, alias, "execute"); //disable configuration reload/devmode 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=1338643&r1=1338642&r2=1338643&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 May 15 11:05:50 2012 @@ -17,14 +17,18 @@ package com.opensymphony.xwork2.validato import com.mockobjects.dynamic.C; import com.mockobjects.dynamic.Mock; -import com.opensymphony.xwork2.*; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.SimpleAction; +import com.opensymphony.xwork2.StubValueStack; +import com.opensymphony.xwork2.TestBean; +import com.opensymphony.xwork2.XWorkException; +import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.config.ConfigurationException; 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; +import com.opensymphony.xwork2.util.fs.DefaultFileManagerFactory; import java.util.ArrayList; import java.util.HashMap; @@ -38,7 +42,7 @@ import java.util.List; * @author tm_jee * @version $Date$ $Id$ */ -public class DefaultActionValidatorManagerTest extends TestCase { +public class DefaultActionValidatorManagerTest extends XWorkTestCase { protected final String alias = "validationAlias"; @@ -57,12 +61,11 @@ 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); + actionValidatorManager.setFileManagerFactory(new DefaultFileManagerFactory(container)); } @Override
