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-io.git
The following commit(s) were added to refs/heads/master by this push:
new 819cd6e0 Camel-case parameter and internal names
819cd6e0 is described below
commit 819cd6e03cdc90a018efb7b4299a88c66d416658
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Oct 19 09:02:16 2023 -0400
Camel-case parameter and internal names
---
.../serialization/ValidatingObjectInputStream.java | 2 +-
.../org/apache/commons/io/DirectoryWalkerTest.java | 4 +-
.../commons/io/DirectoryWalkerTestCaseJava4.java | 4 +-
.../apache/commons/io/FileUtilsListFilesTest.java | 86 +++++++++++-----------
.../java/org/apache/commons/io/FileUtilsTest.java | 14 ++--
.../AbstractConditionalFileFilterTest.java | 12 +--
.../java/org/apache/commons/io/test/TestUtils.java | 8 +-
7 files changed, 65 insertions(+), 65 deletions(-)
diff --git
a/src/main/java/org/apache/commons/io/serialization/ValidatingObjectInputStream.java
b/src/main/java/org/apache/commons/io/serialization/ValidatingObjectInputStream.java
index e0465c72..6e60f32e 100644
---
a/src/main/java/org/apache/commons/io/serialization/ValidatingObjectInputStream.java
+++
b/src/main/java/org/apache/commons/io/serialization/ValidatingObjectInputStream.java
@@ -109,7 +109,7 @@ public class ValidatingObjectInputStream extends
ObjectInputStream {
return this;
}
- /**
+ /**
* Checks that the class name conforms to requirements.
*
* @param name The class name
diff --git a/src/test/java/org/apache/commons/io/DirectoryWalkerTest.java
b/src/test/java/org/apache/commons/io/DirectoryWalkerTest.java
index 8089a5ea..ccb5c110 100644
--- a/src/test/java/org/apache/commons/io/DirectoryWalkerTest.java
+++ b/src/test/java/org/apache/commons/io/DirectoryWalkerTest.java
@@ -234,12 +234,12 @@ public class DirectoryWalkerTest {
private static final File outputDir = new File(ioDir, "output");
private static final File[] dirs = {orgDir, apacheDir, commonsDir,
ioDir, outputDir};
// Files
- private static final File filenameUtils = new File(ioDir,
"FilenameUtils.java");
+ private static final File fileNameUtils = new File(ioDir,
"FilenameUtils.java");
private static final File ioUtils = new File(ioDir, "IOUtils.java");
private static final File proxyWriter = new File(outputDir,
"ProxyWriter.java");
private static final File nullStream = new File(outputDir,
"NullOutputStream.java");
- private static final File[] ioFiles = {filenameUtils, ioUtils};
+ private static final File[] ioFiles = {fileNameUtils, ioUtils};
private static final File[] outputFiles = {proxyWriter, nullStream};
// Filters
diff --git
a/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java
b/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java
index 6d1720d8..ad7337dd 100644
--- a/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java
+++ b/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java
@@ -237,12 +237,12 @@ public class DirectoryWalkerTestCaseJava4 {
private static final File outputDir = new File(ioDir, "output");
private static final File[] dirs = {orgDir, apacheDir, commonsDir, ioDir,
outputDir};
// Files
- private static final File filenameUtils = new File(ioDir,
"FilenameUtils.java");
+ private static final File fileNameUtils = new File(ioDir,
"FilenameUtils.java");
private static final File ioUtils = new File(ioDir, "IOUtils.java");
private static final File proxyWriter = new File(outputDir,
"ProxyWriter.java");
private static final File nullStream = new File(outputDir,
"NullOutputStream.java");
- private static final File[] ioFiles = {filenameUtils, ioUtils};
+ private static final File[] ioFiles = {fileNameUtils, ioUtils};
private static final File[] outputFiles = {proxyWriter, nullStream};
// Filters
private static final IOFileFilter dirsFilter = createNameFilter(dirs);
diff --git a/src/test/java/org/apache/commons/io/FileUtilsListFilesTest.java
b/src/test/java/org/apache/commons/io/FileUtilsListFilesTest.java
index 93b79001..e65bc8de 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsListFilesTest.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsListFilesTest.java
@@ -97,11 +97,11 @@ public class FileUtilsListFilesTest {
Iterator<File> files = FileUtils.iterateFiles(temporaryFolder,
extensions, false);
try {
- final Collection<String> filenames = filesToFilenames(files);
- assertEquals(1, filenames.size());
- assertTrue(filenames.contains("dummy-build.xml"));
- assertFalse(filenames.contains("README"));
- assertFalse(filenames.contains("dummy-file.txt"));
+ final Collection<String> fileNames = filesToFilenames(files);
+ assertEquals(1, fileNames.size());
+ assertTrue(fileNames.contains("dummy-build.xml"));
+ assertFalse(fileNames.contains("README"));
+ assertFalse(fileNames.contains("dummy-file.txt"));
} finally {
// Backstop in case filesToFilenames() failure.
files.forEachRemaining(Consumers.nop());
@@ -109,10 +109,10 @@ public class FileUtilsListFilesTest {
try {
files = FileUtils.iterateFiles(temporaryFolder, extensions, true);
- final Collection<String> filenames = filesToFilenames(files);
- assertEquals(4, filenames.size());
- assertTrue(filenames.contains("dummy-file.txt"));
- assertFalse(filenames.contains("dummy-index.html"));
+ final Collection<String> fileNames = filesToFilenames(files);
+ assertEquals(4, fileNames.size());
+ assertTrue(fileNames.contains("dummy-file.txt"));
+ assertFalse(fileNames.contains("dummy-index.html"));
} finally {
// Backstop in case filesToFilenames() failure.
files.forEachRemaining(Consumers.nop());
@@ -120,11 +120,11 @@ public class FileUtilsListFilesTest {
files = FileUtils.iterateFiles(temporaryFolder, null, false);
try {
- final Collection<String> filenames = filesToFilenames(files);
- assertEquals(2, filenames.size());
- assertTrue(filenames.contains("dummy-build.xml"));
- assertTrue(filenames.contains("README"));
- assertFalse(filenames.contains("dummy-file.txt"));
+ final Collection<String> fileNames = filesToFilenames(files);
+ assertEquals(2, fileNames.size());
+ assertTrue(fileNames.contains("dummy-build.xml"));
+ assertTrue(fileNames.contains("README"));
+ assertFalse(fileNames.contains("dummy-file.txt"));
} finally {
// Backstop in case filesToFilenames() failure.
files.forEachRemaining(Consumers.nop());
@@ -134,45 +134,45 @@ public class FileUtilsListFilesTest {
@Test
public void testListFiles() {
Collection<File> files;
- Collection<String> filenames;
+ Collection<String> fileNames;
IOFileFilter fileFilter;
IOFileFilter dirFilter;
// First, find non-recursively
fileFilter = FileFilterUtils.trueFileFilter();
files = FileUtils.listFiles(temporaryFolder, fileFilter, null);
- filenames = filesToFilenames(files);
- assertTrue(filenames.contains("dummy-build.xml"), "'dummy-build.xml'
is missing");
- assertFalse(filenames.contains("dummy-index.html"),
"'dummy-index.html' shouldn't be found");
- assertFalse(filenames.contains("Entries"), "'Entries' shouldn't be
found");
+ fileNames = filesToFilenames(files);
+ assertTrue(fileNames.contains("dummy-build.xml"), "'dummy-build.xml'
is missing");
+ assertFalse(fileNames.contains("dummy-index.html"),
"'dummy-index.html' shouldn't be found");
+ assertFalse(fileNames.contains("Entries"), "'Entries' shouldn't be
found");
// Second, find recursively
fileFilter = FileFilterUtils.trueFileFilter();
dirFilter =
FileFilterUtils.notFileFilter(FileFilterUtils.nameFileFilter("CVS"));
files = FileUtils.listFiles(temporaryFolder, fileFilter, dirFilter);
- filenames = filesToFilenames(files);
- assertTrue(filenames.contains("dummy-build.xml"), "'dummy-build.xml'
is missing");
- assertTrue(filenames.contains("dummy-index.html"), "'dummy-index.html'
is missing");
- assertFalse(filenames.contains("Entries"), "'Entries' shouldn't be
found");
+ fileNames = filesToFilenames(files);
+ assertTrue(fileNames.contains("dummy-build.xml"), "'dummy-build.xml'
is missing");
+ assertTrue(fileNames.contains("dummy-index.html"), "'dummy-index.html'
is missing");
+ assertFalse(fileNames.contains("Entries"), "'Entries' shouldn't be
found");
// Do the same as above but now with the filter coming from
FileFilterUtils
fileFilter = FileFilterUtils.trueFileFilter();
dirFilter = FileFilterUtils.makeCVSAware(null);
files = FileUtils.listFiles(temporaryFolder, fileFilter, dirFilter);
- filenames = filesToFilenames(files);
- assertTrue(filenames.contains("dummy-build.xml"), "'dummy-build.xml'
is missing");
- assertTrue(filenames.contains("dummy-index.html"), "'dummy-index.html'
is missing");
- assertFalse(filenames.contains("Entries"), "'Entries' shouldn't be
found");
+ fileNames = filesToFilenames(files);
+ assertTrue(fileNames.contains("dummy-build.xml"), "'dummy-build.xml'
is missing");
+ assertTrue(fileNames.contains("dummy-index.html"), "'dummy-index.html'
is missing");
+ assertFalse(fileNames.contains("Entries"), "'Entries' shouldn't be
found");
// Again with the CVS filter but now with a non-null parameter
fileFilter = FileFilterUtils.trueFileFilter();
dirFilter = FileFilterUtils.prefixFileFilter("sub");
dirFilter = FileFilterUtils.makeCVSAware(dirFilter);
files = FileUtils.listFiles(temporaryFolder, fileFilter, dirFilter);
- filenames = filesToFilenames(files);
- assertTrue(filenames.contains("dummy-build.xml"), "'dummy-build.xml'
is missing");
- assertTrue(filenames.contains("dummy-index.html"), "'dummy-index.html'
is missing");
- assertFalse(filenames.contains("Entries"), "'Entries' shouldn't be
found");
+ fileNames = filesToFilenames(files);
+ assertTrue(fileNames.contains("dummy-build.xml"), "'dummy-build.xml'
is missing");
+ assertTrue(fileNames.contains("dummy-index.html"), "'dummy-index.html'
is missing");
+ assertFalse(fileNames.contains("Entries"), "'Entries' shouldn't be
found");
assertThrows(NullPointerException.class, () ->
FileUtils.listFiles(temporaryFolder, null, null));
}
@@ -183,23 +183,23 @@ public class FileUtilsListFilesTest {
Collection<File> files = FileUtils.listFiles(temporaryFolder,
extensions, false);
assertEquals(1, files.size());
- Collection<String> filenames = filesToFilenames(files);
- assertTrue(filenames.contains("dummy-build.xml"));
- assertFalse(filenames.contains("README"));
- assertFalse(filenames.contains("dummy-file.txt"));
+ Collection<String> fileNames = filesToFilenames(files);
+ assertTrue(fileNames.contains("dummy-build.xml"));
+ assertFalse(fileNames.contains("README"));
+ assertFalse(fileNames.contains("dummy-file.txt"));
files = FileUtils.listFiles(temporaryFolder, extensions, true);
- filenames = filesToFilenames(files);
- assertEquals(4, filenames.size());
- assertTrue(filenames.contains("dummy-file.txt"));
- assertFalse(filenames.contains("dummy-index.html"));
+ fileNames = filesToFilenames(files);
+ assertEquals(4, fileNames.size());
+ assertTrue(fileNames.contains("dummy-file.txt"));
+ assertFalse(fileNames.contains("dummy-index.html"));
files = FileUtils.listFiles(temporaryFolder, null, false);
assertEquals(2, files.size());
- filenames = filesToFilenames(files);
- assertTrue(filenames.contains("dummy-build.xml"));
- assertTrue(filenames.contains("README"));
- assertFalse(filenames.contains("dummy-file.txt"));
+ fileNames = filesToFilenames(files);
+ assertTrue(fileNames.contains("dummy-build.xml"));
+ assertTrue(fileNames.contains("README"));
+ assertFalse(fileNames.contains("dummy-file.txt"));
}
diff --git a/src/test/java/org/apache/commons/io/FileUtilsTest.java
b/src/test/java/org/apache/commons/io/FileUtilsTest.java
index 62fb8f50..2c820c8d 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsTest.java
@@ -1436,7 +1436,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
public void testFileUtils() throws Exception {
// Loads file from classpath
final File file1 = new File(tempDirFile, "test.txt");
- final String filename = file1.getAbsolutePath();
+ final String fileName = file1.getAbsolutePath();
//Create test file on-the-fly (used to be in CVS)
try (OutputStream out = Files.newOutputStream(file1.toPath())) {
@@ -1445,16 +1445,16 @@ public class FileUtilsTest extends AbstractTempDirTest {
final File file2 = new File(tempDirFile, "test2.txt");
- FileUtils.writeStringToFile(file2, filename, UTF_8);
+ FileUtils.writeStringToFile(file2, fileName, UTF_8);
assertTrue(file2.exists());
assertTrue(file2.length() > 0);
final String file2contents = FileUtils.readFileToString(file2, UTF_8);
- assertEquals(filename, file2contents, "Second file's contents
correct");
+ assertEquals(fileName, file2contents, "Second file's contents
correct");
assertTrue(file2.delete());
- final String contents = FileUtils.readFileToString(new File(filename),
UTF_8);
+ final String contents = FileUtils.readFileToString(new File(fileName),
UTF_8);
assertEquals("This is a test", contents, "FileUtils.fileRead()");
}
@@ -1629,8 +1629,8 @@ public class FileUtilsTest extends AbstractTempDirTest {
@Test
public void testIO575() throws IOException {
final Path sourceDir = Files.createTempDirectory("source-dir");
- final String filename = "some-file";
- final Path sourceFile = Files.createFile(sourceDir.resolve(filename));
+ final String fileName = "some-file";
+ final Path sourceFile = Files.createFile(sourceDir.resolve(fileName));
assertEquals(SystemUtils.IS_OS_WINDOWS,
sourceFile.toFile().canExecute());
@@ -1642,7 +1642,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
FileUtils.copyDirectory(sourceDir.toFile(), destDir.toFile());
- final Path destFile = destDir.resolve(filename);
+ final Path destFile = destDir.resolve(fileName);
assertTrue(destFile.toFile().exists());
assertTrue(destFile.toFile().canExecute());
diff --git
a/src/test/java/org/apache/commons/io/filefilter/AbstractConditionalFileFilterTest.java
b/src/test/java/org/apache/commons/io/filefilter/AbstractConditionalFileFilterTest.java
index 5a99d620..a663e5f6 100644
---
a/src/test/java/org/apache/commons/io/filefilter/AbstractConditionalFileFilterTest.java
+++
b/src/test/java/org/apache/commons/io/filefilter/AbstractConditionalFileFilterTest.java
@@ -104,7 +104,7 @@ public abstract class AbstractConditionalFileFilterTest
extends AbstractIOFileFi
final boolean[] trueResults = testTrueResults.get(i);
final boolean[] falseResults = testFalseResults.get(i);
final boolean fileResults = testFileResults.get(i);
- final boolean filenameResults = testFilenameResults.get(i);
+ final boolean fileNameResults = testFilenameResults.get(i);
// Test conditional AND filter created by passing filters to the
constructor
final IOFileFilter filter = this.buildFilterUsingAdd(filters);
@@ -116,10 +116,10 @@ public abstract class AbstractConditionalFileFilterTest
extends AbstractIOFileFi
assertTrueFiltersInvoked(i, trueFilters, trueResults);
assertFalseFiltersInvoked(i, falseFilters, falseResults);
- // Test as a filename filter
+ // Test as a file name filter
resetTrueFilters(this.trueFilters);
resetFalseFilters(this.falseFilters);
- assertFilenameFiltering(i, filter, this.file, filenameResults);
+ assertFilenameFiltering(i, filter, this.file, fileNameResults);
assertTrueFiltersInvoked(i, trueFilters, trueResults);
assertFalseFiltersInvoked(i, falseFilters, falseResults);
}
@@ -138,7 +138,7 @@ public abstract class AbstractConditionalFileFilterTest
extends AbstractIOFileFi
final boolean[] trueResults = testTrueResults.get(i);
final boolean[] falseResults = testFalseResults.get(i);
final boolean fileResults = testFileResults.get(i);
- final boolean filenameResults = testFilenameResults.get(i);
+ final boolean fileNameResults = testFilenameResults.get(i);
// Test conditional AND filter created by passing filters to the
constructor
final IOFileFilter filter =
this.buildFilterUsingConstructor(filters);
@@ -150,10 +150,10 @@ public abstract class AbstractConditionalFileFilterTest
extends AbstractIOFileFi
assertTrueFiltersInvoked(i, trueFilters, trueResults);
assertFalseFiltersInvoked(i, falseFilters, falseResults);
- // Test as a filename filter
+ // Test as a file name filter
resetTrueFilters(this.trueFilters);
resetFalseFilters(this.falseFilters);
- assertFilenameFiltering(i, filter, this.file, filenameResults);
+ assertFilenameFiltering(i, filter, this.file, fileNameResults);
assertTrueFiltersInvoked(i, trueFilters, trueResults);
assertFalseFiltersInvoked(i, falseFilters, falseResults);
}
diff --git a/src/test/java/org/apache/commons/io/test/TestUtils.java
b/src/test/java/org/apache/commons/io/test/TestUtils.java
index 0620603d..3a01f702 100644
--- a/src/test/java/org/apache/commons/io/test/TestUtils.java
+++ b/src/test/java/org/apache/commons/io/test/TestUtils.java
@@ -224,11 +224,11 @@ public abstract class TestUtils {
}
}
- public static File newFile(final File testDirectory, final String
filename) throws IOException {
- final File destination = new File(testDirectory, filename);
+ public static File newFile(final File testDirectory, final String
fileName) throws IOException {
+ final File destination = new File(testDirectory, fileName);
/*
- assertTrue( filename + "Test output data file shouldn't previously
exist",
- !destination.exists() );
+ assertTrue(fileName + "Test output data file shouldn't previously
exist",
+ !destination.exists());
*/
if (destination.exists()) {
FileUtils.forceDelete(destination);
