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
commit 6817f83f65c3a10e10b6ebffb777e7b60587ea04 Author: Gary Gregory <[email protected]> AuthorDate: Wed Oct 11 11:19:33 2023 -0400 Fix some Checkstyle issues --- .../vfs2/provider/hdfs/HdfsFileProviderTestCase.java | 4 ++-- .../provider/webdav/test/WebdavProviderTestCase.java | 4 ++-- .../vfs2/provider/webdav4/Webdav4FileNameTest.java | 4 ++-- .../webdav4/test/Webdav4ProviderTestCase.java | 5 ++--- .../commons/vfs2/provider/mime/MimeAttributesMap.java | 11 ++++------- .../provider/mime/MimeFileContentInfoFactory.java | 6 ++---- .../commons/vfs2/provider/mime/MimeFileObject.java | 12 +++++------- .../commons/vfs2/provider/mime/MimeFileSystem.java | 7 +++---- .../vfs2/util/SharedRandomContentInputStream.java | 4 ++-- .../vfs2/provider/smb/test/SmbProviderTestCase.java | 4 ++-- commons-vfs2/src/test/java/code/ClassToLoad.java | 7 ++++--- .../apache/commons/vfs2/AbstractProviderTestCase.java | 6 +++--- .../org/apache/commons/vfs2/AbstractTestSuite.java | 12 ++++++------ .../org/apache/commons/vfs2/FileIteratorTest.java | 6 +++--- .../commons/vfs2/cache/DefaultFilesCacheTestCase.java | 4 ++-- .../commons/vfs2/cache/LRUFilesCacheTestCase.java | 4 ++-- .../commons/vfs2/cache/NullFilesCacheTestCase.java | 4 ++-- .../commons/vfs2/cache/SoftRefFilesCacheTestCase.java | 4 ++-- .../commons/vfs2/cache/WeakRefFilesCacheTestCase.java | 4 ++-- .../vfs2/impl/DefaultFileSystemManagerTest.java | 19 ++++++++++++++++--- .../apache/commons/vfs2/provider/UriParserTest.java | 6 ++++-- .../vfs2/provider/ftp/FtpProviderMdtmOffTestCase.java | 4 ++-- .../vfs2/provider/ftp/FtpProviderTestCase.java | 4 ++-- .../vfs2/provider/ftp/FtpProviderUserDirTestCase.java | 4 ++-- .../vfs2/provider/jar/JarProviderTestCase.java | 4 ++-- .../commons/vfs2/provider/jar/NestedJarTestCase.java | 4 ++-- .../vfs2/provider/local/LocalProviderTestCase.java | 4 ++-- .../vfs2/provider/ram/RamProviderTestCase.java | 4 ++-- .../vfs2/provider/res/ResourceProviderTestCase.java | 4 ++-- .../sftp/SftpProviderClosedExecChannelTestCase.java | 4 ++-- .../sftp/SftpProviderStreamProxyModeTestCase.java | 4 ++-- .../vfs2/provider/sftp/SftpProviderTestCase.java | 4 ++-- .../commons/vfs2/provider/tar/NestedTarTestCase.java | 4 ++-- .../commons/vfs2/provider/tar/NestedTbz2TestCase.java | 4 ++-- .../commons/vfs2/provider/tar/NestedTgzTestCase.java | 4 ++-- .../vfs2/provider/tar/TarProviderTestCase.java | 4 ++-- .../vfs2/provider/tar/Tbz2ProviderTestCase.java | 4 ++-- .../vfs2/provider/tar/TgzProviderTestCase.java | 4 ++-- .../vfs2/provider/temp/TemporaryProviderTestCase.java | 4 ++-- .../vfs2/provider/test/VirtualProviderTestCase.java | 4 ++-- .../vfs2/provider/url/UrlHttpProviderTestCase.java | 4 ++-- .../vfs2/provider/url/UrlProviderHttpTestCase.java | 4 ++-- .../vfs2/provider/url/UrlProviderTestCase.java | 4 ++-- .../commons/vfs2/provider/zip/NestedZipTestCase.java | 4 ++-- .../vfs2/provider/zip/ZipProviderTestCase.java | 4 ++-- .../zip/ZipProviderWithCharsetNullTestCase.java | 4 ++-- .../provider/zip/ZipProviderWithCharsetTestCase.java | 4 ++-- pom.xml | 1 + 48 files changed, 125 insertions(+), 117 deletions(-) diff --git a/commons-vfs2-hdfs/src/test/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileProviderTestCase.java b/commons-vfs2-hdfs/src/test/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileProviderTestCase.java index b65c369e..b3595697 100644 --- a/commons-vfs2-hdfs/src/test/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileProviderTestCase.java +++ b/commons-vfs2-hdfs/src/test/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileProviderTestCase.java @@ -22,6 +22,8 @@ import java.io.File; import java.io.IOException; import java.util.Objects; +import junit.framework.Test; + import org.apache.commons.io.FileUtils; import org.apache.commons.io.file.PathUtils; import org.apache.commons.lang3.SystemUtils; @@ -43,8 +45,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -import junit.framework.Test; - /** * This test class uses the Hadoop MiniDFSCluster class to create an embedded Hadoop cluster. * <P> 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 069ace71..a553ecfe 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 @@ -34,6 +34,8 @@ import javax.jcr.Session; import javax.jcr.SimpleCredentials; import javax.jcr.Value; +import junit.framework.Test; + import org.apache.commons.io.file.PathUtils; import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; @@ -49,8 +51,6 @@ import org.apache.jackrabbit.core.TransientRepository; import org.apache.log4j.Level; import org.apache.log4j.Logger; -import junit.framework.Test; - /** * Test cases for the WebDAV provider. */ diff --git a/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileNameTest.java b/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileNameTest.java index d651e892..610f5c6a 100644 --- a/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileNameTest.java +++ b/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileNameTest.java @@ -16,6 +16,8 @@ */ package org.apache.commons.vfs2.provider.webdav4; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.commons.vfs2.FileSystemException; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.FileSystemOptions; @@ -23,8 +25,6 @@ import org.apache.commons.vfs2.VFS; import org.apache.commons.vfs2.provider.GenericURLFileName; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * Tests {@link Webdav4FileName}. */ 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 ae6d8bc0..61ed8414 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 @@ -34,12 +34,13 @@ import javax.jcr.Session; import javax.jcr.SimpleCredentials; import javax.jcr.Value; +import junit.framework.Test; + import org.apache.commons.io.file.PathUtils; import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.FileSystemOptions; -import org.apache.commons.vfs2.ProviderTestSuite; import org.apache.commons.vfs2.VFS; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; import org.apache.commons.vfs2.provider.temp.TemporaryFileProvider; @@ -48,8 +49,6 @@ import org.apache.commons.vfs2.provider.webdav4.Webdav4FileSystemConfigBuilder; import org.apache.commons.vfs2.util.FreeSocketPortUtil; import org.apache.jackrabbit.core.TransientRepository; -import junit.framework.Test; - /** * Test cases for the WebDAV4 provider. * Do NOT use org.apache.jackrabbit.standalone.Main. diff --git a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeAttributesMap.java b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeAttributesMap.java index ffbcc198..8c62b26a 100644 --- a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeAttributesMap.java +++ b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeAttributesMap.java @@ -29,16 +29,13 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import javax.mail.Address; -import javax.mail.Header; -import javax.mail.Message.RecipientType; -import javax.mail.MessagingException; -import javax.mail.Part; -import javax.mail.internet.MimeMessage; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import jakarta.mail.Address; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; + /** * A map which tries to allow access to the various aspects of the mail. */ diff --git a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileContentInfoFactory.java b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileContentInfoFactory.java index cf834af6..2cb4d13a 100644 --- a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileContentInfoFactory.java +++ b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileContentInfoFactory.java @@ -16,16 +16,14 @@ */ package org.apache.commons.vfs2.provider.mime; -import javax.mail.MessagingException; -import javax.mail.Part; -import javax.mail.internet.ContentType; - import org.apache.commons.vfs2.FileContent; import org.apache.commons.vfs2.FileContentInfo; import org.apache.commons.vfs2.FileContentInfoFactory; import org.apache.commons.vfs2.FileSystemException; import org.apache.commons.vfs2.impl.DefaultFileContentInfo; +import jakarta.mail.MessagingException; + /** * Get access to the content info stuff for mime objects. */ diff --git a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileObject.java b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileObject.java index 553d90f0..f4d07207 100644 --- a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileObject.java +++ b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileObject.java @@ -24,13 +24,6 @@ import java.util.Enumeration; import java.util.List; import java.util.Map; -import javax.mail.Header; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.Multipart; -import javax.mail.Part; -import javax.mail.internet.MimeMultipart; - import org.apache.commons.vfs2.FileContentInfoFactory; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemException; @@ -41,6 +34,11 @@ import org.apache.commons.vfs2.provider.AbstractFileObject; import org.apache.commons.vfs2.provider.UriParser; import org.apache.commons.vfs2.util.FileObjectUtils; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.Multipart; +import jakarta.mail.internet.MimeMultipart; + /** * A part of a MIME message. */ diff --git a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileSystem.java b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileSystem.java index a7c340c0..8eaeb28b 100644 --- a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileSystem.java +++ b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileSystem.java @@ -20,10 +20,6 @@ import java.io.IOException; import java.io.InputStream; import java.util.Collection; -import javax.mail.MessagingException; -import javax.mail.Part; -import javax.mail.internet.MimeMessage; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.vfs2.Capability; @@ -35,6 +31,9 @@ import org.apache.commons.vfs2.provider.AbstractFileName; import org.apache.commons.vfs2.provider.AbstractFileSystem; import org.apache.commons.vfs2.util.SharedRandomContentInputStream; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; + /** * An MIME file system. */ diff --git a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/util/SharedRandomContentInputStream.java b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/util/SharedRandomContentInputStream.java index 0ab1a268..47f8cdaa 100644 --- a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/util/SharedRandomContentInputStream.java +++ b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/util/SharedRandomContentInputStream.java @@ -22,13 +22,13 @@ import java.io.InputStream; import java.util.HashSet; import java.util.Set; -import javax.mail.internet.SharedInputStream; - import org.apache.commons.vfs2.Capability; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemException; import org.apache.commons.vfs2.RandomAccessContent; +import jakarta.mail.internet.SharedInputStream; + /** * (Sandbox) A wrapper to an FileObject to get a {@link javax.mail.internet.SharedInputStream}. */ diff --git a/commons-vfs2-sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/SmbProviderTestCase.java b/commons-vfs2-sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/SmbProviderTestCase.java index c7c52e45..c0a109dd 100644 --- a/commons-vfs2-sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/SmbProviderTestCase.java +++ b/commons-vfs2-sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/SmbProviderTestCase.java @@ -16,6 +16,8 @@ */ package org.apache.commons.vfs2.provider.smb.test; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; @@ -24,8 +26,6 @@ import org.apache.commons.vfs2.ProviderTestSuite; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; import org.apache.commons.vfs2.provider.smb.SmbFileProvider; -import junit.framework.Test; - /** * Tests for the SMB file system. */ diff --git a/commons-vfs2/src/test/java/code/ClassToLoad.java b/commons-vfs2/src/test/java/code/ClassToLoad.java index c01f3b1f..dae91e4c 100644 --- a/commons-vfs2/src/test/java/code/ClassToLoad.java +++ b/commons-vfs2/src/test/java/code/ClassToLoad.java @@ -17,13 +17,14 @@ package code; /** - * The test class for the VFS classloader. + * The test class for the VFS ClassLoader. */ public class ClassToLoad { - private final String m_message = "**PRIVATE**"; + + private final String message = "**PRIVATE**"; @Override public String toString() { - return m_message; + return message; } } 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 cda51e1b..fefc5ff0 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 @@ -25,14 +25,14 @@ import java.lang.reflect.Method; import java.net.URLConnection; import java.nio.charset.StandardCharsets; +import junit.framework.Test; +import junit.framework.TestCase; + import org.apache.commons.vfs2.impl.DefaultFileSystemManager; import org.apache.commons.vfs2.provider.AbstractFileSystem; import org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider; import org.junit.Assert; -import junit.framework.Test; -import junit.framework.TestCase; - /** * File system test cases, which verifies the structure and naming functionality. * <p> 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 49a931ab..581838d6 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 @@ -27,6 +27,12 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.List; +import junit.extensions.TestSetup; +import junit.framework.Protectable; +import junit.framework.Test; +import junit.framework.TestResult; +import junit.framework.TestSuite; + import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; @@ -36,12 +42,6 @@ import org.apache.commons.vfs2.impl.PrivilegedFileReplicator; import org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider; import org.junit.Assert; -import junit.extensions.TestSetup; -import junit.framework.Protectable; -import junit.framework.Test; -import junit.framework.TestResult; -import junit.framework.TestSuite; - /** * The suite of tests for a file system. */ diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileIteratorTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileIteratorTest.java index d9f20d07..362d018e 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileIteratorTest.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileIteratorTest.java @@ -33,7 +33,7 @@ public class FileIteratorTest { private static FileObject BaseFolder; - private final static int FileCount = 14; + private final static int FILE_COUNT = 14; /** * Creates a RAM FS. @@ -74,9 +74,9 @@ public class FileIteratorTest { @Test public void testIterator() throws FileSystemException { final FileObject[] findFiles = BaseFolder.findFiles(Selectors.SELECT_ALL); - assertEquals(FileCount, findFiles.length); + assertEquals(FILE_COUNT, findFiles.length); final FileObject[] listFiles = BaseFolder.getChildren(); - assertTrue(FileCount > listFiles.length); + assertTrue(FILE_COUNT > listFiles.length); int i = 0; for (final FileObject actualFile : BaseFolder) { final FileObject expectedFile = findFiles[i]; 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 ebb6eba4..60fdda33 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 @@ -18,14 +18,14 @@ package org.apache.commons.vfs2.cache; import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.CacheTestSuite; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.FilesCache; -import junit.framework.Test; - /** * Tests the {@link DefaultFilesCache} using {@link DefaultFilesCacheTests}. */ 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 4b3dee5f..53113e42 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 @@ -18,14 +18,14 @@ package org.apache.commons.vfs2.cache; import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.CacheTestSuite; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.FilesCache; -import junit.framework.Test; - /** * Tests the {@link LRUFilesCache} using {@link LRUFilesCacheTests}. */ 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 4cadd4ef..3ddb0cc9 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 @@ -18,14 +18,14 @@ package org.apache.commons.vfs2.cache; import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.CacheTestSuite; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.FilesCache; -import junit.framework.Test; - /** * Tests the {@link NullFilesCache} using {@link NullFilesCacheTests}. */ 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 585c3a32..fe767dd4 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 @@ -18,14 +18,14 @@ package org.apache.commons.vfs2.cache; import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.CacheTestSuite; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.FilesCache; -import junit.framework.Test; - /** * Tests the {@link SoftRefFilesCache} using {@link SoftRefFilesCacheTests}. */ 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 5a54b5c0..ffe9415d 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 @@ -18,14 +18,14 @@ package org.apache.commons.vfs2.cache; import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.CacheTestSuite; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.FilesCache; -import junit.framework.Test; - /** * Tests the {@link WeakRefFilesCache} using {@link WeakRefFilesCacheTests}. */ 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 78669cef..6d94b35e 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 @@ -16,10 +16,25 @@ */ package org.apache.commons.vfs2.impl; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import java.io.File; import java.nio.file.Paths; -import org.apache.commons.vfs2.*; +import org.apache.commons.vfs2.CacheStrategy; +import org.apache.commons.vfs2.FileName; +import org.apache.commons.vfs2.FileObject; +import org.apache.commons.vfs2.FileSystemException; +import org.apache.commons.vfs2.FileSystemManager; +import org.apache.commons.vfs2.FileType; +import org.apache.commons.vfs2.FilesCache; +import org.apache.commons.vfs2.VFS; import org.apache.commons.vfs2.cache.NullFilesCache; import org.apache.commons.vfs2.provider.GenericURLFileName; import org.apache.commons.vfs2.provider.bzip2.Bzip2FileObject; @@ -31,8 +46,6 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static org.junit.jupiter.api.Assertions.*; - /** * Tests {@link DefaultFileSystemManager}. * diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/UriParserTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/UriParserTest.java index 707de7f1..e213ff88 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/UriParserTest.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/UriParserTest.java @@ -16,12 +16,14 @@ */ package org.apache.commons.vfs2.provider; +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.FileType; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - public class UriParserTest { private static final String[] schemes = {"ftp", "file"}; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderMdtmOffTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderMdtmOffTestCase.java index b3f95ece..3bdfd379 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderMdtmOffTestCase.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderMdtmOffTestCase.java @@ -16,14 +16,14 @@ */ package org.apache.commons.vfs2.provider.ftp; +import junit.framework.Test; + import org.apache.ftpserver.command.CommandFactory; import org.apache.ftpserver.command.CommandFactoryFactory; import org.apache.ftpserver.ftplet.FtpReply; import org.apache.ftpserver.impl.FtpReplyTranslator; import org.apache.ftpserver.impl.LocalizedFtpReply; -import junit.framework.Test; - public class FtpProviderMdtmOffTestCase extends FtpProviderTestCase { public static Test suite() throws Exception { 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 c3be9ae5..3d15ee1e 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 @@ -22,6 +22,8 @@ import java.io.IOException; import java.net.URL; import java.time.Duration; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestCase; import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; @@ -40,8 +42,6 @@ import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory; import org.apache.ftpserver.usermanager.impl.BaseUser; import org.junit.jupiter.api.Assertions; -import junit.framework.Test; - /** * Tests for FTP file systems. */ 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 a8c712f7..66bcc2a8 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 @@ -21,6 +21,8 @@ import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory; import java.io.File; import java.io.IOException; +import junit.framework.Test; + import org.apache.commons.io.FileUtils; import org.apache.ftpserver.filesystem.nativefs.NativeFileSystemFactory; import org.apache.ftpserver.ftplet.FileSystemFactory; @@ -28,8 +30,6 @@ import org.apache.ftpserver.ftplet.FileSystemView; import org.apache.ftpserver.ftplet.FtpException; import org.apache.ftpserver.ftplet.User; -import junit.framework.Test; - /** * Tests for FTP file systems (with homeDirIsRoot=true). */ 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 64defb92..f9a403e8 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 @@ -20,14 +20,14 @@ import static org.apache.commons.vfs2.VfsTestUtils.getTestResource; import java.io.File; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.ProviderTestSuite; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; -import junit.framework.Test; - /** * Tests for the Jar file system. */ 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 d91e29da..e09e7915 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 @@ -20,14 +20,14 @@ import static org.apache.commons.vfs2.VfsTestUtils.getTestResource; import java.io.File; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.ProviderTestSuite; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; -import junit.framework.Test; - /** * Tests for the Zip file system. */ 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 538a16ea..4beaaf6f 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 @@ -18,6 +18,8 @@ package org.apache.commons.vfs2.provider.local; import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile; +import junit.framework.Test; + import org.apache.commons.lang3.SystemUtils; import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; @@ -25,8 +27,6 @@ import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.PermissionsTests; import org.apache.commons.vfs2.ProviderTestSuite; -import junit.framework.Test; - /** * Tests for the local file system. */ 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 e19b2b9e..843a7252 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 @@ -18,6 +18,8 @@ package org.apache.commons.vfs2.provider.ram; import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile; +import junit.framework.Test; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.vfs2.AbstractProviderTestConfig; @@ -27,8 +29,6 @@ import org.apache.commons.vfs2.ProviderTestSuite; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; import org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider; -import junit.framework.Test; - /** * Tests for the RAM file system. */ 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 8e5a6fbd..946767e2 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 @@ -18,6 +18,8 @@ package org.apache.commons.vfs2.provider.res; import static org.apache.commons.vfs2.VfsTestUtils.getResourceTestDirectory; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; @@ -26,8 +28,6 @@ import org.apache.commons.vfs2.impl.DefaultFileSystemManager; import org.apache.commons.vfs2.provider.jar.JarFileProvider; import org.apache.commons.vfs2.provider.url.UrlFileProvider; -import junit.framework.Test; - /** * Test cases for the resource provider. */ diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderClosedExecChannelTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderClosedExecChannelTestCase.java index 162e520d..a1fd12d5 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderClosedExecChannelTestCase.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderClosedExecChannelTestCase.java @@ -16,6 +16,8 @@ */ package org.apache.commons.vfs2.provider.sftp; +import junit.framework.Test; + import org.apache.commons.vfs2.NamingTests; import org.apache.commons.vfs2.PermissionsTests; import org.apache.commons.vfs2.ProviderDeleteTests; @@ -23,8 +25,6 @@ import org.apache.commons.vfs2.ProviderReadTests; import org.apache.commons.vfs2.ProviderRenameTests; import org.apache.commons.vfs2.ProviderWriteTests; -import junit.framework.Test; - public class SftpProviderClosedExecChannelTestCase extends AbstractSftpProviderTestCase { /** diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderStreamProxyModeTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderStreamProxyModeTestCase.java index dca2320b..f882ce70 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderStreamProxyModeTestCase.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderStreamProxyModeTestCase.java @@ -18,6 +18,8 @@ package org.apache.commons.vfs2.provider.sftp; import java.net.URI; +import junit.framework.Test; + import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.FileSystemOptions; @@ -26,8 +28,6 @@ import org.apache.commons.vfs2.ProviderReadTests; import com.jcraft.jsch.TestIdentityRepositoryFactory; -import junit.framework.Test; - public class SftpProviderStreamProxyModeTestCase extends AbstractSftpProviderTestCase { // --- VFS-440: stream proxy test suite diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderTestCase.java index e7184659..bdb36a5a 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderTestCase.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderTestCase.java @@ -16,10 +16,10 @@ */ package org.apache.commons.vfs2.provider.sftp; -import org.apache.commons.vfs2.PermissionsTests; - import junit.framework.Test; +import org.apache.commons.vfs2.PermissionsTests; + public class SftpProviderTestCase extends AbstractSftpProviderTestCase { /** 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 932ebd16..246f37a7 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 @@ -18,6 +18,8 @@ package org.apache.commons.vfs2.provider.tar; import static org.apache.commons.vfs2.VfsTestUtils.getTestResource; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; @@ -27,8 +29,6 @@ import org.apache.commons.vfs2.auth.StaticUserAuthenticator; import org.apache.commons.vfs2.impl.DefaultFileSystemConfigBuilder; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; -import junit.framework.Test; - /** * Tests for the Tar file system, using a tar file nested inside another tar file. */ 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 a73805c2..526b7c3b 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 @@ -18,14 +18,14 @@ package org.apache.commons.vfs2.provider.tar; import static org.apache.commons.vfs2.VfsTestUtils.getTestResource; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.ProviderTestSuite; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; -import junit.framework.Test; - /** * Tests for the Tar file system, using a tar file nested inside another tar file. */ 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 e212ccf0..c291619c 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 @@ -18,14 +18,14 @@ package org.apache.commons.vfs2.provider.tar; import static org.apache.commons.vfs2.VfsTestUtils.getTestResource; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.ProviderTestSuite; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; -import junit.framework.Test; - /** * Tests for the Tar file system, using a tar file nested inside another tar file. */ 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 de229430..06546ec6 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 @@ -20,14 +20,14 @@ import static org.apache.commons.vfs2.VfsTestUtils.getTestResource; import java.io.File; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.ProviderTestSuite; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; -import junit.framework.Test; - /** * Tests for the Tar file system. */ 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 c0b7178b..84a5e262 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 @@ -20,14 +20,14 @@ import static org.apache.commons.vfs2.VfsTestUtils.getTestResource; import java.io.File; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.ProviderTestSuite; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; -import junit.framework.Test; - /** * Tests for the Tar file system. */ 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 ccdc9585..4dc0301c 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 @@ -20,14 +20,14 @@ import static org.apache.commons.vfs2.VfsTestUtils.getTestResource; import java.io.File; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.ProviderTestSuite; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; -import junit.framework.Test; - /** * Tests for the Tar file system. */ 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 d39fcbcd..348c9d04 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 @@ -20,14 +20,14 @@ import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile; import java.io.File; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.ProviderTestSuite; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; -import junit.framework.Test; - /** * Test cases for the tmp: file provider. */ 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 246d5b11..8a41c9b0 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 @@ -20,13 +20,13 @@ import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile; import java.io.File; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.ProviderTestSuite; -import junit.framework.Test; - /** * Test cases for the virtual file system provider. */ 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 202e8d9a..90731b19 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 @@ -20,14 +20,14 @@ import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile; import java.io.File; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.ProviderTestSuite; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; -import junit.framework.Test; - /** * Test cases for the generic provider. */ 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 3e0d3f9b..d784f096 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 @@ -22,6 +22,8 @@ import java.io.File; import java.io.IOException; import java.util.concurrent.TimeUnit; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; @@ -29,8 +31,6 @@ import org.apache.commons.vfs2.ProviderTestSuite; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; import org.apache.commons.vfs2.util.NHttpFileServer; -import junit.framework.Test; - /** * Test cases for HTTP with the default provider. */ 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 11562c16..185f32a7 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 @@ -20,14 +20,14 @@ import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile; import java.io.File; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.ProviderTestSuite; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; -import junit.framework.Test; - /** * Test cases for the generic provider. */ 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 46f1d89f..f5197e8c 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 @@ -18,14 +18,14 @@ package org.apache.commons.vfs2.provider.zip; import static org.apache.commons.vfs2.VfsTestUtils.getTestResource; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.ProviderTestSuite; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; -import junit.framework.Test; - /** * Tests for the Zip file system, using a ZIP file nested inside another ZIP 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 45d7fb04..445f2f37 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 @@ -20,14 +20,14 @@ import static org.apache.commons.vfs2.VfsTestUtils.getTestResource; import java.io.File; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.ProviderTestSuite; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; -import junit.framework.Test; - /** * Tests for the Zip file system. */ 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 6ddf05f1..9f84fdef 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 @@ -20,6 +20,8 @@ import static org.apache.commons.vfs2.VfsTestUtils.getTestResource; import java.io.File; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystem; @@ -29,8 +31,6 @@ import org.apache.commons.vfs2.ProviderTestSuite; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; import org.junit.jupiter.api.Assertions; -import junit.framework.Test; - /** * Tests for the Zip file system. */ 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 bc5714a2..820c1913 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 @@ -21,6 +21,8 @@ import static org.apache.commons.vfs2.VfsTestUtils.getTestResource; import java.io.File; import java.nio.charset.StandardCharsets; +import junit.framework.Test; + import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystem; @@ -30,8 +32,6 @@ import org.apache.commons.vfs2.ProviderTestSuite; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; import org.junit.jupiter.api.Assertions; -import junit.framework.Test; - /** * Tests for the Zip file system. */ diff --git a/pom.xml b/pom.xml index 2e500025..d525fa17 100644 --- a/pom.xml +++ b/pom.xml @@ -241,6 +241,7 @@ <suppressionsLocation>${vfs.parent.dir}/checkstyle-suppressions.xml</suppressionsLocation> <enableRulesSummary>false</enableRulesSummary> <propertyExpansion>basedir=${basedir}</propertyExpansion> + <!-- <includeTestSourceDirectory>true</includeTestSourceDirectory> --> </configuration> </plugin> <plugin>
