commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1338279 - in /commons/proper/vfs/trunk/core/src/test/java/org/apache/commons: ./ vfs2/cache/ vfs2/impl/test/ vfs2/provider/ftp/test/ vfs2/provider/ftps/test/ vfs2/provider/http/test/ vfs2/provider/jar/test/ vfs2/provider/local/test/ vfs2/p...
Date Mon, 14 May 2012 16:32:11 GMT
Author: ggregory
Date: Mon May 14 16:32:09 2012
New Revision: 1338279

URL: http://svn.apache.org/viewvc?rev=1338279&view=rev
Log:
Give the getTestDirectory APIs more consistent names. 

Modified:
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/AbstractVfsTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/cache/NullFilesCacheTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/impl/test/DefaultFileMonitorTests.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftps/test/FtpsProviderTestCase_Disabled.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpProviderTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/jar/test/JarProviderTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/jar/test/NestedJarTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/local/test/LocalProviderTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ram/test/RamProviderTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/res/test/ResourceProviderTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/NestedTarTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/NestedTbz2TestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/NestedTgzTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/TarProviderTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/Tbz2ProviderTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/TgzProviderTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/temp/test/TemporaryProviderTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/JunctionTests.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/VirtualProviderTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlHttpProviderTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderHttpTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/zip/test/NestedZipTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/zip/test/ZipProviderTestCase.java
    commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/FileSystemManagerFactoryTestCase.java

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/AbstractVfsTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/AbstractVfsTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/AbstractVfsTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/AbstractVfsTestCase.java
Mon May 14 16:32:09 2012
@@ -72,9 +72,9 @@ public abstract class AbstractVfsTestCas
      *
      * @param name path of the resource, relative to this test's base directory.
      */
-    public static File getTestResource(final String name)
+    public static File getTestResourceFile(final String name)
     {
-        return getTestResource(name, true);
+        return getTestResourceFile(name, true);
     }
 
     /**
@@ -82,9 +82,9 @@ public abstract class AbstractVfsTestCas
      *
      * @param name path of the resource, relative to this test's base directory.
      */
-    public static File getTestResource(final String name, final boolean mustExist)
+    public static File getTestResourceFile(final String name, final boolean mustExist)
     {
-        File file = new File(getTestDirectoryFile(), name);
+        File file = new File(getTestDirectory(), name);
         file = getCanonicalFile(file);
         if (mustExist)
         {
@@ -101,23 +101,28 @@ public abstract class AbstractVfsTestCas
     /**
      * Locates the base directory for this test.
      */
-    public static File getTestDirectoryFile()
+    public static File getTestDirectory()
     {
         if (baseDir == null)
         {
             // final String baseDirProp = System.getProperty("test.basedir");
-            final String baseDirProp = getTestDirectory();
+            final String baseDirProp = getTestDirectoryString();
             baseDir = getCanonicalFile(new File(baseDirProp));
         }
         return baseDir;
     }
 
-    public static String getTestDirectory()
+    /**
+     * Returns the test directory as a String.
+     * 
+     * @return the test directory as a String
+     */
+    public static String getTestDirectoryString()
     {
         return System.getProperty("test.basedir", "target/test-classes/test-data");
     }
 
-    public static String getResourceTestDirectory()
+    public static String getResourceTestDirectoryString()
     {
         return System.getProperty("test.basedir.res", "test-data");
     }
@@ -129,7 +134,7 @@ public abstract class AbstractVfsTestCas
      */
     public static File getTestDirectory(final String name)
     {
-        File file = new File(getTestDirectoryFile(), name);
+        File file = new File(getTestDirectory(), name);
         file = getCanonicalFile(file);
         assertTrue("Test directory \"" + file + "\" does not exist or is not a directory.",
             file.isDirectory() || file.mkdirs());

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTestCase.java
Mon May 14 16:32:09 2012
@@ -51,7 +51,7 @@ public class LRUFilesCacheTestCase
     @Override
     public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception
     {
-        final File testDir = AbstractVfsTestCase.getTestDirectoryFile();
+        final File testDir = AbstractVfsTestCase.getTestDirectory();
         return manager.toFileObject(testDir);
     }
 }

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/cache/NullFilesCacheTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/cache/NullFilesCacheTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/cache/NullFilesCacheTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/cache/NullFilesCacheTestCase.java
Mon May 14 16:32:09 2012
@@ -51,7 +51,7 @@ public class NullFilesCacheTestCase
     @Override
     public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception
     {
-        final File testDir = AbstractVfsTestCase.getTestDirectoryFile();
+        final File testDir = AbstractVfsTestCase.getTestDirectory();
         return manager.toFileObject(testDir);
     }
 }

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/impl/test/DefaultFileMonitorTests.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/impl/test/DefaultFileMonitorTests.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/impl/test/DefaultFileMonitorTests.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/impl/test/DefaultFileMonitorTests.java
Mon May 14 16:32:09 2012
@@ -42,7 +42,7 @@ public class DefaultFileMonitorTests ext
     {
         super.setUp();
         fsManager = VFS.getManager();
-        testDir = AbstractVfsTestCase.getTestDirectoryFile();
+        testDir = AbstractVfsTestCase.getTestDirectory();
         changeStatus = 0;
         testFile = new File(testDir, "testReload.properties");
 

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java
Mon May 14 16:32:09 2012
@@ -103,7 +103,7 @@ public class FtpProviderTestCase extends
         final BaseUser user = (BaseUser) userManager.getUserByName("test");
         // Pickup the home dir value at runtime even though we have it set in the user prop
file
         // The user prop file requires the "homedirectory" to be set
-        user.setHomeDirectory(getTestDirectory());
+        user.setHomeDirectory(getTestDirectoryString());
         serverFactory.setUserManager(userManager);
         ListenerFactory factory = new ListenerFactory();
         // set the port of the listener

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftps/test/FtpsProviderTestCase_Disabled.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftps/test/FtpsProviderTestCase_Disabled.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftps/test/FtpsProviderTestCase_Disabled.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftps/test/FtpsProviderTestCase_Disabled.java
Mon May 14 16:32:09 2012
@@ -112,7 +112,7 @@ public class FtpsProviderTestCase_Disabl
         final BaseUser user = (BaseUser) userManager.getUserByName("test");
         // Pickup the home dir value at runtime even though we have it set in the user prop
file
         // The user prop file requires the "homedirectory" to be set
-        user.setHomeDirectory(getTestDirectory());
+        user.setHomeDirectory(getTestDirectoryString());
         serverFactory.setUserManager(userManager);
         ListenerFactory factory = new ListenerFactory();
         // set the port of the listener

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpProviderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpProviderTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpProviderTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpProviderTestCase.java
Mon May 14 16:32:09 2012
@@ -60,7 +60,7 @@ public class HttpProviderTestCase extend
     private static void setUpClass() throws Exception
     {
         Server = new NHttpServer();
-        if (!Server.run(SocketPort, new File(getTestDirectory()), 5000))
+        if (!Server.run(SocketPort, new File(getTestDirectoryString()), 5000))
         {
             throw new IllegalStateException("The embedded HTTP server has not completed startup,
increase wait time");
         }

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/jar/test/JarProviderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/jar/test/JarProviderTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/jar/test/JarProviderTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/jar/test/JarProviderTestCase.java
Mon May 14 16:32:09 2012
@@ -60,7 +60,7 @@ public class JarProviderTestCase
     @Override
     public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception
     {
-        final File jarFile = AbstractVfsTestCase.getTestResource("test.jar");
+        final File jarFile = AbstractVfsTestCase.getTestResourceFile("test.jar");
         final String uri = "jar:file:" + jarFile.getAbsolutePath() + "!/";
         return manager.resolveFile(uri);
     }

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/jar/test/NestedJarTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/jar/test/NestedJarTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/jar/test/NestedJarTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/jar/test/NestedJarTestCase.java
Mon May 14 16:32:09 2012
@@ -62,7 +62,7 @@ public class NestedJarTestCase
     public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception
     {
         // Locate the Jar file
-        final File outerFile = AbstractVfsTestCase.getTestResource("nested.jar");
+        final File outerFile = AbstractVfsTestCase.getTestResourceFile("nested.jar");
         final String uri = "jar:file:" + outerFile.getAbsolutePath() + "!/test.jar";
         final FileObject jarFile = manager.resolveFile(uri);
 

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/local/test/LocalProviderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/local/test/LocalProviderTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/local/test/LocalProviderTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/local/test/LocalProviderTestCase.java
Mon May 14 16:32:09 2012
@@ -54,7 +54,7 @@ public class LocalProviderTestCase
     @Override
     public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception
     {
-        final File testDir = AbstractVfsTestCase.getTestDirectoryFile();
+        final File testDir = AbstractVfsTestCase.getTestDirectory();
         return manager.toFileObject(testDir);
     }
 }

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ram/test/RamProviderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ram/test/RamProviderTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ram/test/RamProviderTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ram/test/RamProviderTestCase.java
Mon May 14 16:32:09 2012
@@ -87,7 +87,7 @@ public class RamProviderTestCase extends
             // Import the test tree
             FileObject fo = manager.resolveFile("ram:/");
             RamFileSystem fs = (RamFileSystem) fo.getFileSystem();
-            fs.importTree(new File(AbstractVfsTestCase.getTestDirectory()));
+            fs.importTree(new File(AbstractVfsTestCase.getTestDirectoryString()));
             fo.close();
 
             inited=true;

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/res/test/ResourceProviderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/res/test/ResourceProviderTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/res/test/ResourceProviderTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/res/test/ResourceProviderTestCase.java
Mon May 14 16:32:09 2012
@@ -58,7 +58,7 @@ public class ResourceProviderTestCase ex
     public FileObject getBaseTestFolder(FileSystemManager manager)
         throws Exception
     {
-        String baseDir = AbstractVfsTestCase.getResourceTestDirectory();
+        String baseDir = AbstractVfsTestCase.getResourceTestDirectoryString();
         return manager.resolveFile("res:" + baseDir);
     }
 }

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java
Mon May 14 16:32:09 2012
@@ -78,7 +78,7 @@ public class SftpProviderTestCase extend
             {
                 return null;
             }
-            return new TestFileSystemView(getTestDirectory(), userName);
+            return new TestFileSystemView(getTestDirectoryString(), userName);
         }
     }
 

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/NestedTarTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/NestedTarTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/NestedTarTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/NestedTarTestCase.java
Mon May 14 16:32:09 2012
@@ -61,7 +61,7 @@ public class NestedTarTestCase
     public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception
     {
         // Locate the base Tar file
-        final String tarFilePath = AbstractVfsTestCase.getTestResource("nested.tar").getAbsolutePath();
+        final String tarFilePath = AbstractVfsTestCase.getTestResourceFile("nested.tar").getAbsolutePath();
         String uri = "tar:file:" + tarFilePath + "!/test.tar";
         final FileObject tarFile = manager.resolveFile(uri);
 

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/NestedTbz2TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/NestedTbz2TestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/NestedTbz2TestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/NestedTbz2TestCase.java
Mon May 14 16:32:09 2012
@@ -61,7 +61,7 @@ public class NestedTbz2TestCase
     public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception
     {
         // Locate the base Tar file
-        final String tarFilePath = AbstractVfsTestCase.getTestResource("nested.tbz2").getAbsolutePath();
+        final String tarFilePath = AbstractVfsTestCase.getTestResourceFile("nested.tbz2").getAbsolutePath();
         String uri = "tbz2:file:" + tarFilePath + "!/test.tbz2";
         final FileObject tarFile = manager.resolveFile(uri);
 

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/NestedTgzTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/NestedTgzTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/NestedTgzTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/NestedTgzTestCase.java
Mon May 14 16:32:09 2012
@@ -61,7 +61,7 @@ public class NestedTgzTestCase
     public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception
     {
         // Locate the base Tar file
-        final String tarFilePath = AbstractVfsTestCase.getTestResource("nested.tgz").getAbsolutePath();
+        final String tarFilePath = AbstractVfsTestCase.getTestResourceFile("nested.tgz").getAbsolutePath();
         String uri = "tgz:file:" + tarFilePath + "!/test.tgz";
         final FileObject tarFile = manager.resolveFile(uri);
 

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/TarProviderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/TarProviderTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/TarProviderTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/TarProviderTestCase.java
Mon May 14 16:32:09 2012
@@ -60,7 +60,7 @@ public class TarProviderTestCase
     @Override
     public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception
     {
-        final File tarFile = AbstractVfsTestCase.getTestResource("test.tar");
+        final File tarFile = AbstractVfsTestCase.getTestResourceFile("test.tar");
         final String uri = "tar:file:" + tarFile.getAbsolutePath() + "!/";
         return manager.resolveFile(uri);
     }

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/Tbz2ProviderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/Tbz2ProviderTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/Tbz2ProviderTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/Tbz2ProviderTestCase.java
Mon May 14 16:32:09 2012
@@ -60,7 +60,7 @@ public class Tbz2ProviderTestCase
     @Override
     public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception
     {
-        final File tarFile = AbstractVfsTestCase.getTestResource("test.tbz2");
+        final File tarFile = AbstractVfsTestCase.getTestResourceFile("test.tbz2");
         final String uri = "tbz2:file:" + tarFile.getAbsolutePath() + "!/";
         return manager.resolveFile(uri);
     }

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/TgzProviderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/TgzProviderTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/TgzProviderTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/TgzProviderTestCase.java
Mon May 14 16:32:09 2012
@@ -61,7 +61,7 @@ public class TgzProviderTestCase
     @Override
     public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception
     {
-        final File tarFile = AbstractVfsTestCase.getTestResource("test.tgz");
+        final File tarFile = AbstractVfsTestCase.getTestResourceFile("test.tgz");
         final String uri = "tgz:file:" + tarFile.getAbsolutePath() + "!/";
         return manager.resolveFile(uri);
     }

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/temp/test/TemporaryProviderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/temp/test/TemporaryProviderTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/temp/test/TemporaryProviderTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/temp/test/TemporaryProviderTestCase.java
Mon May 14 16:32:09 2012
@@ -51,7 +51,7 @@ public class TemporaryProviderTestCase
     public void prepare(final DefaultFileSystemManager manager)
         throws Exception
     {
-        final File baseDir = AbstractVfsTestCase.getTestDirectoryFile();
+        final File baseDir = AbstractVfsTestCase.getTestDirectory();
         manager.addProvider("tmp", new TemporaryFileProvider(baseDir));
     }
 

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/JunctionTests.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/JunctionTests.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/JunctionTests.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/JunctionTests.java
Mon May 14 16:32:09 2012
@@ -32,7 +32,7 @@ public class JunctionTests
 {
     private FileObject getBaseDir() throws FileSystemException
     {
-        final File file = AbstractVfsTestCase.getTestDirectoryFile();
+        final File file = AbstractVfsTestCase.getTestDirectory();
         assertTrue(file.exists());
         return getManager().toFileObject(file);
     }

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/VirtualProviderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/VirtualProviderTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/VirtualProviderTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/VirtualProviderTestCase.java
Mon May 14 16:32:09 2012
@@ -45,7 +45,7 @@ public class VirtualProviderTestCase
     @Override
     public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception
     {
-        final File baseDir = AbstractVfsTestCase.getTestDirectoryFile();
+        final File baseDir = AbstractVfsTestCase.getTestDirectory();
         final FileObject baseFile = manager.toFileObject(baseDir);
         return manager.createVirtualFileSystem(baseFile);
     }

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlHttpProviderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlHttpProviderTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlHttpProviderTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlHttpProviderTestCase.java
Mon May 14 16:32:09 2012
@@ -57,7 +57,7 @@ public class UrlHttpProviderTestCase
     public FileObject getBaseTestFolder(final FileSystemManager manager)
         throws Exception
     {
-        final File baseDir = AbstractVfsTestCase.getTestDirectoryFile();
+        final File baseDir = AbstractVfsTestCase.getTestDirectory();
         final URL url = baseDir.toURL();
         return manager.resolveFile(url.toExternalForm());
     }

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderHttpTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderHttpTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderHttpTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderHttpTestCase.java
Mon May 14 16:32:09 2012
@@ -60,7 +60,7 @@ public class UrlProviderHttpTestCase ext
     private static void setUpClass() throws Exception
     {
         Server = new NHttpServer();
-        if (!Server.run(SocketPort, new File(getTestDirectory()), 5000))
+        if (!Server.run(SocketPort, new File(getTestDirectoryString()), 5000))
         {
             throw new IllegalStateException("The embedded HTTP server has not completed startup,
increase wait time");
         }

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderTestCase.java
Mon May 14 16:32:09 2012
@@ -57,7 +57,7 @@ public class UrlProviderTestCase
     public FileObject getBaseTestFolder(final FileSystemManager manager)
         throws Exception
     {
-        final File baseDir = AbstractVfsTestCase.getTestDirectoryFile();
+        final File baseDir = AbstractVfsTestCase.getTestDirectory();
         final URL url = baseDir.toURL();
         return manager.resolveFile(url.toExternalForm());
     }

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java
Mon May 14 16:32:09 2012
@@ -236,7 +236,7 @@ public class WebdavProviderTestCase exte
         RepoDirectory = createTempDirectory();
         message("Created temp directory " + RepoDirectory);
         // Populate repo
-        importFiles(RepoDirectory, new File(getTestDirectory()));
+        importFiles(RepoDirectory, new File(getTestDirectoryString()));
         dump(RepoDirectory);
         // Start server with temp repo
         startJackrabbit(RepoDirectory);

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/zip/test/NestedZipTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/zip/test/NestedZipTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/zip/test/NestedZipTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/zip/test/NestedZipTestCase.java
Mon May 14 16:32:09 2012
@@ -61,7 +61,7 @@ public class NestedZipTestCase
     public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception
     {
         // Locate the base Zip file
-        final String zipFilePath = AbstractVfsTestCase.getTestResource("nested.zip").getAbsolutePath();
+        final String zipFilePath = AbstractVfsTestCase.getTestResourceFile("nested.zip").getAbsolutePath();
         String uri = "zip:file:" + zipFilePath + "!/test.zip";
         final FileObject zipFile = manager.resolveFile(uri);
 

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/zip/test/ZipProviderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/zip/test/ZipProviderTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/zip/test/ZipProviderTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/zip/test/ZipProviderTestCase.java
Mon May 14 16:32:09 2012
@@ -61,7 +61,7 @@ public class ZipProviderTestCase
     @Override
     public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception
     {
-        final File zipFile = AbstractVfsTestCase.getTestResource("test.zip");
+        final File zipFile = AbstractVfsTestCase.getTestResourceFile("test.zip");
         final String uri = "zip:file:" + zipFile.getAbsolutePath() + "!/";
         return manager.resolveFile(uri);
     }

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/FileSystemManagerFactoryTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/FileSystemManagerFactoryTestCase.java?rev=1338279&r1=1338278&r2=1338279&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/FileSystemManagerFactoryTestCase.java
(original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/FileSystemManagerFactoryTestCase.java
Mon May 14 16:32:09 2012
@@ -39,7 +39,7 @@ public class FileSystemManagerFactoryTes
         final FileSystemManager manager = VFS.getManager();
 
         // Lookup a test jar file
-        final File jarFile = getTestResource("test.jar");
+        final File jarFile = getTestResourceFile("test.jar");
         FileObject file = manager.toFileObject(jarFile);
         assertNotNull(file);
         assertTrue(file.exists());



Mime
View raw message