Organize imports

apache · Oct 22, 2023 · f4beb5d · f4beb5d
1 parent b0a22b9
commit f4beb5d
Show file tree

Hide file tree

Showing 37 changed files with 79 additions and 79 deletions.
diff --git a/...s2-hdfs/src/test/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileProviderTestCase.java b/...s2-hdfs/src/test/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileProviderTestCase.java
@@ -22,8 +22,6 @@
 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;
@@ -45,6 +43,8 @@
 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/...t1/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java b/...t1/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java
@@ -34,8 +34,6 @@
 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;
@@ -51,6 +49,8 @@
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
+import junit.framework.Test;
+
 /**
  * Test cases for the WebDAV provider.
  */

diff --git a/.../src/test/java/org/apache/commons/vfs2/provider/webdav4/test/Webdav4ProviderTestCase.java b/.../src/test/java/org/apache/commons/vfs2/provider/webdav4/test/Webdav4ProviderTestCase.java
@@ -34,8 +34,6 @@
 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,6 +47,8 @@
 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/...-sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/SmbProviderTestCase.java b/...-sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/SmbProviderTestCase.java
@@ -16,8 +16,6 @@
  */
 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;
@@ -26,6 +24,8 @@
 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/org/apache/commons/vfs2/AbstractProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestCase.java
@@ -25,14 +25,14 @@
 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
@@ -27,12 +27,6 @@
 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;
@@ -42,6 +36,12 @@
 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/cache/DefaultFilesCacheTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/DefaultFilesCacheTestCase.java
@@ -18,14 +18,14 @@
 
 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
@@ -18,14 +18,14 @@
 
 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
@@ -18,14 +18,14 @@
 
 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
@@ -18,14 +18,14 @@
 
 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
@@ -18,14 +18,14 @@
 
 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/...s-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderMdtmOffTestCase.java b/...s-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
@@ -22,8 +22,6 @@
 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;
@@ -42,6 +40,8 @@
 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/...s-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderUserDirTestCase.java b/...s-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderUserDirTestCase.java
@@ -21,15 +21,15 @@
 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;
 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
@@ -20,14 +20,14 @@
 
 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
@@ -20,14 +20,14 @@
 
 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
@@ -18,15 +18,15 @@
 
 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;
 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
@@ -18,8 +18,6 @@
 
 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;
@@ -29,6 +27,8 @@
 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/...ons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/ResourceProviderTestCase.java b/...ons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/ResourceProviderTestCase.java
@@ -18,8 +18,6 @@
 
 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;
@@ -28,6 +26,8 @@
 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/...est/java/org/apache/commons/vfs2/provider/sftp/SftpProviderClosedExecChannelTestCase.java b/...est/java/org/apache/commons/vfs2/provider/sftp/SftpProviderClosedExecChannelTestCase.java
@@ -16,15 +16,15 @@
  */
 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;
 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/.../test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderStreamProxyModeTestCase.java b/.../test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderStreamProxyModeTestCase.java
@@ -18,8 +18,6 @@
 
 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;
@@ -28,6 +26,8 @@
 
 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
@@ -16,10 +16,10 @@
  */
 package org.apache.commons.vfs2.provider.sftp;
 
-import junit.framework.Test;
-
 import org.apache.commons.vfs2.PermissionsTests;
 
+import junit.framework.Test;
+
 public class SftpProviderTestCase extends AbstractSftpProviderTestCase {
 
     /**