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 cf39c1e3cec041917a057c7715aea878fe913d57 Author: Gary Gregory <[email protected]> AuthorDate: Sat Dec 20 09:27:06 2025 -0500 Remove unused imports and sort remaining imports --- .../apache/commons/vfs2/AbstractProviderTestCase.java | 6 ------ .../test/java/org/apache/commons/vfs2/ContentTests.java | 9 +++------ .../java/org/apache/commons/vfs2/LastModifiedTests.java | 17 +---------------- .../test/java/org/apache/commons/vfs2/NamingTests.java | 9 --------- .../test/java/org/apache/commons/vfs2/PathTests.java | 8 -------- .../apache/commons/vfs2/ProviderCacheStrategyTests.java | 11 +---------- .../org/apache/commons/vfs2/ProviderDeleteTests.java | 9 +-------- .../apache/commons/vfs2/ProviderRandomReadTests.java | 11 +---------- .../commons/vfs2/ProviderRandomReadWriteTests.java | 11 +---------- .../commons/vfs2/ProviderRandomSetLengthTests.java | 13 +------------ .../java/org/apache/commons/vfs2/ProviderReadTests.java | 11 ++--------- .../org/apache/commons/vfs2/ProviderRenameTests.java | 9 +-------- .../apache/commons/vfs2/ProviderWriteAppendTests.java | 10 +--------- .../org/apache/commons/vfs2/ProviderWriteTests.java | 8 +------- .../src/test/java/org/apache/commons/vfs2/UriTests.java | 8 -------- .../java/org/apache/commons/vfs2/UrlStructureTests.java | 13 ++----------- .../src/test/java/org/apache/commons/vfs2/UrlTests.java | 9 +-------- .../apache/commons/vfs2/filter/SizeFileFilterTest.java | 2 +- .../apache/commons/vfs2/impl/VfsClassLoaderTests.java | 7 +------ .../apache/commons/vfs2/provider/bzip2/Bzip2Test.java | 12 ------------ .../vfs2/provider/ftp/FtpMdtmOffLastModifiedTests.java | 11 ----------- .../vfs2/provider/ftp/FtpMdtmOnLastModifiedTests.java | 11 ----------- .../provider/ftp/FtpMdtmOnRefreshLastModifiedTests.java | 13 +------------ .../commons/vfs2/provider/ftp/FtpProviderIPv6Test.java | 2 -- .../vfs2/provider/ftp/FtpProviderMdtmOffTest.java | 1 - .../commons/vfs2/provider/ftp/FtpProviderTest.java | 12 ------------ .../vfs2/provider/ftp/FtpProviderUserDirTest.java | 4 +--- .../org/apache/commons/vfs2/provider/gzip/GzipTest.java | 12 ------------ .../commons/vfs2/provider/http4/Http4ProviderTest.java | 1 - .../commons/vfs2/provider/http5/Http5ProviderTest.java | 1 - .../commons/vfs2/provider/local/FileNameTests.java | 13 ++----------- .../commons/vfs2/provider/local/TempFileTests.java | 10 +--------- .../apache/commons/vfs2/provider/local/UrlTests.java | 10 +--------- .../vfs2/provider/local/WindowsFileNameTests.java | 10 ++-------- .../vfs2/provider/ram/CustomRamProviderTest.java | 5 +---- .../vfs2/provider/sftp/SftpMultiThreadWriteTests.java | 10 +--------- .../vfs2/provider/sftp/SftpProviderIPv6Test.java | 2 +- .../commons/vfs2/provider/test/JunctionTests.java | 12 +++--------- .../java/org/apache/commons/vfs2/util/URIUtilsTest.java | 4 ++-- 39 files changed, 35 insertions(+), 302 deletions(-) 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 aa03e0944..7459d79d7 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 @@ -16,18 +16,12 @@ */ package org.apache.commons.vfs2; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; 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.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; -import java.io.ByteArrayOutputStream; import java.io.InputStream; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.URLConnection; import java.nio.charset.StandardCharsets; 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 536b40606..d48273fea 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 @@ -15,20 +15,17 @@ * limitations under the License. */ package org.apache.commons.vfs2; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; + +import static org.apache.commons.vfs2.VfsTestUtils.assertSameMessage; 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.assertNotSame; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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 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/LastModifiedTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/LastModifiedTests.java index 8305589cb..87270b9c0 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/LastModifiedTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/LastModifiedTests.java @@ -16,30 +16,15 @@ */ package org.apache.commons.vfs2; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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.time.Duration; import java.time.Instant; import java.util.Date; -import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * Test cases for getting and setting file last modified time. diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/NamingTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/NamingTests.java index a0dda34eb..6951d4d07 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/NamingTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/NamingTests.java @@ -16,23 +16,14 @@ */ package org.apache.commons.vfs2; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; 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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; 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 org.junit.jupiter.api.Test; /** diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/PathTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/PathTests.java index 3ff441114..76020b6c8 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/PathTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/PathTests.java @@ -16,17 +16,9 @@ */ package org.apache.commons.vfs2; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; 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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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.nio.file.Path; import java.nio.file.Paths; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderCacheStrategyTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderCacheStrategyTests.java index 2b67e4191..39142ea5b 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderCacheStrategyTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderCacheStrategyTests.java @@ -15,17 +15,8 @@ * limitations under the License. */ package org.apache.commons.vfs2; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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 static org.junit.jupiter.api.Assertions.fail; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; import org.apache.commons.vfs2.impl.VirtualFileSystem; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderDeleteTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderDeleteTests.java index 7e0605d6d..0de8f4b0e 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderDeleteTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderDeleteTests.java @@ -15,17 +15,10 @@ * limitations under the License. */ package org.apache.commons.vfs2; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; + 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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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 org.junit.jupiter.api.Test; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderRandomReadTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderRandomReadTests.java index 275ecf35f..22518ddde 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderRandomReadTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderRandomReadTests.java @@ -15,17 +15,8 @@ * limitations under the License. */ package org.apache.commons.vfs2; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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 static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.commons.vfs2.util.RandomAccessMode; import org.junit.jupiter.api.Test; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderRandomReadWriteTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderRandomReadWriteTests.java index 6a79c01c6..b25287cd4 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderRandomReadWriteTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderRandomReadWriteTests.java @@ -15,17 +15,8 @@ * limitations under the License. */ package org.apache.commons.vfs2; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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 static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.commons.vfs2.util.RandomAccessMode; import org.junit.jupiter.api.Test; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderRandomSetLengthTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderRandomSetLengthTests.java index e1a4fa68a..527480820 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderRandomSetLengthTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderRandomSetLengthTests.java @@ -15,23 +15,12 @@ * limitations under the License. */ package org.apache.commons.vfs2; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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.IOException; import org.apache.commons.vfs2.util.RandomAccessMode; -import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * Random set length test cases for file providers. 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 033b5edde..afef28a3c 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,28 +16,21 @@ */ package org.apache.commons.vfs2; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.apache.commons.vfs2.VfsTestUtils.assertSameMessage; 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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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 static org.apache.commons.vfs2.VfsTestUtils.assertSameMessage; - import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * Read-only test cases for file providers. diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderRenameTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderRenameTests.java index 9ecfe4f25..be54f6277 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderRenameTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderRenameTests.java @@ -15,17 +15,10 @@ * limitations under the License. */ package org.apache.commons.vfs2; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; + 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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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.IOException; import java.io.OutputStream; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderWriteAppendTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderWriteAppendTests.java index 203d85ec6..7685a51e2 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderWriteAppendTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderWriteAppendTests.java @@ -15,17 +15,9 @@ * limitations under the License. */ package org.apache.commons.vfs2; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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.OutputStream; import java.nio.charset.StandardCharsets; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderWriteTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderWriteTests.java index 487d9856f..6568c687f 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderWriteTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderWriteTests.java @@ -16,19 +16,13 @@ */ package org.apache.commons.vfs2; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; 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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; 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.OutputStream; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -36,8 +30,8 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * File system test that check that a file system can be modified. diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/UriTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/UriTests.java index 25af4178f..ac6954a29 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/UriTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/UriTests.java @@ -16,17 +16,9 @@ */ package org.apache.commons.vfs2; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; 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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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.net.URI; 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 ad5b6ac3e..1323ead79 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 @@ -15,19 +15,10 @@ * limitations under the License. */ package org.apache.commons.vfs2; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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 static org.apache.commons.vfs2.VfsTestUtils.assertSameMessage; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; 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 592b47abd..726f56978 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,20 +16,13 @@ */ package org.apache.commons.vfs2; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.apache.commons.vfs2.VfsTestUtils.assertSameMessage; 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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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 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/filter/SizeFileFilterTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SizeFileFilterTest.java index 8ff2f301e..43f34aa37 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SizeFileFilterTest.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SizeFileFilterTest.java @@ -18,8 +18,8 @@ package org.apache.commons.vfs2.filter; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.io.IOException; 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 3bf81853c..05e7adc71 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,20 +16,15 @@ */ package org.apache.commons.vfs2.impl; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile; 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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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 static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile; - import java.io.File; import java.io.PrintWriter; import java.net.URL; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/bzip2/Bzip2Test.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/bzip2/Bzip2Test.java index 211ade1a9..a2ae8d09d 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/bzip2/Bzip2Test.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/bzip2/Bzip2Test.java @@ -16,18 +16,6 @@ */ package org.apache.commons.vfs2.provider.bzip2; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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 static org.apache.commons.vfs2.VfsTestUtils.getTestResource; import java.io.File; 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 1b80c7126..bd5b41cd6 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 @@ -15,17 +15,6 @@ * limitations under the License. */ package org.apache.commons.vfs2.provider.ftp; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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 static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory; 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 89d069a4c..f93bdeba9 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 @@ -15,17 +15,6 @@ * limitations under the License. */ package org.apache.commons.vfs2.provider.ftp; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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 static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory; 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 b4adb1d12..e51f3b586 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 @@ -15,17 +15,6 @@ * limitations under the License. */ package org.apache.commons.vfs2.provider.ftp; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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 static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -38,8 +27,8 @@ import org.apache.commons.vfs2.FileContent; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemException; import org.apache.commons.vfs2.LastModifiedTests; -import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class FtpMdtmOnRefreshLastModifiedTests extends LastModifiedTests { diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderIPv6Test.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderIPv6Test.java index 7adeb3f82..3d7613235 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderIPv6Test.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderIPv6Test.java @@ -19,7 +19,6 @@ package org.apache.commons.vfs2.provider.ftp; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; -import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.vfs2.AbstractProviderTestConfig; import org.apache.commons.vfs2.FileName; import org.apache.commons.vfs2.FileObject; @@ -29,7 +28,6 @@ import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.FileSystemOptions; import org.apache.commons.vfs2.IPv6LocalConnectionTests; import org.apache.commons.vfs2.ProviderTestSuiteJunit5; -import org.apache.commons.vfs2.VFS; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; import org.apache.commons.vfs2.provider.GenericFileName; import org.junit.jupiter.api.Test; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderMdtmOffTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderMdtmOffTest.java index 59c1f7820..be24493b6 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderMdtmOffTest.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderMdtmOffTest.java @@ -18,7 +18,6 @@ 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.nio.charset.Charset; import java.nio.charset.StandardCharsets; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderTest.java index 95b75ee30..daea7d646 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderTest.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderTest.java @@ -16,18 +16,6 @@ */ package org.apache.commons.vfs2.provider.ftp; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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 static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory; import java.io.IOException; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderUserDirTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderUserDirTest.java index b3e2adbb7..12cd2d60c 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderUserDirTest.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderUserDirTest.java @@ -20,6 +20,7 @@ import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory; import java.io.File; import java.io.IOException; +import java.net.URL; import org.apache.commons.io.FileUtils; import org.apache.commons.vfs2.AbstractProviderTestConfig; @@ -27,7 +28,6 @@ import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.FileSystemOptions; import org.apache.commons.vfs2.ProviderTestSuiteJunit5; -import org.apache.commons.vfs2.impl.DecoratedFileObject; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; import org.apache.ftpserver.FtpServer; import org.apache.ftpserver.FtpServerFactory; @@ -45,8 +45,6 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.TestInstance; -import java.net.URL; - /** * JUnit 5 tests for FTP file systems with homeDirIsRoot=true. */ diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/gzip/GzipTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/gzip/GzipTest.java index 46b990334..151336a0e 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/gzip/GzipTest.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/gzip/GzipTest.java @@ -17,18 +17,6 @@ package org.apache.commons.vfs2.provider.gzip; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4ProviderTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4ProviderTest.java index 3a1bd110e..4bfac9459 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4ProviderTest.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4ProviderTest.java @@ -20,7 +20,6 @@ import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; -import java.lang.reflect.Field; import java.time.Duration; import java.util.concurrent.TimeUnit; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5ProviderTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5ProviderTest.java index 38435c196..6a9a19f68 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5ProviderTest.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5ProviderTest.java @@ -20,7 +20,6 @@ import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; -import java.lang.reflect.Field; import java.time.Duration; import java.util.concurrent.TimeUnit; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/FileNameTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/FileNameTests.java index e4d1e6f56..c9d92697e 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/FileNameTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/FileNameTests.java @@ -15,25 +15,16 @@ * limitations under the License. */ package org.apache.commons.vfs2.provider.local; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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 static org.junit.jupiter.api.Assertions.assertSame; import java.io.File; import org.apache.commons.vfs2.AbstractProviderTestCase; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; -import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * Additional naming tests for local file system. diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/TempFileTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/TempFileTests.java index 7ca183c36..728c11c43 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/TempFileTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/TempFileTests.java @@ -15,17 +15,9 @@ * limitations under the License. */ package org.apache.commons.vfs2.provider.local; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; + 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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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.net.URI; import java.nio.file.Files; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/UrlTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/UrlTests.java index b6f48f257..09e6ea5c7 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/UrlTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/UrlTests.java @@ -15,18 +15,10 @@ * limitations under the License. */ package org.apache.commons.vfs2.provider.local; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; + 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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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 org.apache.commons.vfs2.AbstractProviderTestCase; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/WindowsFileNameTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/WindowsFileNameTests.java index d3553fd1c..7f64e95bf 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/WindowsFileNameTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/WindowsFileNameTests.java @@ -15,25 +15,19 @@ * limitations under the License. */ package org.apache.commons.vfs2.provider.local; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; + 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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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 org.apache.commons.vfs2.AbstractProviderTestCase; import org.apache.commons.vfs2.FileName; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemException; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; -import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * Additional naming tests for local file system. diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/CustomRamProviderTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/CustomRamProviderTest.java index a91934180..d93c43b24 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/CustomRamProviderTest.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/CustomRamProviderTest.java @@ -18,12 +18,9 @@ package org.apache.commons.vfs2.provider.ram; import static org.junit.jupiter.api.Assertions.assertArrayEquals; 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.assertSame; import static org.junit.jupiter.api.Assertions.assertNotSame; -import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpMultiThreadWriteTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpMultiThreadWriteTests.java index fa6f1d67d..924090baf 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpMultiThreadWriteTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpMultiThreadWriteTests.java @@ -15,17 +15,9 @@ * limitations under the License. */ package org.apache.commons.vfs2.provider.sftp; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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.util.ArrayList; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderIPv6Test.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderIPv6Test.java index a85334eac..5cf10d83d 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderIPv6Test.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderIPv6Test.java @@ -25,9 +25,9 @@ import java.io.IOException; import org.apache.commons.io.input.NullInputStream; import org.apache.commons.vfs2.AbstractProviderTestConfig; +import org.apache.commons.vfs2.FileName; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystem; -import org.apache.commons.vfs2.FileName; import org.apache.commons.vfs2.FileSystemException; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.FileSystemOptions; 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 53102488c..723a7a072 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 @@ -15,21 +15,15 @@ * limitations under the License. */ package org.apache.commons.vfs2.provider.test; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; + +import static org.apache.commons.vfs2.VfsTestUtils.assertSameMessage; +import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile; 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.assertSame; -import static org.junit.jupiter.api.Assertions.assertNotSame; -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 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; diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/URIUtilsTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/URIUtilsTest.java index a661dc74b..248964e44 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/URIUtilsTest.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/URIUtilsTest.java @@ -16,11 +16,11 @@ */ package org.apache.commons.vfs2.util; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.nio.charset.StandardCharsets; -import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; class URIUtilsTest {
