You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/02/21 00:44:09 UTC
[commons-vfs] branch master updated: JUnit v5 upgrade reducing usage of TestCase (#241)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
The following commit(s) were added to refs/heads/master by this push:
new 8e8af85 JUnit v5 upgrade reducing usage of TestCase (#241)
8e8af85 is described below
commit 8e8af8546e5903779806259f0125fe88628b28ad
Author: John Patrick <14...@users.noreply.github.com>
AuthorDate: Mon Feb 21 00:42:39 2022 +0000
JUnit v5 upgrade reducing usage of TestCase (#241)
* JUnit v5 refactoring AbstractVfsTestCase usage removal
* JUnit v5 refactor Util Methods into VfsTestUtils
* JUnit v5 refactor due to deleting AbstractVfsTestCase
* JUnit v5 Bzip2Test upgrade
* JUnit v5 Http5sGetContentInfoTest upgrade
* JUnit v5 GenericFileNameTest upgrade
* JUnit v5 FileSystemManagerFactoryTest upgrade
* JUnit v5 FileNameTest upgrade
* JUnit v5 HttpProviderTestCase update
* JUnit v5 Http4ProviderTestCase update
* JUnit v5 Http5ProviderTestCase update
* Java Code Style remove empty space before package
---
.../vfs2/provider/webdav/test/WebdavProviderTestCase.java | 2 ++
.../provider/webdav4/test/Webdav4ProviderTestCase.java | 2 ++
.../smb/test/{FileNameTestCase.java => FileNameTest.java} | 10 +++++++---
.../org/apache/commons/vfs2/AbstractProviderTestCase.java | 3 ++-
.../java/org/apache/commons/vfs2/AbstractTestSuite.java | 4 +++-
.../test/java/org/apache/commons/vfs2/ContentTests.java | 2 ++
.../java/org/apache/commons/vfs2/FileChangeEventTest.java | 1 -
.../vfs2/FileObjectContentOutputStreamCloseTest.java | 1 -
.../commons/vfs2/FileObjectEscapeCharacterInPathTest.java | 1 -
...oryTestCase.java => FileSystemManagerFactoryTest.java} | 9 +++++++--
.../java/org/apache/commons/vfs2/ProviderReadTests.java | 2 ++
.../java/org/apache/commons/vfs2/UrlStructureTests.java | 2 ++
.../src/test/java/org/apache/commons/vfs2/UrlTests.java | 2 ++
.../src/test/java/org/apache/commons/vfs2/VFSTest.java | 1 -
.../vfs2/{AbstractVfsTestCase.java => VfsTestUtils.java} | 11 +++++++----
.../commons/vfs2/cache/DefaultFilesCacheTestCase.java | 6 ++----
.../apache/commons/vfs2/cache/LRUFilesCacheTestCase.java | 5 +++--
.../apache/commons/vfs2/cache/NullFilesCacheTestCase.java | 6 ++----
.../commons/vfs2/cache/SoftRefFilesCacheTestCase.java | 5 +++--
.../commons/vfs2/cache/WeakRefFilesCacheTestCase.java | 6 ++----
.../org/apache/commons/vfs2/function/VfsConsumerTest.java | 1 -
.../apache/commons/vfs2/impl/DefaultFileMonitorTest.java | 4 ++--
.../commons/vfs2/impl/DefaultFileSystemManagerTest.java | 1 -
.../commons/vfs2/impl/StandardFileSystemManagerTest.java | 1 -
.../org/apache/commons/vfs2/impl/VfsClassLoaderTests.java | 7 ++++---
.../provider/bzip2/{Bzip2TestCase.java => Bzip2Test.java} | 8 ++++----
.../commons/vfs2/provider/ftp/FtpFileNameParserTest.java | 1 -
.../vfs2/provider/ftp/FtpFileSystemConfigBuilderTest.java | 1 -
.../vfs2/provider/ftp/FtpMdtmOffLastModifiedTests.java | 3 ++-
.../vfs2/provider/ftp/FtpMdtmOnLastModifiedTests.java | 3 ++-
.../provider/ftp/FtpMdtmOnRefreshLastModifiedTests.java | 1 -
.../commons/vfs2/provider/ftp/FtpProviderTestCase.java | 2 ++
.../vfs2/provider/ftp/FtpProviderUserDirTestCase.java | 2 ++
.../commons/vfs2/provider/ftp/MultipleConnectionTest.java | 5 +++--
.../vfs2/provider/ftps/AbstractFtpsProviderTestCase.java | 2 ++
.../provider/ftps/NoProtocolSslConfigurationProxy.java | 1 -
.../vfs2/provider/hdfs/HdfsFileProviderTestCase.java | 6 +++---
.../commons/vfs2/provider/http/HttpProviderTestCase.java | 15 +++++++++++----
.../vfs2/provider/http4/Http4ProviderTestCase.java | 14 ++++++++++----
.../vfs2/provider/http5/Http5ProviderTestCase.java | 14 ++++++++++----
.../vfs2/provider/http5s/Http5sGetContentInfoTest.java | 2 +-
.../commons/vfs2/provider/jar/JarProviderTestCase.java | 5 +++--
.../commons/vfs2/provider/jar/NestedJarTestCase.java | 5 +++--
.../vfs2/provider/local/LocalProviderTestCase.java | 6 ++----
.../commons/vfs2/provider/ram/RamProviderTestCase.java | 2 ++
.../apache/commons/vfs2/provider/res/ResSchemeTest.java | 1 -
.../vfs2/provider/res/ResourceProviderTestCase.java | 6 +++---
.../apache/commons/vfs2/provider/res/Vfs444TestCase.java | 6 +++---
.../vfs2/provider/sftp/AbstractSftpProviderTestCase.java | 5 +++--
.../provider/sftp/SftpFileSystemConfigBuilderTest.java | 1 -
.../provider/sftp/SftpPermissionExceptionTestCase.java | 7 ++++---
.../commons/vfs2/provider/tar/NestedTarTestCase.java | 5 +++--
.../commons/vfs2/provider/tar/NestedTbz2TestCase.java | 5 +++--
.../commons/vfs2/provider/tar/NestedTgzTestCase.java | 5 +++--
.../commons/vfs2/provider/tar/TarProviderTestCase.java | 5 +++--
.../commons/vfs2/provider/tar/Tbz2ProviderTestCase.java | 5 +++--
.../commons/vfs2/provider/tar/TgzProviderTestCase.java | 5 +++--
.../vfs2/provider/temp/TemporaryProviderTestCase.java | 5 +++--
...ericFileNameTestCase.java => GenericFileNameTest.java} | 10 +++++++---
.../apache/commons/vfs2/provider/test/JunctionTests.java | 6 ++++--
.../vfs2/provider/test/VirtualProviderTestCase.java | 5 +++--
.../commons/vfs2/provider/url/UrlFileNameParserTest.java | 1 -
.../vfs2/provider/url/UrlHttpProviderTestCase.java | 5 +++--
.../vfs2/provider/url/UrlProviderHttpTestCase.java | 2 ++
.../commons/vfs2/provider/url/UrlProviderTestCase.java | 5 +++--
.../apache/commons/vfs2/provider/zip/FileLockTest.java | 1 -
.../org/apache/commons/vfs2/provider/zip/Jira733Test.java | 1 -
.../commons/vfs2/provider/zip/NestedZipTestCase.java | 5 +++--
.../commons/vfs2/provider/zip/ParseXmlInZipTest.java | 1 -
.../commons/vfs2/provider/zip/TestEntityResolver.java | 1 -
.../commons/vfs2/provider/zip/TestErrorHandler.java | 1 -
.../commons/vfs2/provider/zip/ZipFileObjectTest.java | 1 -
.../commons/vfs2/provider/zip/ZipProviderTestCase.java | 5 +++--
.../provider/zip/ZipProviderWithCharsetNullTestCase.java | 5 +++--
.../vfs2/provider/zip/ZipProviderWithCharsetTestCase.java | 5 +++--
.../org/apache/commons/vfs2/util/FileObjectUtilsTest.java | 1 -
.../org/apache/commons/vfs2/util/FreeSocketPortUtil.java | 1 -
77 files changed, 186 insertions(+), 130 deletions(-)
diff --git a/commons-vfs2-jackrabbit1/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java b/commons-vfs2-jackrabbit1/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java
index 099752d..94e30c9 100644
--- a/commons-vfs2-jackrabbit1/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java
+++ b/commons-vfs2-jackrabbit1/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.vfs2.provider.webdav.test;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
diff --git a/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/Webdav4ProviderTestCase.java b/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/Webdav4ProviderTestCase.java
index aaded83..3e0dbbe 100644
--- a/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/Webdav4ProviderTestCase.java
+++ b/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/Webdav4ProviderTestCase.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.vfs2.provider.webdav4.test;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
diff --git a/commons-vfs2-sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/FileNameTestCase.java b/commons-vfs2-sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/FileNameTest.java
similarity index 95%
rename from commons-vfs2-sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/FileNameTestCase.java
rename to commons-vfs2-sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/FileNameTest.java
index 6a1b317..a9e1796 100644
--- a/commons-vfs2-sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/FileNameTestCase.java
+++ b/commons-vfs2-sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/FileNameTest.java
@@ -16,16 +16,20 @@
*/
package org.apache.commons.vfs2.provider.smb.test;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
+import static org.apache.commons.vfs2.VfsTestUtils.assertSameMessage;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.provider.smb.SmbFileName;
import org.apache.commons.vfs2.provider.smb.SmbFileNameParser;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Some additional SMB file name test cases.
*/
-public class FileNameTestCase extends AbstractVfsTestCase {
+public class FileNameTest {
/**
* Tests parsing a URI into its parts.
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestCase.java
index fc8e3dc..e706af7 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestCase.java
@@ -38,7 +38,8 @@ import junit.framework.TestCase;
* <p>
* Works from a base folder, and assumes a particular structure under that base folder.
*/
-public abstract class AbstractProviderTestCase extends AbstractVfsTestCase {
+public abstract class AbstractProviderTestCase extends TestCase {
+
// Expected contents of "file1.txt"
public static final String FILE1_CONTENT = "This is a test file.";
// Expected contents of test files
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractTestSuite.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractTestSuite.java
index 8500ae3..713d0cb 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractTestSuite.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractTestSuite.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.vfs2;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory;
+
import java.io.File;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -242,7 +244,7 @@ public abstract class AbstractTestSuite extends TestSetup {
startThreadSnapshot = createThreadSnapshot();
// Locate the temp directory, and clean it up
- tempDir = AbstractVfsTestCase.getTestDirectory("temp");
+ tempDir = getTestDirectory("temp");
FileUtils.cleanDirectory(tempDir);
checkTempDir("Temp dir not empty before test");
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ContentTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ContentTests.java
index 9c14f03..aaab7c5 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ContentTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ContentTests.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.vfs2;
+import static org.apache.commons.vfs2.VfsTestUtils.assertSameMessage;
+
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileChangeEventTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileChangeEventTest.java
index 7c4eea6..92274a7 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileChangeEventTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileChangeEventTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2;
import java.io.File;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectContentOutputStreamCloseTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectContentOutputStreamCloseTest.java
index 8f8ece1..0969a41 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectContentOutputStreamCloseTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectContentOutputStreamCloseTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2;
import java.io.BufferedOutputStream;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectEscapeCharacterInPathTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectEscapeCharacterInPathTest.java
index fe179f8..c6855ed 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectEscapeCharacterInPathTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectEscapeCharacterInPathTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2;
import static org.junit.Assert.assertEquals;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileSystemManagerFactoryTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileSystemManagerFactoryTest.java
similarity index 86%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/FileSystemManagerFactoryTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/FileSystemManagerFactoryTest.java
index 4533665..901f864 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileSystemManagerFactoryTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileSystemManagerFactoryTest.java
@@ -16,14 +16,19 @@
*/
package org.apache.commons.vfs2;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestResource;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.File;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for the VFS factory.
*/
-public class FileSystemManagerFactoryTestCase extends AbstractVfsTestCase {
+public class FileSystemManagerFactoryTest {
private void check(final FileSystemManager manager, FileObject file) throws FileSystemException {
assertNotNull(file);
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderReadTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderReadTests.java
index 213cf16..9bec41c 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderReadTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderReadTests.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.vfs2;
+import static org.apache.commons.vfs2.VfsTestUtils.assertSameMessage;
+
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/UrlStructureTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/UrlStructureTests.java
index b5549e4..d7da9f5 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/UrlStructureTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/UrlStructureTests.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.vfs2;
+import static org.apache.commons.vfs2.VfsTestUtils.assertSameMessage;
+
import java.io.IOException;
import java.io.InputStream;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/UrlTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/UrlTests.java
index dce6663..84c39d5 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/UrlTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/UrlTests.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.vfs2;
+import static org.apache.commons.vfs2.VfsTestUtils.assertSameMessage;
+
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/VFSTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/VFSTest.java
index 9691f99..fecb66c 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/VFSTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/VFSTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2;
import static org.junit.Assert.assertNotEquals;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractVfsTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/VfsTestUtils.java
similarity index 96%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractVfsTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/VfsTestUtils.java
index 44d832b..b2736fa 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractVfsTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/VfsTestUtils.java
@@ -16,6 +16,10 @@
*/
package org.apache.commons.vfs2;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import java.io.IOException;
import java.net.URI;
@@ -25,12 +29,10 @@ import java.util.regex.Pattern;
import org.apache.commons.vfs2.util.Messages;
-import junit.framework.TestCase;
-
/**
- * A base class for VFS tests. Provides utility methods for locating test resources.
+ * Provides utility methods for locating test resources.
*/
-public abstract class AbstractVfsTestCase extends TestCase {
+public abstract class VfsTestUtils {
private static File baseDir;
@@ -174,4 +176,5 @@ public abstract class AbstractVfsTestCase extends TestCase {
return file;
}
+
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/DefaultFilesCacheTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/DefaultFilesCacheTestCase.java
index d02d8f6..4614a0b 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/DefaultFilesCacheTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/DefaultFilesCacheTestCase.java
@@ -16,10 +16,9 @@
*/
package org.apache.commons.vfs2.cache;
-import java.io.File;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.CacheTestSuite;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
@@ -44,7 +43,6 @@ public class DefaultFilesCacheTestCase extends AbstractProviderTestConfig {
@Override
public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception {
- final File testDir = AbstractVfsTestCase.getTestDirectoryFile();
- return manager.toFileObject(testDir);
+ return manager.toFileObject(getTestDirectoryFile());
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTestCase.java
index 1333f18..c57f767 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTestCase.java
@@ -16,8 +16,9 @@
*/
package org.apache.commons.vfs2.cache;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.CacheTestSuite;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
@@ -43,6 +44,6 @@ public class LRUFilesCacheTestCase extends AbstractProviderTestConfig {
@Override
public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception {
- return manager.toFileObject(AbstractVfsTestCase.getTestDirectoryFile());
+ return manager.toFileObject(getTestDirectoryFile());
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/NullFilesCacheTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/NullFilesCacheTestCase.java
index 78d6ed6..943c730 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/NullFilesCacheTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/NullFilesCacheTestCase.java
@@ -16,10 +16,9 @@
*/
package org.apache.commons.vfs2.cache;
-import java.io.File;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.CacheTestSuite;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
@@ -44,7 +43,6 @@ public class NullFilesCacheTestCase extends AbstractProviderTestConfig {
@Override
public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception {
- final File testDir = AbstractVfsTestCase.getTestDirectoryFile();
- return manager.toFileObject(testDir);
+ return manager.toFileObject(getTestDirectoryFile());
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/SoftRefFilesCacheTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/SoftRefFilesCacheTestCase.java
index 963732a..5705254 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/SoftRefFilesCacheTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/SoftRefFilesCacheTestCase.java
@@ -16,8 +16,9 @@
*/
package org.apache.commons.vfs2.cache;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.CacheTestSuite;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
@@ -42,6 +43,6 @@ public class SoftRefFilesCacheTestCase extends AbstractProviderTestConfig {
@Override
public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception {
- return manager.toFileObject(AbstractVfsTestCase.getTestDirectoryFile());
+ return manager.toFileObject(getTestDirectoryFile());
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/WeakRefFilesCacheTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/WeakRefFilesCacheTestCase.java
index ff2a525..3736c4f 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/WeakRefFilesCacheTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/WeakRefFilesCacheTestCase.java
@@ -16,10 +16,9 @@
*/
package org.apache.commons.vfs2.cache;
-import java.io.File;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.CacheTestSuite;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
@@ -44,7 +43,6 @@ public class WeakRefFilesCacheTestCase extends AbstractProviderTestConfig {
@Override
public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception {
- final File testDir = AbstractVfsTestCase.getTestDirectoryFile();
- return manager.toFileObject(testDir);
+ return manager.toFileObject(getTestDirectoryFile());
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/function/VfsConsumerTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/function/VfsConsumerTest.java
index 323f932..4f4aece 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/function/VfsConsumerTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/function/VfsConsumerTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.function;
import java.nio.file.Paths;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileMonitorTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileMonitorTest.java
index 7d46391..643dce1 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileMonitorTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileMonitorTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.commons.vfs2.impl;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -30,7 +31,6 @@ import java.util.Deque;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileChangeEvent;
import org.apache.commons.vfs2.FileListener;
import org.apache.commons.vfs2.FileObject;
@@ -193,7 +193,7 @@ public class DefaultFileMonitorTest {
@BeforeEach
public void setUp() throws Exception {
fileSystemManager = VFS.getManager();
- testDir = AbstractVfsTestCase.getTestDirectoryFile();
+ testDir = getTestDirectoryFile();
resetStatus();
testFile = new File(testDir, "testReload.properties");
deleteTestFileIfPresent();
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileSystemManagerTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileSystemManagerTest.java
index 476caa3..0dd9289 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileSystemManagerTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileSystemManagerTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.impl;
import java.io.File;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/StandardFileSystemManagerTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/StandardFileSystemManagerTest.java
index 15593b7..cee1e5e 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/StandardFileSystemManagerTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/StandardFileSystemManagerTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.impl;
import java.nio.file.Paths;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/VfsClassLoaderTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/VfsClassLoaderTests.java
index e097237..aa231a3 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/VfsClassLoaderTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/VfsClassLoaderTests.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.vfs2.impl;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
+
import java.io.File;
import java.io.IOException;
import java.net.URL;
@@ -24,7 +26,6 @@ import java.util.Collections;
import java.util.Enumeration;
import org.apache.commons.vfs2.AbstractProviderTestCase;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.Capability;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
@@ -95,7 +96,7 @@ public class VfsClassLoaderTests extends AbstractProviderTestCase {
// build search path without using #getBaseFolder()
// because NestedJarTestCase redefines it
- final File baseDir = AbstractVfsTestCase.getTestDirectoryFile();
+ final File baseDir = getTestDirectoryFile();
final FileObject nestedJar = manager.resolveFile(baseDir, "nested.jar");
final FileObject testJar = manager.resolveFile(baseDir, "test.jar");
@@ -142,7 +143,7 @@ public class VfsClassLoaderTests extends AbstractProviderTestCase {
System.out.println("VfsClassLoaderTests no local file provider, skipping.");
return;
}
- final File baseDir = AbstractVfsTestCase.getTestDirectoryFile();
+ final File baseDir = getTestDirectoryFile();
// setup test folder
final FileObject dir = manager.resolveFile(baseDir, "read-tests/dir1/subdir4.jar");
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/bzip2/Bzip2TestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/bzip2/Bzip2Test.java
similarity index 95%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/bzip2/Bzip2TestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/bzip2/Bzip2Test.java
index d0045d4..421e74f 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/bzip2/Bzip2TestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/bzip2/Bzip2Test.java
@@ -14,22 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.provider.bzip2;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestResource;
+
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileContent;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.VFS;
import org.apache.commons.vfs2.provider.compressed.CompressedFileFileObject;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class Bzip2TestCase extends AbstractVfsTestCase {
+public class Bzip2Test {
@Test
public void testBZip2() throws IOException {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpFileNameParserTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpFileNameParserTest.java
index 9d46462..4bec5af 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpFileNameParserTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpFileNameParserTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.provider.ftp;
import static org.junit.Assert.assertEquals;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystemConfigBuilderTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystemConfigBuilderTest.java
index 440dee7..ec5f0fc 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystemConfigBuilderTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystemConfigBuilderTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.provider.ftp;
import static org.junit.Assert.assertEquals;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpMdtmOffLastModifiedTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpMdtmOffLastModifiedTests.java
index 393563a..48b174b 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpMdtmOffLastModifiedTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpMdtmOffLastModifiedTests.java
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.provider.ftp;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory;
+
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpMdtmOnLastModifiedTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpMdtmOnLastModifiedTests.java
index 9ae9bfa..4fe1800 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpMdtmOnLastModifiedTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpMdtmOnLastModifiedTests.java
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.provider.ftp;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory;
+
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpMdtmOnRefreshLastModifiedTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpMdtmOnRefreshLastModifiedTests.java
index e70a057..b1b63eb 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpMdtmOnRefreshLastModifiedTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpMdtmOnRefreshLastModifiedTests.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.provider.ftp;
import java.io.IOException;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderTestCase.java
index 6196b51..11c5fd8 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderTestCase.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.vfs2.provider.ftp;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory;
+
import java.io.IOException;
import java.net.URL;
import java.time.Duration;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderUserDirTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderUserDirTestCase.java
index adc0121..51517c9 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderUserDirTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderUserDirTestCase.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.vfs2.provider.ftp;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory;
+
import java.io.File;
import java.io.IOException;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/MultipleConnectionTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/MultipleConnectionTest.java
index 5e6f8ec..90c70e3 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/MultipleConnectionTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/MultipleConnectionTest.java
@@ -16,11 +16,12 @@
*/
package org.apache.commons.vfs2.provider.ftp;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory;
+
import java.io.IOException;
import java.net.SocketException;
import org.apache.commons.net.ftp.FTPClient;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.VFS;
@@ -33,7 +34,7 @@ public class MultipleConnectionTest {
@BeforeAll
public static void setUpClass() throws FtpException {
- FtpProviderTestCase.setUpClass(AbstractVfsTestCase.getTestDirectory(), null, null);
+ FtpProviderTestCase.setUpClass(getTestDirectory(), null, null);
}
@AfterAll
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/AbstractFtpsProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/AbstractFtpsProviderTestCase.java
index bec55b0..2faf4aa 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/AbstractFtpsProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/AbstractFtpsProviderTestCase.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.vfs2.provider.ftps;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory;
+
import java.io.File;
import java.io.IOException;
import java.net.URL;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/NoProtocolSslConfigurationProxy.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/NoProtocolSslConfigurationProxy.java
index 2b02258..4fe0a29 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/NoProtocolSslConfigurationProxy.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/NoProtocolSslConfigurationProxy.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.provider.ftps;
import java.security.GeneralSecurityException;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileProviderTestCase.java
index 6e6ecf0..e088307 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileProviderTestCase.java
@@ -16,12 +16,13 @@
*/
package org.apache.commons.vfs2.provider.hdfs;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
+
import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestConfig;
@@ -104,8 +105,7 @@ public class HdfsFileProviderTestCase extends AbstractProviderTestConfig {
// Copy the test directory into HDFS
final Path base = new Path("/test-data");
assertTrue("Unable to create base directory", hdfs.mkdirs(base));
- final File testDir = AbstractVfsTestCase.getTestDirectoryFile();
- copyTestResources(testDir, base);
+ copyTestResources(getTestDirectoryFile(), base);
super.setUp();
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpProviderTestCase.java
index c1cb750..cf6a652 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpProviderTestCase.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.vfs2.provider.http;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory;
+
import java.io.File;
import java.time.Duration;
@@ -30,14 +32,13 @@ import org.apache.commons.vfs2.VFS;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
import org.apache.commons.vfs2.util.NHttpFileServer;
import org.junit.Assert;
-
-import junit.framework.Test;
+import org.junit.Test;
/**
* Test cases for the HTTP provider.
- *
*/
public class HttpProviderTestCase extends AbstractProviderTestConfig {
+
private static final Duration ONE_MINUTE = Duration.ofMinutes(1);
private static NHttpFileServer Server;
@@ -72,7 +73,7 @@ public class HttpProviderTestCase extends AbstractProviderTestConfig {
* @return a new test suite.
* @throws Exception Thrown when the suite cannot be constructed.
*/
- public static Test suite() throws Exception {
+ public static junit.framework.Test suite() throws Exception {
return new ProviderTestSuite(new HttpProviderTestCase()) {
/**
* Adds base tests - excludes the nested test cases.
@@ -144,6 +145,7 @@ public class HttpProviderTestCase extends AbstractProviderTestConfig {
}
/** Ensure VFS-453 options are present. */
+ @Test
public void testHttpTimeoutConfig() {
final FileSystemOptions options = new FileSystemOptions();
final HttpFileSystemConfigBuilder builder = HttpFileSystemConfigBuilder.getInstance();
@@ -190,19 +192,24 @@ public class HttpProviderTestCase extends AbstractProviderTestConfig {
}
}
+ @Test
public void testResloveFolderSlashNoRedirectOff() throws FileSystemException {
testResloveFolderSlash(ConnectionUri + "/read-tests", false);
}
+ @Test
public void testResloveFolderSlashNoRedirectOn() throws FileSystemException {
testResloveFolderSlash(ConnectionUri + "/read-tests", true);
}
+ @Test
public void testResloveFolderSlashYesRedirectOff() throws FileSystemException {
testResloveFolderSlash(ConnectionUri + "/read-tests/", false);
}
+ @Test
public void testResloveFolderSlashYesRedirectOn() throws FileSystemException {
testResloveFolderSlash(ConnectionUri + "/read-tests/", true);
}
+
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4ProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4ProviderTestCase.java
index 7417569..0ba78be 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4ProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4ProviderTestCase.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.vfs2.provider.http4;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory;
+
import java.io.File;
import java.time.Duration;
import java.util.concurrent.TimeUnit;
@@ -31,12 +33,10 @@ import org.apache.commons.vfs2.VFS;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
import org.apache.commons.vfs2.util.NHttpFileServer;
import org.junit.Assert;
-
-import junit.framework.Test;
+import org.junit.Test;
/**
* Test cases for the HTTP4 provider.
- *
*/
public class Http4ProviderTestCase extends AbstractProviderTestConfig {
@@ -72,7 +72,7 @@ public class Http4ProviderTestCase extends AbstractProviderTestConfig {
* @return a new test suite.
* @throws Exception Thrown when the suite cannot be constructed.
*/
- public static Test suite() throws Exception {
+ public static junit.framework.Test suite() throws Exception {
return new ProviderTestSuite(new Http4ProviderTestCase()) {
/**
* Adds base tests - excludes the nested test cases.
@@ -146,6 +146,7 @@ public class Http4ProviderTestCase extends AbstractProviderTestConfig {
/** Ensure VFS-453 options are present. */
@SuppressWarnings("deprecation")
+ @Test
public void testHttpTimeoutConfig() {
final FileSystemOptions opts = new FileSystemOptions();
final Http4FileSystemConfigBuilder builder = Http4FileSystemConfigBuilder.getInstance();
@@ -195,19 +196,24 @@ public class Http4ProviderTestCase extends AbstractProviderTestConfig {
}
}
+ @Test
public void testResloveFolderSlashNoRedirectOff() throws FileSystemException {
testResloveFolderSlash(ConnectionUri + "/read-tests", false);
}
+ @Test
public void testResloveFolderSlashNoRedirectOn() throws FileSystemException {
testResloveFolderSlash(ConnectionUri + "/read-tests", true);
}
+ @Test
public void testResloveFolderSlashYesRedirectOff() throws FileSystemException {
testResloveFolderSlash(ConnectionUri + "/read-tests/", false);
}
+ @Test
public void testResloveFolderSlashYesRedirectOn() throws FileSystemException {
testResloveFolderSlash(ConnectionUri + "/read-tests/", true);
}
+
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5ProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5ProviderTestCase.java
index b694f2c..5085211 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5ProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5ProviderTestCase.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.vfs2.provider.http5;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory;
+
import java.io.File;
import java.time.Duration;
import java.util.concurrent.TimeUnit;
@@ -31,12 +33,10 @@ import org.apache.commons.vfs2.VFS;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
import org.apache.commons.vfs2.util.NHttpFileServer;
import org.junit.Assert;
-
-import junit.framework.Test;
+import org.junit.Test;
/**
* Test cases for the HTTP5 provider.
- *
*/
public class Http5ProviderTestCase extends AbstractProviderTestConfig {
@@ -72,7 +72,7 @@ public class Http5ProviderTestCase extends AbstractProviderTestConfig {
* @return a new test suite.
* @throws Exception Thrown when the suite cannot be constructed.
*/
- public static Test suite() throws Exception {
+ public static junit.framework.Test suite() throws Exception {
return new ProviderTestSuite(new Http5ProviderTestCase()) {
/**
* Adds base tests - excludes the nested test cases.
@@ -145,6 +145,7 @@ public class Http5ProviderTestCase extends AbstractProviderTestConfig {
/** Ensure VFS-453 options are present. */
@SuppressWarnings("deprecation")
+ @Test
public void testHttpTimeoutConfig() {
final FileSystemOptions opts = new FileSystemOptions();
final Http5FileSystemConfigBuilder builder = Http5FileSystemConfigBuilder.getInstance();
@@ -189,19 +190,24 @@ public class Http5ProviderTestCase extends AbstractProviderTestConfig {
}
}
+ @Test
public void testResloveFolderSlashNoRedirectOff() throws FileSystemException {
testResloveFolderSlash(ConnectionUri + "/read-tests", false);
}
+ @Test
public void testResloveFolderSlashNoRedirectOn() throws FileSystemException {
testResloveFolderSlash(ConnectionUri + "/read-tests", true);
}
+ @Test
public void testResloveFolderSlashYesRedirectOff() throws FileSystemException {
testResloveFolderSlash(ConnectionUri + "/read-tests/", false);
}
+ @Test
public void testResloveFolderSlashYesRedirectOn() throws FileSystemException {
testResloveFolderSlash(ConnectionUri + "/read-tests/", true);
}
+
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5s/Http5sGetContentInfoTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5s/Http5sGetContentInfoTest.java
index 3aff61b..bd9f16a 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5s/Http5sGetContentInfoTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5s/Http5sGetContentInfoTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.vfs2.provider.http5s;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/JarProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/JarProviderTestCase.java
index 36382be..4c4ef61 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/JarProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/JarProviderTestCase.java
@@ -16,10 +16,11 @@
*/
package org.apache.commons.vfs2.provider.jar;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestResource;
+
import java.io.File;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
@@ -32,7 +33,7 @@ import junit.framework.Test;
*/
public class JarProviderTestCase extends AbstractProviderTestConfig {
static FileObject getTestJar(final FileSystemManager manager, final String name) throws Exception {
- final File jarFile = AbstractVfsTestCase.getTestResource(name);
+ final File jarFile = getTestResource(name);
final String uri = "jar:file:" + jarFile.getAbsolutePath() + "!/";
return manager.resolveFile(uri);
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/NestedJarTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/NestedJarTestCase.java
index 9bc7d31..9bce564 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/NestedJarTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/NestedJarTestCase.java
@@ -16,10 +16,11 @@
*/
package org.apache.commons.vfs2.provider.jar;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestResource;
+
import java.io.File;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
@@ -44,7 +45,7 @@ public class NestedJarTestCase extends AbstractProviderTestConfig {
@Override
public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception {
// Locate the Jar file
- final File outerFile = AbstractVfsTestCase.getTestResource("nested.jar");
+ final File outerFile = getTestResource("nested.jar");
final String uri = "jar:file:" + outerFile.getAbsolutePath() + "!/test.jar";
final FileObject jarFile = manager.resolveFile(uri);
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/LocalProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/LocalProviderTestCase.java
index 33853d3..aab32f9 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/LocalProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/LocalProviderTestCase.java
@@ -16,11 +16,10 @@
*/
package org.apache.commons.vfs2.provider.local;
-import java.io.File;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
import org.apache.commons.lang3.SystemUtils;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.PermissionsTests;
@@ -56,7 +55,6 @@ public class LocalProviderTestCase extends AbstractProviderTestConfig {
*/
@Override
public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception {
- final File testDir = AbstractVfsTestCase.getTestDirectoryFile();
- return manager.toFileObject(testDir);
+ return manager.toFileObject(getTestDirectoryFile());
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/RamProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/RamProviderTestCase.java
index 5be22a1..77f45b4 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/RamProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/RamProviderTestCase.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.vfs2.provider.ram;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/ResSchemeTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/ResSchemeTest.java
index 9b34400..c28c368 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/ResSchemeTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/ResSchemeTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.provider.res;
import java.net.URI;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/ResourceProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/ResourceProviderTestCase.java
index 15e27b8..85d014c 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/ResourceProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/ResourceProviderTestCase.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.provider.res;
+import static org.apache.commons.vfs2.VfsTestUtils.getResourceTestDirectory;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
@@ -41,7 +41,7 @@ public class ResourceProviderTestCase extends AbstractProviderTestConfig {
*/
@Override
public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception {
- final String baseDir = AbstractVfsTestCase.getResourceTestDirectory();
+ final String baseDir = getResourceTestDirectory();
return manager.resolveFile("res:" + baseDir);
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/Vfs444TestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/Vfs444TestCase.java
index 2838a43..fd56ab9 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/Vfs444TestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/Vfs444TestCase.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.provider.res;
+import static org.apache.commons.vfs2.VfsTestUtils.getResourceTestDirectory;
+
import org.apache.commons.vfs2.AbstractProviderTestCase;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileName;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
@@ -101,7 +101,7 @@ public class Vfs444TestCase extends AbstractProviderTestConfig {
*/
@Override
public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception {
- final String baseDir = AbstractVfsTestCase.getResourceTestDirectory();
+ final String baseDir = getResourceTestDirectory();
return manager.resolveFile("zip:res:" + baseDir + "/test.zip");
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/AbstractSftpProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/AbstractSftpProviderTestCase.java
index 0d32625..6637dde 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/AbstractSftpProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/AbstractSftpProviderTestCase.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.vfs2.provider.sftp;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory;
+
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -33,7 +35,6 @@ import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.FileSystemOptions;
@@ -356,7 +357,7 @@ abstract class AbstractSftpProviderTestCase extends AbstractProviderTestConfig {
if (!DEFAULT_USER.equals(userName)) {
return null;
}
- return new TestFileSystemView(AbstractVfsTestCase.getTestDirectory(), userName);
+ return new TestFileSystemView(getTestDirectory(), userName);
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilderTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilderTest.java
index 1d174d8..731ff90 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilderTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilderTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.provider.sftp;
import static org.junit.Assert.assertEquals;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpPermissionExceptionTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpPermissionExceptionTestCase.java
index 524a433..22f902b 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpPermissionExceptionTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpPermissionExceptionTestCase.java
@@ -16,10 +16,11 @@
*/
package org.apache.commons.vfs2.provider.sftp;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory;
+
import java.io.File;
import java.nio.file.Paths;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.Capability;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.Selectors;
@@ -94,7 +95,7 @@ public class SftpPermissionExceptionTestCase extends AbstractSftpProviderTestCas
fileObjectCopy.copyFrom(localFileObject, Selectors.SELECT_SELF);
// try to set the local file to readonly
- Paths.get(AbstractVfsTestCase.getTestDirectory(),scratchFolder.getName().getBaseName(), fileName).toFile().setWritable(false);
+ Paths.get(getTestDirectory(), scratchFolder.getName().getBaseName(), fileName).toFile().setWritable(false);
for (int i = 0; i < 30; i++) {
try{
fileObjectCopy = scratchFolder.resolveFile(fileName);
@@ -111,7 +112,7 @@ public class SftpPermissionExceptionTestCase extends AbstractSftpProviderTestCas
Assert.assertTrue("create too many sftp channel more", channelId<30);
// try to set the local file to writable
- Paths.get(AbstractVfsTestCase.getTestDirectory(),scratchFolder.getName().getBaseName(), fileName).toFile().setWritable(true);
+ Paths.get(getTestDirectory(), scratchFolder.getName().getBaseName(), fileName).toFile().setWritable(true);
fileObjectCopy = scratchFolder.resolveFile(fileName);
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTarTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTarTestCase.java
index 28c4e7a..8bb5eb3 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTarTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTarTestCase.java
@@ -16,8 +16,9 @@
*/
package org.apache.commons.vfs2.provider.tar;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestResource;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.FileSystemOptions;
@@ -50,7 +51,7 @@ public class NestedTarTestCase extends AbstractProviderTestConfig {
new StaticUserAuthenticator("domain", null, null));
// Locate the base Tar file
- final String tarFilePath = AbstractVfsTestCase.getTestResource("nested.tar").getAbsolutePath();
+ final String tarFilePath = getTestResource("nested.tar").getAbsolutePath();
// Now build the nested file system
final String uri = "tar:file:" + tarFilePath + "!/test.tar";
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTbz2TestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTbz2TestCase.java
index 58684cf..094f187 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTbz2TestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTbz2TestCase.java
@@ -16,8 +16,9 @@
*/
package org.apache.commons.vfs2.provider.tar;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestResource;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
@@ -42,7 +43,7 @@ public class NestedTbz2TestCase extends AbstractProviderTestConfig {
@Override
public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception {
// Locate the base Tar file
- final String tarFilePath = AbstractVfsTestCase.getTestResource("nested.tbz2").getAbsolutePath();
+ final String tarFilePath = getTestResource("nested.tbz2").getAbsolutePath();
final String uri = "tbz2:file:" + tarFilePath + "!/test.tbz2";
final FileObject tarFile = manager.resolveFile(uri);
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTgzTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTgzTestCase.java
index 51b4f64..8e9d8f7 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTgzTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTgzTestCase.java
@@ -16,8 +16,9 @@
*/
package org.apache.commons.vfs2.provider.tar;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestResource;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
@@ -42,7 +43,7 @@ public class NestedTgzTestCase extends AbstractProviderTestConfig {
@Override
public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception {
// Locate the base Tar file
- final String tarFilePath = AbstractVfsTestCase.getTestResource("nested.tgz").getAbsolutePath();
+ final String tarFilePath = getTestResource("nested.tgz").getAbsolutePath();
final String uri = "tgz:file:" + tarFilePath + "!/test.tgz";
final FileObject tarFile = manager.resolveFile(uri);
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarProviderTestCase.java
index 60a3a0a..f98d1d1 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarProviderTestCase.java
@@ -16,10 +16,11 @@
*/
package org.apache.commons.vfs2.provider.tar;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestResource;
+
import java.io.File;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
@@ -43,7 +44,7 @@ public class TarProviderTestCase extends AbstractProviderTestConfig {
*/
@Override
public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception {
- final File tarFile = AbstractVfsTestCase.getTestResource("test.tar");
+ final File tarFile = getTestResource("test.tar");
final String uri = "tar:file:" + tarFile.getAbsolutePath() + "!/";
return manager.resolveFile(uri);
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/Tbz2ProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/Tbz2ProviderTestCase.java
index 8e5b257..eb55a13 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/Tbz2ProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/Tbz2ProviderTestCase.java
@@ -16,10 +16,11 @@
*/
package org.apache.commons.vfs2.provider.tar;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestResource;
+
import java.io.File;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
@@ -43,7 +44,7 @@ public class Tbz2ProviderTestCase extends AbstractProviderTestConfig {
*/
@Override
public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception {
- final File tarFile = AbstractVfsTestCase.getTestResource("test.tbz2");
+ final File tarFile = getTestResource("test.tbz2");
final String uri = "tbz2:file:" + tarFile.getAbsolutePath() + "!/";
return manager.resolveFile(uri);
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TgzProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TgzProviderTestCase.java
index 7c3fe41..d489acd 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TgzProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TgzProviderTestCase.java
@@ -16,10 +16,11 @@
*/
package org.apache.commons.vfs2.provider.tar;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestResource;
+
import java.io.File;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
@@ -43,7 +44,7 @@ public class TgzProviderTestCase extends AbstractProviderTestConfig {
*/
@Override
public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception {
- final File tarFile = AbstractVfsTestCase.getTestResource("test.tgz");
+ final File tarFile = getTestResource("test.tgz");
final String uri = "tgz:file:" + tarFile.getAbsolutePath() + "!/";
return manager.resolveFile(uri);
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/temp/TemporaryProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/temp/TemporaryProviderTestCase.java
index f959dcd..a403648 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/temp/TemporaryProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/temp/TemporaryProviderTestCase.java
@@ -16,10 +16,11 @@
*/
package org.apache.commons.vfs2.provider.temp;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
+
import java.io.File;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
@@ -51,7 +52,7 @@ public class TemporaryProviderTestCase extends AbstractProviderTestConfig {
*/
@Override
public void prepare(final DefaultFileSystemManager manager) throws Exception {
- final File baseDir = AbstractVfsTestCase.getTestDirectoryFile();
+ final File baseDir = getTestDirectoryFile();
manager.addProvider("tmp", new TemporaryFileProvider(baseDir));
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/GenericFileNameTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/GenericFileNameTest.java
similarity index 95%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/GenericFileNameTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/GenericFileNameTest.java
index bce3939..4ddcd8a 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/GenericFileNameTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/GenericFileNameTest.java
@@ -16,16 +16,20 @@
*/
package org.apache.commons.vfs2.provider.test;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
+import static org.apache.commons.vfs2.VfsTestUtils.assertSameMessage;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.provider.GenericFileName;
import org.apache.commons.vfs2.provider.URLFileNameParser;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Some GenericFileName test cases.
*/
-public class GenericFileNameTestCase extends AbstractVfsTestCase {
+public class GenericFileNameTest {
/**
* Tests error handling in URI parser.
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/JunctionTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/JunctionTests.java
index f5878b9..41bc76b 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/JunctionTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/JunctionTests.java
@@ -16,10 +16,12 @@
*/
package org.apache.commons.vfs2.provider.test;
+import static org.apache.commons.vfs2.VfsTestUtils.assertSameMessage;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
+
import java.io.File;
import org.apache.commons.vfs2.AbstractProviderTestCase;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystem;
import org.apache.commons.vfs2.FileSystemException;
@@ -31,7 +33,7 @@ import org.junit.Test;
public class JunctionTests extends AbstractProviderTestCase {
private FileObject getBaseDir() throws FileSystemException {
- final File file = AbstractVfsTestCase.getTestDirectoryFile();
+ final File file = getTestDirectoryFile();
assertTrue(file.exists());
return getManager().toFileObject(file);
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/VirtualProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/VirtualProviderTestCase.java
index c819d1d..1f76030 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/VirtualProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/VirtualProviderTestCase.java
@@ -16,10 +16,11 @@
*/
package org.apache.commons.vfs2.provider.test;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
+
import java.io.File;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
@@ -41,7 +42,7 @@ public class VirtualProviderTestCase extends AbstractProviderTestConfig {
*/
@Override
public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception {
- final File baseDir = AbstractVfsTestCase.getTestDirectoryFile();
+ final File baseDir = getTestDirectoryFile();
final FileObject baseFile = manager.toFileObject(baseDir);
return manager.createVirtualFileSystem(baseFile);
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlFileNameParserTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlFileNameParserTest.java
index 6b6e2cd..480f65d 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlFileNameParserTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlFileNameParserTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.provider.url;
import java.net.URI;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlHttpProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlHttpProviderTestCase.java
index a145f2a..dcadf0c 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlHttpProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlHttpProviderTestCase.java
@@ -16,10 +16,11 @@
*/
package org.apache.commons.vfs2.provider.url;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
+
import java.io.File;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
@@ -40,7 +41,7 @@ public class UrlHttpProviderTestCase extends AbstractProviderTestConfig {
*/
@Override
public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception {
- final File baseDir = AbstractVfsTestCase.getTestDirectoryFile();
+ final File baseDir = getTestDirectoryFile();
return manager.resolveFile(baseDir.toURI().toURL().toExternalForm());
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlProviderHttpTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlProviderHttpTestCase.java
index d1312ad..68c4823 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlProviderHttpTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlProviderHttpTestCase.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.vfs2.provider.url;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory;
+
import java.io.File;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlProviderTestCase.java
index d337eb0..a268f6b 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlProviderTestCase.java
@@ -16,10 +16,11 @@
*/
package org.apache.commons.vfs2.provider.url;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
+
import java.io.File;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
@@ -40,7 +41,7 @@ public class UrlProviderTestCase extends AbstractProviderTestConfig {
*/
@Override
public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception {
- final File baseDir = AbstractVfsTestCase.getTestDirectoryFile();
+ final File baseDir = getTestDirectoryFile();
return manager.resolveFile(baseDir.toURI().toURL().toExternalForm());
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/FileLockTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/FileLockTest.java
index ce8ec5c..6cc2cb7 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/FileLockTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/FileLockTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.provider.zip;
import java.io.File;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/Jira733Test.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/Jira733Test.java
index 8c72447..e3dd196 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/Jira733Test.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/Jira733Test.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.provider.zip;
import java.io.File;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/NestedZipTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/NestedZipTestCase.java
index 14add05..df16d9c 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/NestedZipTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/NestedZipTestCase.java
@@ -16,8 +16,9 @@
*/
package org.apache.commons.vfs2.provider.zip;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestResource;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
@@ -42,7 +43,7 @@ public class NestedZipTestCase extends AbstractProviderTestConfig {
@Override
public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception {
// Locate the base Zip file
- final String zipFilePath = AbstractVfsTestCase.getTestResource("nested.zip").getAbsolutePath();
+ final String zipFilePath = getTestResource("nested.zip").getAbsolutePath();
final String uri = "zip:file:" + zipFilePath + "!/test.zip";
final FileObject zipFile = manager.resolveFile(uri);
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ParseXmlInZipTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ParseXmlInZipTest.java
index 1389467..aae0cf7 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ParseXmlInZipTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ParseXmlInZipTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.provider.zip;
import java.io.File;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/TestEntityResolver.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/TestEntityResolver.java
index 308d384..8a4441c 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/TestEntityResolver.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/TestEntityResolver.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.provider.zip;
import java.io.File;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/TestErrorHandler.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/TestErrorHandler.java
index ac73a82..0528bfd 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/TestErrorHandler.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/TestErrorHandler.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.provider.zip;
import org.xml.sax.ErrorHandler;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileObjectTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileObjectTest.java
index de39ff7..533a325 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileObjectTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileObjectTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.provider.zip;
import java.io.File;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderTestCase.java
index ca2c9f2..766ce31 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderTestCase.java
@@ -16,10 +16,11 @@
*/
package org.apache.commons.vfs2.provider.zip;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestResource;
+
import java.io.File;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
@@ -43,7 +44,7 @@ public class ZipProviderTestCase extends AbstractProviderTestConfig {
*/
@Override
public FileObject getBaseTestFolder(final FileSystemManager manager) throws Exception {
- final File zipFile = AbstractVfsTestCase.getTestResource("test.zip");
+ final File zipFile = getTestResource("test.zip");
final String uri = "zip:file:" + zipFile.getAbsolutePath() + "!/";
return manager.resolveFile(uri);
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetNullTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetNullTestCase.java
index 3fe9db2..3c4bb76 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetNullTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetNullTestCase.java
@@ -16,10 +16,11 @@
*/
package org.apache.commons.vfs2.provider.zip;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestResource;
+
import java.io.File;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystem;
import org.apache.commons.vfs2.FileSystemManager;
@@ -51,7 +52,7 @@ public class ZipProviderWithCharsetNullTestCase extends AbstractProviderTestConf
// Tests null as the default.
builder.setCharset(opts, null);
- final File zipFile = AbstractVfsTestCase.getTestResource("test.zip");
+ final File zipFile = getTestResource("test.zip");
final String uri = "zip:file:" + zipFile.getAbsolutePath() + "!/";
final FileObject resolvedFile = manager.resolveFile(uri, opts);
final FileSystem fileSystem = resolvedFile.getFileSystem();
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetTestCase.java
index c20564e..68ade16 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetTestCase.java
@@ -16,11 +16,12 @@
*/
package org.apache.commons.vfs2.provider.zip;
+import static org.apache.commons.vfs2.VfsTestUtils.getTestResource;
+
import java.io.File;
import java.nio.charset.StandardCharsets;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
-import org.apache.commons.vfs2.AbstractVfsTestCase;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystem;
import org.apache.commons.vfs2.FileSystemManager;
@@ -52,7 +53,7 @@ public class ZipProviderWithCharsetTestCase extends AbstractProviderTestConfig {
// Tests the same charset as the default but we exercise having a Charset set.
builder.setCharset(opts, StandardCharsets.UTF_8);
- final File zipFile = AbstractVfsTestCase.getTestResource("test.zip");
+ final File zipFile = getTestResource("test.zip");
final String uri = "zip:file:" + zipFile.getAbsolutePath() + "!/";
final FileObject resolvedFile = manager.resolveFile(uri, opts);
final FileSystem fileSystem = resolvedFile.getFileSystem();
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/FileObjectUtilsTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/FileObjectUtilsTest.java
index 819b38a..878a264 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/FileObjectUtilsTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/FileObjectUtilsTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.util;
import java.io.File;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/FreeSocketPortUtil.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/FreeSocketPortUtil.java
index 125c3a8..99c7758 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/FreeSocketPortUtil.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/FreeSocketPortUtil.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.vfs2.util;
import java.io.IOException;