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 f345bd194fa8d4260d87417d0a050dfcfaa61541 Author: Gary Gregory <[email protected]> AuthorDate: Wed Oct 11 16:08:30 2023 -0400 Fix Checkstyle issues --- .../java/org/apache/commons/vfs2/VfsTestUtils.java | 5 +- .../commons/vfs2/cache/DefaultFilesCacheTests.java | 4 +- .../vfs2/impl/DefaultFileSystemManagerTest.java | 89 +++++++++++----------- .../DelegatingFileSystemOptionsBuilderTest.java | 9 +-- 4 files changed, 51 insertions(+), 56 deletions(-) diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/VfsTestUtils.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/VfsTestUtils.java index d2a8ea5d..38ca1cb5 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/VfsTestUtils.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/VfsTestUtils.java @@ -82,7 +82,7 @@ public abstract class VfsTestUtils { } /** - * Gets a canonical file. + * Gets a canonical file. */ public static File getCanonicalFile(final File file) { try { @@ -115,8 +115,7 @@ public abstract class VfsTestUtils { public static File getTestDirectory(final String name) { File file = new File(getTestDirectoryFile(), name); file = getCanonicalFile(file); - assertTrue(file.isDirectory() || file.mkdirs(), - "Test directory \"" + file + "\" does not exist or is not a directory."); + assertTrue(file.isDirectory() || file.mkdirs(), "Test directory \"" + file + "\" does not exist or is not a directory."); return file; } diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/DefaultFilesCacheTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/DefaultFilesCacheTests.java index 731fc988..a768af62 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/DefaultFilesCacheTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/DefaultFilesCacheTests.java @@ -29,9 +29,9 @@ public class DefaultFilesCacheTests extends AbstractFilesCacheTestsBase { final FileObject scratchFolder = getWriteFolder(); final FileObject dir1 = scratchFolder.resolveFile("dir1"); - final FileObject dir1_2 = scratchFolder.resolveFile("dir1"); + final FileObject dir1Bis = scratchFolder.resolveFile("dir1"); - assertSame(dir1, dir1_2); + assertSame(dir1, dir1Bis); // now the same test, unreferenced (compare only hashCode) final int hc1 = getFileHashCode(); 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 0101d1a5..3a59d58b 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 @@ -124,8 +124,7 @@ public class DefaultFileSystemManagerTest { public void testFileCacheEmptyAfterManagerClose() throws FileSystemException { final FileSystemManager manager = VFS.getManager(); assertNotNull(manager); - try (FileObject fileObject = manager - .resolveFile(Paths.get("src/test/resources/test-data/read-tests/file1.txt").toUri())) { + try (FileObject fileObject = manager.resolveFile(Paths.get("src/test/resources/test-data/read-tests/file1.txt").toUri())) { assertTrue(fileObject.exists()); final FilesCache filesCache = manager.getFilesCache(); final FileName name = fileObject.getName(); @@ -144,8 +143,7 @@ public class DefaultFileSystemManagerTest { public void testFileCacheEmptyAfterVFSClose() throws FileSystemException { final FileSystemManager manager = VFS.getManager(); assertNotNull(manager); - try (FileObject fileObject = manager - .resolveFile(Paths.get("src/test/resources/test-data/read-tests/file1.txt").toUri())) { + try (FileObject fileObject = manager.resolveFile(Paths.get("src/test/resources/test-data/read-tests/file1.txt").toUri())) { assertTrue(fileObject.exists()); final FilesCache filesCache = manager.getFilesCache(); final FileName name = fileObject.getName(); @@ -158,8 +156,7 @@ public class DefaultFileSystemManagerTest { } /** - * Even if the file name is absolute, the base file must be given. This is an inconsistency in the API, but it is - * documented as such. + * Even if the file name is absolute, the base file must be given. This is an inconsistency in the API, but it is documented as such. * * @see "VFS-519" */ @@ -180,49 +177,51 @@ public class DefaultFileSystemManagerTest { } /** - * If the path ends with one of '/' or '.' or '..' or anyPath/..' or 'anyPath/.' , - * the resulting FileName should be of FileType.FOLDER, else of FileType.FILE. + * If the path ends with one of '/' or '.' or '..' or anyPath/..' or 'anyPath/.' , the resulting FileName should be of FileType.FOLDER, else of + * FileType.FILE. */ @Test public void testResolveFileNameType() { try (DefaultFileSystemManager fileSystemManager = new DefaultFileSystemManager()) { - FileName baseNameFolder = new GenericURLFileName( - "sftp" - ,"localhost" - ,22 - ,22 - ,"user" - ,"password" - ,"basePath" - , FileType.FOLDER - ,"query=test"); - - assertEquals(FileType.FOLDER,fileSystemManager.resolveName(baseNameFolder, "").getType()); - assertEquals(FileType.FOLDER,fileSystemManager.resolveName(baseNameFolder, "/").getType()); - assertEquals(FileType.FOLDER,fileSystemManager.resolveName(baseNameFolder, ".").getType()); - assertEquals(FileType.FOLDER,fileSystemManager.resolveName(baseNameFolder, "..").getType()); - assertEquals(FileType.FOLDER,fileSystemManager.resolveName(baseNameFolder, "./").getType()); - assertEquals(FileType.FOLDER,fileSystemManager.resolveName(baseNameFolder, "../").getType()); - assertEquals(FileType.FOLDER,fileSystemManager.resolveName(baseNameFolder, "./Sub Folder/").getType()); - assertEquals(FileType.FOLDER,fileSystemManager.resolveName(baseNameFolder, "../Descendant Folder/").getType()); - assertEquals(FileType.FOLDER,fileSystemManager.resolveName(baseNameFolder, "./Sub Folder/.").getType()); - assertEquals(FileType.FOLDER,fileSystemManager.resolveName(baseNameFolder, "../Descendant Folder/..").getType()); - assertEquals(FileType.FOLDER,fileSystemManager.resolveName(baseNameFolder, "./Sub Folder/./").getType()); - assertEquals(FileType.FOLDER,fileSystemManager.resolveName(baseNameFolder, "../Descendant Folder/../").getType()); - - assertEquals(FileType.FILE,fileSystemManager.resolveName(baseNameFolder, "File.txt").getType()); - assertEquals(FileType.FILE,fileSystemManager.resolveName(baseNameFolder, "/File.txt").getType()); - assertEquals(FileType.FILE,fileSystemManager.resolveName(baseNameFolder, "./File.txt").getType()); - assertEquals(FileType.FILE,fileSystemManager.resolveName(baseNameFolder, "../File.txt").getType()); - assertEquals(FileType.FILE,fileSystemManager.resolveName(baseNameFolder, "./Sub Folder/File.txt").getType()); - assertEquals(FileType.FILE,fileSystemManager.resolveName(baseNameFolder, "../Descendant Folder/File.txt").getType()); - assertEquals(FileType.FILE,fileSystemManager.resolveName(baseNameFolder, "./Sub Folder/./File.txt").getType()); - assertEquals(FileType.FILE,fileSystemManager.resolveName(baseNameFolder, "../Descendant Folder/../File.txt").getType()); - assertEquals(FileType.FILE,fileSystemManager.resolveName(baseNameFolder, "../Descendant Folder/../File.").getType()); - assertEquals(FileType.FILE,fileSystemManager.resolveName(baseNameFolder, "../Descendant Folder/../File..").getType()); - - } catch(FileSystemException fsex){ - fail(fsex); + // @formatter:off + final FileName baseNameFolder = new GenericURLFileName( + "sftp", + "localhost", + 22, + 22, + "user", + "password", + "basePath", + FileType.FOLDER, + "query=test"); + // @formatter:on + + assertEquals(FileType.FOLDER, fileSystemManager.resolveName(baseNameFolder, "").getType()); + assertEquals(FileType.FOLDER, fileSystemManager.resolveName(baseNameFolder, "/").getType()); + assertEquals(FileType.FOLDER, fileSystemManager.resolveName(baseNameFolder, ".").getType()); + assertEquals(FileType.FOLDER, fileSystemManager.resolveName(baseNameFolder, "..").getType()); + assertEquals(FileType.FOLDER, fileSystemManager.resolveName(baseNameFolder, "./").getType()); + assertEquals(FileType.FOLDER, fileSystemManager.resolveName(baseNameFolder, "../").getType()); + assertEquals(FileType.FOLDER, fileSystemManager.resolveName(baseNameFolder, "./Sub Folder/").getType()); + assertEquals(FileType.FOLDER, fileSystemManager.resolveName(baseNameFolder, "../Descendant Folder/").getType()); + assertEquals(FileType.FOLDER, fileSystemManager.resolveName(baseNameFolder, "./Sub Folder/.").getType()); + assertEquals(FileType.FOLDER, fileSystemManager.resolveName(baseNameFolder, "../Descendant Folder/..").getType()); + assertEquals(FileType.FOLDER, fileSystemManager.resolveName(baseNameFolder, "./Sub Folder/./").getType()); + assertEquals(FileType.FOLDER, fileSystemManager.resolveName(baseNameFolder, "../Descendant Folder/../").getType()); + + assertEquals(FileType.FILE, fileSystemManager.resolveName(baseNameFolder, "File.txt").getType()); + assertEquals(FileType.FILE, fileSystemManager.resolveName(baseNameFolder, "/File.txt").getType()); + assertEquals(FileType.FILE, fileSystemManager.resolveName(baseNameFolder, "./File.txt").getType()); + assertEquals(FileType.FILE, fileSystemManager.resolveName(baseNameFolder, "../File.txt").getType()); + assertEquals(FileType.FILE, fileSystemManager.resolveName(baseNameFolder, "./Sub Folder/File.txt").getType()); + assertEquals(FileType.FILE, fileSystemManager.resolveName(baseNameFolder, "../Descendant Folder/File.txt").getType()); + assertEquals(FileType.FILE, fileSystemManager.resolveName(baseNameFolder, "./Sub Folder/./File.txt").getType()); + assertEquals(FileType.FILE, fileSystemManager.resolveName(baseNameFolder, "../Descendant Folder/../File.txt").getType()); + assertEquals(FileType.FILE, fileSystemManager.resolveName(baseNameFolder, "../Descendant Folder/../File.").getType()); + assertEquals(FileType.FILE, fileSystemManager.resolveName(baseNameFolder, "../Descendant Folder/../File..").getType()); + + } catch (FileSystemException e) { + fail(e); } } diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java index 291e1635..2ed76e49 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java @@ -40,8 +40,7 @@ import org.junit.jupiter.api.Test; */ public class DelegatingFileSystemOptionsBuilderTest { - private static final String[] schemes = { "http", "ftp", "file", "zip", "tar", "tgz", "bz2", "gz", - "jar", "tmp", "ram" }; + private static final String[] schemes = { "http", "ftp", "file", "zip", "tar", "tgz", "bz2", "gz", "jar", "tmp", "ram" }; private StandardFileSystemManager fsm; @@ -77,8 +76,7 @@ public class DelegatingFileSystemOptionsBuilderTest { fail(); } catch (final FileSystemException e) { assertSame(e.getCause().getClass(), InvocationTargetException.class); - assertSame(((InvocationTargetException) e.getCause()).getTargetException().getClass(), - NumberFormatException.class); + assertSame(((InvocationTargetException) e.getCause()).getTargetException().getClass(), NumberFormatException.class); } try { @@ -103,8 +101,7 @@ public class DelegatingFileSystemOptionsBuilderTest { assertEquals("http.proxyHost", HttpFileSystemConfigBuilder.getInstance().getProxyHost(opts), "proxy"); assertEquals("http.proxyPort", HttpFileSystemConfigBuilder.getInstance().getProxyPort(opts), 8080); - assertSame("sftp.userInfo", SftpFileSystemConfigBuilder.getInstance().getUserInfo(opts).getClass(), - TrustEveryoneUserInfo.class); + assertSame("sftp.userInfo", SftpFileSystemConfigBuilder.getInstance().getUserInfo(opts).getClass(), TrustEveryoneUserInfo.class); final File[] identities = SftpFileSystemConfigBuilder.getInstance().getIdentities(opts); assertNotNull("sftp.identities", identities);
