This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
The following commit(s) were added to refs/heads/master by this push:
new 144289f8 Fix some Checkstyle issues
144289f8 is described below
commit 144289f831b46f7ec3eaaffcf85f7c01d53ca926
Author: Gary Gregory <[email protected]>
AuthorDate: Wed Oct 11 11:28:33 2023 -0400
Fix some Checkstyle issues
---
.../org/apache/commons/vfs2/FileIteratorTest.java | 44 +++++++++++-----------
.../apache/commons/vfs2/FileTypeSelectorTest.java | 30 +++++++--------
.../vfs2/provider/ftp/FtpProviderTestCase.java | 8 ++--
.../ftps/AbstractFtpsProviderTestCase.java | 2 +-
4 files changed, 42 insertions(+), 42 deletions(-)
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 362d018e..a895633d 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
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
*/
public class FileIteratorTest {
- private static FileObject BaseFolder;
+ private static FileObject baseFolder;
private final static int FILE_COUNT = 14;
@@ -42,21 +42,21 @@ public class FileIteratorTest {
*/
@BeforeAll
public static void setUpClass() throws Exception {
- BaseFolder = VFS.getManager().resolveFile("ram://" +
FileIteratorTest.class.getName());
- BaseFolder.deleteAll();
- BaseFolder.resolveFile("a.htm").createFile();
- BaseFolder.resolveFile("a.html").createFile();
- BaseFolder.resolveFile("a.xhtml").createFile();
- BaseFolder.resolveFile("b.htm").createFile();
- BaseFolder.resolveFile("b.html").createFile();
- BaseFolder.resolveFile("b.xhtml").createFile();
- BaseFolder.resolveFile("c.htm").createFile();
- BaseFolder.resolveFile("c.html").createFile();
- BaseFolder.resolveFile("c.xhtml").createFile();
- BaseFolder.resolveFile("subdir1").createFolder();
- BaseFolder.resolveFile("subdir1/subfile1.txt").createFile();
- BaseFolder.resolveFile("subdir2").createFolder();
- BaseFolder.resolveFile("subdir2/subfile1.txt").createFile();
+ baseFolder = VFS.getManager().resolveFile("ram://" +
FileIteratorTest.class.getName());
+ baseFolder.deleteAll();
+ baseFolder.resolveFile("a.htm").createFile();
+ baseFolder.resolveFile("a.html").createFile();
+ baseFolder.resolveFile("a.xhtml").createFile();
+ baseFolder.resolveFile("b.htm").createFile();
+ baseFolder.resolveFile("b.html").createFile();
+ baseFolder.resolveFile("b.xhtml").createFile();
+ baseFolder.resolveFile("c.htm").createFile();
+ baseFolder.resolveFile("c.html").createFile();
+ baseFolder.resolveFile("c.xhtml").createFile();
+ baseFolder.resolveFile("subdir1").createFolder();
+ baseFolder.resolveFile("subdir1/subfile1.txt").createFile();
+ baseFolder.resolveFile("subdir2").createFolder();
+ baseFolder.resolveFile("subdir2/subfile1.txt").createFile();
}
/**
@@ -66,24 +66,24 @@ public class FileIteratorTest {
*/
@AfterAll
public static void tearDownClass() throws Exception {
- if (BaseFolder != null) {
- BaseFolder.deleteAll();
+ if (baseFolder != null) {
+ baseFolder.deleteAll();
}
}
@Test
public void testIterator() throws FileSystemException {
- final FileObject[] findFiles =
BaseFolder.findFiles(Selectors.SELECT_ALL);
+ final FileObject[] findFiles =
baseFolder.findFiles(Selectors.SELECT_ALL);
assertEquals(FILE_COUNT, findFiles.length);
- final FileObject[] listFiles = BaseFolder.getChildren();
+ final FileObject[] listFiles = baseFolder.getChildren();
assertTrue(FILE_COUNT > listFiles.length);
int i = 0;
- for (final FileObject actualFile : BaseFolder) {
+ for (final FileObject actualFile : baseFolder) {
final FileObject expectedFile = findFiles[i];
assertEquals(expectedFile, actualFile);
i++;
}
- final Iterator<FileObject> iter = BaseFolder.iterator();
+ final Iterator<FileObject> iter = baseFolder.iterator();
i = 0;
while (iter.hasNext()) {
final FileObject expectedFile = findFiles[i];
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileTypeSelectorTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileTypeSelectorTest.java
index 2db5fb45..9abd9baf 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileTypeSelectorTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileTypeSelectorTest.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
*/
public class FileTypeSelectorTest {
- private static FileObject BaseFolder;
+ private static FileObject baseFolder;
/**
* Creates a RAM FS.
@@ -38,15 +38,15 @@ public class FileTypeSelectorTest {
*/
@BeforeAll
public static void setUpClass() throws Exception {
- BaseFolder = VFS.getManager().resolveFile("ram://" +
FileTypeSelectorTest.class.getName());
- BaseFolder.resolveFile("root1.html").createFile();
- BaseFolder.resolveFile("root2.html").createFile();
- BaseFolder.resolveFile("f1/a.html").createFile();
- BaseFolder.resolveFile("f2/b.html").createFile();
- BaseFolder.resolveFile("f3/c.html").createFile();
- BaseFolder.resolveFile("f4/").createFolder();
- BaseFolder.resolveFile("f5/").createFolder();
- BaseFolder.resolveFile("f6/f7").createFolder();
+ baseFolder = VFS.getManager().resolveFile("ram://" +
FileTypeSelectorTest.class.getName());
+ baseFolder.resolveFile("root1.html").createFile();
+ baseFolder.resolveFile("root2.html").createFile();
+ baseFolder.resolveFile("f1/a.html").createFile();
+ baseFolder.resolveFile("f2/b.html").createFile();
+ baseFolder.resolveFile("f3/c.html").createFile();
+ baseFolder.resolveFile("f4/").createFolder();
+ baseFolder.resolveFile("f5/").createFolder();
+ baseFolder.resolveFile("f6/f7").createFolder();
}
/**
@@ -56,15 +56,15 @@ public class FileTypeSelectorTest {
*/
@AfterAll
public static void tearDownClass() throws Exception {
- if (BaseFolder != null) {
- BaseFolder.deleteAll();
+ if (baseFolder != null) {
+ baseFolder.deleteAll();
}
}
@Test
public void testFileOrFolders() throws Exception {
final FileSelector selector = new
FileTypeSelector(FileType.FILE_OR_FOLDER);
- final FileObject[] foList = BaseFolder.findFiles(selector);
+ final FileObject[] foList = baseFolder.findFiles(selector);
// Why 0?
assertEquals(0, foList.length);
}
@@ -72,14 +72,14 @@ public class FileTypeSelectorTest {
@Test
public void testFiles() throws Exception {
final FileSelector selector = new FileTypeSelector(FileType.FILE);
- final FileObject[] foList = BaseFolder.findFiles(selector);
+ final FileObject[] foList = baseFolder.findFiles(selector);
assertEquals(5, foList.length);
}
@Test
public void testFolders() throws Exception {
final FileSelector selector = new FileTypeSelector(FileType.FOLDER);
- final FileObject[] foList = BaseFolder.findFiles(selector);
+ final FileObject[] foList = baseFolder.findFiles(selector);
assertEquals(8, foList.length);
}
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 3303eaa9..09f1a9f7 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
@@ -47,7 +47,7 @@ import org.junit.jupiter.api.Assertions;
*/
public class FtpProviderTestCase extends AbstractProviderTestConfig {
- private static int SocketPort;
+ private static int socketPort;
/**
* Use %40 for @ in URLs
@@ -75,7 +75,7 @@ public class FtpProviderTestCase extends
AbstractProviderTestConfig {
}
static int getSocketPort() {
- return SocketPort;
+ return socketPort;
}
private static String getSystemTestUriOverride() {
@@ -123,8 +123,8 @@ public class FtpProviderTestCase extends
AbstractProviderTestConfig {
// start the server
server = serverFactory.createServer();
server.start();
- SocketPort = ((org.apache.ftpserver.impl.DefaultFtpServer)
server).getListener("default").getPort();
- connectionUri = "ftp://test:test@localhost:"; + SocketPort;
+ socketPort = ((org.apache.ftpserver.impl.DefaultFtpServer)
server).getListener("default").getPort();
+ connectionUri = "ftp://test:test@localhost:"; + socketPort;
}
/**
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/AbstractFtpsProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/AbstractFtpsProviderTestCase.java
index 9d53bf9b..bd402c4e 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/AbstractFtpsProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/AbstractFtpsProviderTestCase.java
@@ -78,7 +78,7 @@ abstract class AbstractFtpsProviderTestCase extends
AbstractProviderTestConfig {
}
}
- private static int SocketPort;
+ private static int socketPort;
/**
* Use %40 for @ in URLs
