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 5e5f4abd Spelling (#468)
5e5f4abd is described below
commit 5e5f4abd68a932e9de8ea894b55268ebee1886ce
Author: Josh Soref <[email protected]>
AuthorDate: Wed Jul 26 12:17:36 2023 -0400
Spelling (#468)
* spelling: actual
Signed-off-by: Josh Soref <[email protected]>
* spelling: adapter
Signed-off-by: Josh Soref <[email protected]>
* spelling: bufin
Signed-off-by: Josh Soref <[email protected]>
* spelling: compatibility
Signed-off-by: Josh Soref <[email protected]>
* spelling: creator
Signed-off-by: Josh Soref <[email protected]>
* spelling: expected
Signed-off-by: Josh Soref <[email protected]>
* spelling: in
Signed-off-by: Josh Soref <[email protected]>
* spelling: inline
Signed-off-by: Josh Soref <[email protected]>
* spelling: necessary
Signed-off-by: Josh Soref <[email protected]>
* spelling: non-existent
Signed-off-by: Josh Soref <[email protected]>
* spelling: noseparator
Signed-off-by: Josh Soref <[email protected]>
* spelling: output
Signed-off-by: Josh Soref <[email protected]>
* spelling: reader constructor
Signed-off-by: Josh Soref <[email protected]>
* spelling: reuse
Signed-off-by: Josh Soref <[email protected]>
* spelling: thread
Signed-off-by: Josh Soref <[email protected]>
* spelling: timestamped
Signed-off-by: Josh Soref <[email protected]>
---------
Signed-off-by: Josh Soref <[email protected]>
---
RELEASE-NOTES.txt | 2 +-
.../java/org/apache/commons/io/FileSystem.java | 2 +-
src/main/java/org/apache/commons/io/FileUtils.java | 20 ++++++++++----------
.../commons/io/build/AbstractStreamBuilder.java | 2 +-
.../apache/commons/io/input/QueueInputStream.java | 2 +-
.../commons/io/input/TimestampedObserver.java | 6 +++---
.../commons/io/output/ChunkedOutputStream.java | 2 +-
.../commons/io/FileUtilsCleanSymlinksTest.java | 10 +++++-----
.../java/org/apache/commons/io/FileUtilsTest.java | 18 +++++++++---------
.../org/apache/commons/io/FilenameUtilsTest.java | 22 +++++++++++-----------
.../java/org/apache/commons/io/IOUtilsTest.java | 14 +++++++-------
.../io/comparator/SizeFileComparatorTest.java | 8 ++++----
.../org/apache/commons/io/file/PathUtilsTest.java | 6 +++---
.../commons/io/function/IOBaseStreamTest.java | 4 ++--
.../apache/commons/io/function/IOStreamTest.java | 10 +++++-----
.../ReversedLinesFileReaderTestParamFile.java | 2 +-
.../org/apache/commons/io/input/TailerTest.java | 4 ++--
.../UnsynchronizedBufferedInputStreamTest.java | 18 +++++++++---------
18 files changed, 76 insertions(+), 76 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 0b351a4b..23ba04a5 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1747,7 +1747,7 @@ Enhancements from 1.0
- LockableFileWriter - encoding support [36825]
Add support for character encodings to LockableFileWriter
Improve the validation
- Create directories if necesssary
+ Create directories if necessary
- IOUtils and EndianUtils are no longer final [28978]
Allows developers to have subclasses if desired
diff --git a/src/main/java/org/apache/commons/io/FileSystem.java
b/src/main/java/org/apache/commons/io/FileSystem.java
index d71bd373..c7dbdfa8 100644
--- a/src/main/java/org/apache/commons/io/FileSystem.java
+++ b/src/main/java/org/apache/commons/io/FileSystem.java
@@ -215,7 +215,7 @@ public enum FileSystem {
* (this.codePointAt(<i>k</i>) == searchChar) && (<i>k</i> >=
start)
* </pre></blockquote>
* <p>
- * is true. In either case, if no such character occurs inm {@code cs}
+ * is true. In either case, if no such character occurs in {@code cs}
* at or after position {@code start}, then
* {@code -1} is returned.
* </p>
diff --git a/src/main/java/org/apache/commons/io/FileUtils.java
b/src/main/java/org/apache/commons/io/FileUtils.java
index 736aafd6..807dc37c 100644
--- a/src/main/java/org/apache/commons/io/FileUtils.java
+++ b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -1088,8 +1088,8 @@ public class FileUtils {
}
/**
- * Creates all parent directories for a File object, including any
necessary but nonexistent parent directories. If a parent directory already
exists or is
- * null, nothing happens.
+ * Creates all parent directories for a File object, including any
necessary but non-existent parent directories. If a parent directory already
exists or
+ * is null, nothing happens.
*
* @param file the File that may need parents, may be null.
* @return The parent directory, or {@code null} if the given File does
have a parent.
@@ -1281,7 +1281,7 @@ public class FileUtils {
/**
* Internal copy directory method. Creates all destination parent
directories,
- * including any necessary but nonexistent parent directories.
+ * including any necessary but non-existent parent directories.
*
* @param srcDir the validated source directory, must not be {@code null}.
* @param destDir the validated destination directory, must not be {@code
null}.
@@ -1364,7 +1364,7 @@ public class FileUtils {
}
/**
- * Creates all directories for a File object, including any necessary but
nonexistent parent directories. If the {@code directory} already exists or is
+ * Creates all directories for a File object, including any necessary but
non-existent parent directories. If the {@code directory} already exists or is
* null, nothing happens.
* <p>
* Calls {@link File#mkdirs()} and throws an {@link IOException} on
failure.
@@ -1381,8 +1381,8 @@ public class FileUtils {
}
/**
- * Creates all directories for a File object, including any necessary but
nonexistent parent directories. If the parent directory already exists or is
null,
- * nothing happens.
+ * Creates all directories for a File object, including any necessary but
non-existent parent directories. If the parent directory already exists or is
+ * null, nothing happens.
* <p>
* Calls {@link File#mkdirs()} for the parent of @{code file}.
* </p>
@@ -2270,7 +2270,7 @@ public class FileUtils {
/**
* Calls {@link File#mkdirs()} and throws an {@link IOException} on
failure.
* <p>
- * Creates all directories for a File object, including any necessary but
nonexistent parent directories. If the {@code directory} already exists or is
+ * Creates all directories for a File object, including any necessary but
non-existent parent directories. If the {@code directory} already exists or is
* null, nothing happens.
* </p>
*
@@ -2322,7 +2322,7 @@ public class FileUtils {
/**
* Moves a directory to another directory.
* <p>
- * If {@code createDestDir} is true, creates all destination parent
directories, including any necessary but nonexistent parent directories.
+ * If {@code createDestDir} is true, creates all destination parent
directories, including any necessary but non-existent parent directories.
* </p>
*
* @param source the file to be moved.
@@ -2407,7 +2407,7 @@ public class FileUtils {
/**
* Moves a file to a directory.
* <p>
- * If {@code createDestDir} is true, creates all destination parent
directories, including any necessary but nonexistent parent directories.
+ * If {@code createDestDir} is true, creates all destination parent
directories, including any necessary but non-existent parent directories.
* </p>
*
* @param srcFile the file to be moved.
@@ -2436,7 +2436,7 @@ public class FileUtils {
/**
* Moves a file or directory to a destination directory.
* <p>
- * If {@code createDestDir} is true, creates all destination parent
directories, including any necessary but nonexistent parent directories.
+ * If {@code createDestDir} is true, creates all destination parent
directories, including any necessary but non-existent parent directories.
* </p>
* <p>
* When the destination is on another file system, do a "copy and delete".
diff --git
a/src/main/java/org/apache/commons/io/build/AbstractStreamBuilder.java
b/src/main/java/org/apache/commons/io/build/AbstractStreamBuilder.java
index 67dcec42..d94638ac 100644
--- a/src/main/java/org/apache/commons/io/build/AbstractStreamBuilder.java
+++ b/src/main/java/org/apache/commons/io/build/AbstractStreamBuilder.java
@@ -163,7 +163,7 @@ public abstract class AbstractStreamBuilder<T, B extends
AbstractStreamBuilder<T
*
* @return An OutputStream
* @throws IOException if an I/O error occurs.
- * @throws UnsupportedOperationException if the origin cannot be converted
to an OututStream.
+ * @throws UnsupportedOperationException if the origin cannot be converted
to an OutputStream.
* @throws IllegalStateException if the {@code origin} is {@code
null}.
* @see AbstractOrigin#getOutputStream(OpenOption...)
* @since 2.13.0
diff --git a/src/main/java/org/apache/commons/io/input/QueueInputStream.java
b/src/main/java/org/apache/commons/io/input/QueueInputStream.java
index 5669a3d6..1ed2e84a 100644
--- a/src/main/java/org/apache/commons/io/input/QueueInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/QueueInputStream.java
@@ -204,7 +204,7 @@ public class QueueInputStream extends InputStream {
return value == null ? EOF : 0xFF & value;
} catch (final InterruptedException e) {
Thread.currentThread().interrupt();
- // throw runtime unchecked exception to maintain signature
backward-compatibilty of
+ // throw runtime unchecked exception to maintain signature
backward-compatibility of
// this read method, which does not declare IOException
throw new IllegalStateException(e);
}
diff --git a/src/main/java/org/apache/commons/io/input/TimestampedObserver.java
b/src/main/java/org/apache/commons/io/input/TimestampedObserver.java
index df18a6cf..c331c86c 100644
--- a/src/main/java/org/apache/commons/io/input/TimestampedObserver.java
+++ b/src/main/java/org/apache/commons/io/input/TimestampedObserver.java
@@ -30,12 +30,12 @@ import
org.apache.commons.io.input.ObservableInputStream.Observer;
* </p>
*
* <pre>
- * final TimestampedObserver timetampedObserver = new TimestampedObserver();
+ * final TimestampedObserver timestampedObserver = new TimestampedObserver();
* try (ObservableInputStream inputStream = new ObservableInputStream(...),
- * timetampedObserver)) {
+ * timestampedObserver)) {
* ...
* }
- * System.out.printf("IO duration: %s%n",
timetampedObserver.getOpenToCloseDuration());
+ * System.out.printf("IO duration: %s%n",
timestampedObserver.getOpenToCloseDuration());
* </pre>
*
* @since 2.9.0
diff --git
a/src/main/java/org/apache/commons/io/output/ChunkedOutputStream.java
b/src/main/java/org/apache/commons/io/output/ChunkedOutputStream.java
index 854939f0..b8e2abe2 100644
--- a/src/main/java/org/apache/commons/io/output/ChunkedOutputStream.java
+++ b/src/main/java/org/apache/commons/io/output/ChunkedOutputStream.java
@@ -68,7 +68,7 @@ public class ChunkedOutputStream extends FilterOutputStream {
*
* @return a new instance.
* @throws IOException if an I/O error occurs.
- * @throws UnsupportedOperationException if the origin cannot be
converted to an OututStream.
+ * @throws UnsupportedOperationException if the origin cannot be
converted to an OutputStream.
* @see #getOutputStream()
*/
@Override
diff --git
a/src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTest.java
b/src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTest.java
index 8e7194c0..38db7645 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTest.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTest.java
@@ -192,16 +192,16 @@ public class FileUtilsCleanSymlinksTest {
return;
}
- final File noexistFile = new File(top, "noexist");
+ final File nonExistentFile = new File(top, "non-existent");
final File symlinkFile = new File(top, "fakeinner");
final File badSymlinkInPathFile = new File(symlinkFile, "fakeinner");
- final File noexistParentFile = new File("noexist", "file");
+ final File nonExistentParentFile = new File("non-existent", "file");
- assertTrue(setupSymlink(noexistFile, symlinkFile));
+ assertTrue(setupSymlink(nonExistentFile, symlinkFile));
assertTrue(FileUtils.isSymlink(symlinkFile));
- assertFalse(FileUtils.isSymlink(noexistFile));
- assertFalse(FileUtils.isSymlink(noexistParentFile));
+ assertFalse(FileUtils.isSymlink(nonExistentFile));
+ assertFalse(FileUtils.isSymlink(nonExistentParentFile));
assertFalse(FileUtils.isSymlink(badSymlinkInPathFile));
}
diff --git a/src/test/java/org/apache/commons/io/FileUtilsTest.java
b/src/test/java/org/apache/commons/io/FileUtilsTest.java
index 4f2bfebc..4d976c4e 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsTest.java
@@ -2101,7 +2101,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
public void testMoveDirectory_Errors() throws Exception {
assertThrows(NullPointerException.class, () ->
FileUtils.moveDirectory(null, new File("foo")));
assertThrows(NullPointerException.class, () ->
FileUtils.moveDirectory(new File("foo"), null));
- assertThrows(FileNotFoundException.class, () ->
FileUtils.moveDirectory(new File("nonexistant"), new File("foo")));
+ assertThrows(FileNotFoundException.class, () ->
FileUtils.moveDirectory(new File("non-existent"), new File("foo")));
final File testFile = new File(tempDirFile, "testMoveDirectoryFile");
if (!testFile.getParentFile().exists()) {
@@ -2201,8 +2201,8 @@ public class FileUtilsTest extends AbstractTempDirTest {
}
assertThrows(IOException.class, () ->
FileUtils.moveDirectoryToDirectory(testFile1, testFile2, true));
- final File nonexistant = new File(tempDirFile,
"testMoveFileNonExistant");
- assertThrows(IOException.class, () ->
FileUtils.moveDirectoryToDirectory(testFile1, nonexistant, false));
+ final File nonExistent = new File(tempDirFile,
"testMoveFileNonExistent");
+ assertThrows(IOException.class, () ->
FileUtils.moveDirectoryToDirectory(testFile1, nonExistent, false));
}
@Test
@@ -2316,7 +2316,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
public void testMoveFile_Errors() throws Exception {
assertThrows(NullPointerException.class, () ->
FileUtils.moveFile(null, new File("foo")));
assertThrows(NullPointerException.class, () -> FileUtils.moveFile(new
File("foo"), null));
- assertThrows(FileNotFoundException.class, () -> FileUtils.moveFile(new
File("nonexistant"), new File("foo")));
+ assertThrows(FileNotFoundException.class, () -> FileUtils.moveFile(new
File("non-existent"), new File("foo")));
assertThrows(IllegalArgumentException.class, () ->
FileUtils.moveFile(tempDirFile, new File("foo")));
final File testSourceFile = new File(tempDirFile,
"testMoveFileSource");
final File testDestFile = new File(tempDirFile, "testMoveFileSource");
@@ -2384,8 +2384,8 @@ public class FileUtilsTest extends AbstractTempDirTest {
}
assertThrows(IllegalArgumentException.class, () ->
FileUtils.moveFileToDirectory(testFile1, testFile2, true));
- final File nonexistant = new File(tempDirFile,
"testMoveFileNonExistant");
- assertThrows(IOException.class, () ->
FileUtils.moveFileToDirectory(testFile1, nonexistant, false));
+ final File nonExistent = new File(tempDirFile,
"testMoveFileNonExistent");
+ assertThrows(IOException.class, () ->
FileUtils.moveFileToDirectory(testFile1, nonExistent, false));
}
@Test
@@ -2426,9 +2426,9 @@ public class FileUtilsTest extends AbstractTempDirTest {
public void testMoveToDirectory_Errors() throws Exception {
assertThrows(NullPointerException.class, () ->
FileUtils.moveDirectoryToDirectory(null, new File("foo"), true));
assertThrows(NullPointerException.class, () ->
FileUtils.moveDirectoryToDirectory(new File("foo"), null, true));
- final File nonexistant = new File(tempDirFile, "nonexistant");
+ final File nonExistent = new File(tempDirFile, "non-existent");
final File destDir = new File(tempDirFile, "MoveToDirectoryDestDir");
- assertThrows(IOException.class, () ->
FileUtils.moveToDirectory(nonexistant, destDir, true), "Expected IOException
when source does not exist");
+ assertThrows(IOException.class, () ->
FileUtils.moveToDirectory(nonExistent, destDir, true), "Expected IOException
when source does not exist");
}
@@ -2592,7 +2592,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
file.delete();
file.mkdir();
- final File nonEmptyFile = new File(file, "nonEmptyFile" +
System.nanoTime());
+ final File nonEmptyFile = new File(file, "non-emptyFile" +
System.nanoTime());
assertTrue(nonEmptyFile.getParentFile().exists(), () -> "Cannot create
file " + nonEmptyFile + " as the parent directory does not exist");
final OutputStream output = new
BufferedOutputStream(Files.newOutputStream(nonEmptyFile.toPath()));
try {
diff --git a/src/test/java/org/apache/commons/io/FilenameUtilsTest.java
b/src/test/java/org/apache/commons/io/FilenameUtilsTest.java
index 5055eaf4..21891cc3 100644
--- a/src/test/java/org/apache/commons/io/FilenameUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/FilenameUtilsTest.java
@@ -218,7 +218,7 @@ public class FilenameUtilsTest {
@Test
public void testGetBaseName() {
assertNull(FilenameUtils.getBaseName(null));
- assertEquals("noseperator",
FilenameUtils.getBaseName("noseperator.inthispath"));
+ assertEquals("noseparator",
FilenameUtils.getBaseName("noseparator.inthispath"));
assertEquals("c", FilenameUtils.getBaseName("a/b/c.txt"));
assertEquals("c", FilenameUtils.getBaseName("a/b/c"));
assertEquals("", FilenameUtils.getBaseName("a/b/c/"));
@@ -264,7 +264,7 @@ public class FilenameUtilsTest {
@Test
public void testGetFullPath() {
assertNull(FilenameUtils.getFullPath(null));
- assertEquals("", FilenameUtils.getFullPath("noseperator.inthispath"));
+ assertEquals("", FilenameUtils.getFullPath("noseparator.inthispath"));
assertEquals("a/b/", FilenameUtils.getFullPath("a/b/c.txt"));
assertEquals("a/b/", FilenameUtils.getFullPath("a/b/c"));
assertEquals("a/b/c/", FilenameUtils.getFullPath("a/b/c/"));
@@ -306,7 +306,7 @@ public class FilenameUtilsTest {
@Test
public void testGetFullPathNoEndSeparator() {
assertNull(FilenameUtils.getFullPathNoEndSeparator(null));
- assertEquals("",
FilenameUtils.getFullPathNoEndSeparator("noseperator.inthispath"));
+ assertEquals("",
FilenameUtils.getFullPathNoEndSeparator("noseparator.inthispath"));
assertEquals("a/b",
FilenameUtils.getFullPathNoEndSeparator("a/b/c.txt"));
assertEquals("a/b", FilenameUtils.getFullPathNoEndSeparator("a/b/c"));
assertEquals("a/b/c",
FilenameUtils.getFullPathNoEndSeparator("a/b/c/"));
@@ -367,7 +367,7 @@ public class FilenameUtilsTest {
@Test
public void testGetName() {
assertNull(FilenameUtils.getName(null));
- assertEquals("noseperator.inthispath",
FilenameUtils.getName("noseperator.inthispath"));
+ assertEquals("noseparator.inthispath",
FilenameUtils.getName("noseparator.inthispath"));
assertEquals("c.txt", FilenameUtils.getName("a/b/c.txt"));
assertEquals("c", FilenameUtils.getName("a/b/c"));
assertEquals("", FilenameUtils.getName("a/b/c/"));
@@ -377,9 +377,9 @@ public class FilenameUtilsTest {
@Test
public void testGetPath() {
assertNull(FilenameUtils.getPath(null));
- assertEquals("", FilenameUtils.getPath("noseperator.inthispath"));
- assertEquals("", FilenameUtils.getPath("/noseperator.inthispath"));
- assertEquals("", FilenameUtils.getPath("\\noseperator.inthispath"));
+ assertEquals("", FilenameUtils.getPath("noseparator.inthispath"));
+ assertEquals("", FilenameUtils.getPath("/noseparator.inthispath"));
+ assertEquals("", FilenameUtils.getPath("\\noseparator.inthispath"));
assertEquals("a/b/", FilenameUtils.getPath("a/b/c.txt"));
assertEquals("a/b/", FilenameUtils.getPath("a/b/c"));
assertEquals("a/b/c/", FilenameUtils.getPath("a/b/c/"));
@@ -420,9 +420,9 @@ public class FilenameUtilsTest {
@Test
public void testGetPathNoEndSeparator() {
assertNull(FilenameUtils.getPath(null));
- assertEquals("", FilenameUtils.getPath("noseperator.inthispath"));
- assertEquals("",
FilenameUtils.getPathNoEndSeparator("/noseperator.inthispath"));
- assertEquals("",
FilenameUtils.getPathNoEndSeparator("\\noseperator.inthispath"));
+ assertEquals("", FilenameUtils.getPath("noseparator.inthispath"));
+ assertEquals("",
FilenameUtils.getPathNoEndSeparator("/noseparator.inthispath"));
+ assertEquals("",
FilenameUtils.getPathNoEndSeparator("\\noseparator.inthispath"));
assertEquals("a/b", FilenameUtils.getPathNoEndSeparator("a/b/c.txt"));
assertEquals("a/b", FilenameUtils.getPathNoEndSeparator("a/b/c"));
assertEquals("a/b/c", FilenameUtils.getPathNoEndSeparator("a/b/c/"));
@@ -601,7 +601,7 @@ public class FilenameUtilsTest {
@Test
public void testIndexOfLastSeparator() {
assertEquals(-1, FilenameUtils.indexOfLastSeparator(null));
- assertEquals(-1,
FilenameUtils.indexOfLastSeparator("noseperator.inthispath"));
+ assertEquals(-1,
FilenameUtils.indexOfLastSeparator("noseparator.inthispath"));
assertEquals(3, FilenameUtils.indexOfLastSeparator("a/b/c"));
assertEquals(3, FilenameUtils.indexOfLastSeparator("a\\b\\c"));
}
diff --git a/src/test/java/org/apache/commons/io/IOUtilsTest.java
b/src/test/java/org/apache/commons/io/IOUtilsTest.java
index c84bb2aa..e361e885 100644
--- a/src/test/java/org/apache/commons/io/IOUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/IOUtilsTest.java
@@ -1334,7 +1334,7 @@ public class IOUtilsTest {
}
@Test
- public void testSkipFully_InputStream_Buffer_Resuse_bytes() throws
Exception {
+ public void testSkipFully_InputStream_Buffer_Reuse_bytes() throws
Exception {
final int size = 1027;
final byte[] ba = new byte[size];
final Supplier<byte[]> bas = () -> ba;
@@ -1348,7 +1348,7 @@ public class IOUtilsTest {
}
@Test
- public void testSkipFully_InputStream_Buffer_Resuse_ThreadLocal() throws
Exception {
+ public void testSkipFully_InputStream_Buffer_Reuse_ThreadLocal() throws
Exception {
final int size = 1027;
final ThreadLocal<byte[]> tl = ThreadLocal.withInitial(() -> new
byte[size]);
try (final InputStream input = new ByteArrayInputStream(new
byte[size])) {
@@ -1512,11 +1512,11 @@ public class IOUtilsTest {
@Test
public void testToByteArray_Reader() throws IOException {
final String charsetName = UTF_8;
- final byte[] expecteds = charsetName.getBytes(charsetName);
- byte[] actuals = IOUtils.toByteArray(new InputStreamReader(new
ByteArrayInputStream(expecteds)));
- assertArrayEquals(expecteds, actuals);
- actuals = IOUtils.toByteArray(new InputStreamReader(new
ByteArrayInputStream(expecteds)), charsetName);
- assertArrayEquals(expecteds, actuals);
+ final byte[] expected = charsetName.getBytes(charsetName);
+ byte[] actual = IOUtils.toByteArray(new InputStreamReader(new
ByteArrayInputStream(expected)));
+ assertArrayEquals(expected, actual);
+ actual = IOUtils.toByteArray(new InputStreamReader(new
ByteArrayInputStream(expected)), charsetName);
+ assertArrayEquals(expected, actual);
}
@Test
diff --git
a/src/test/java/org/apache/commons/io/comparator/SizeFileComparatorTest.java
b/src/test/java/org/apache/commons/io/comparator/SizeFileComparatorTest.java
index 50f34c59..34e2236a 100644
--- a/src/test/java/org/apache/commons/io/comparator/SizeFileComparatorTest.java
+++ b/src/test/java/org/apache/commons/io/comparator/SizeFileComparatorTest.java
@@ -95,9 +95,9 @@ public class SizeFileComparatorTest extends
ComparatorAbstractTest {
* Test a file which doesn't exist.
*/
@Test
- public void testNonexistantFile() {
- final File nonexistantFile = new File(FileUtils.current(),
"nonexistant.txt");
- assertFalse(nonexistantFile.exists());
- assertTrue(comparator.compare(nonexistantFile, moreFile) < 0, "less");
+ public void testNonExistentFile() {
+ final File nonExistentFile = new File(FileUtils.current(),
"non-existent.txt");
+ assertFalse(nonExistentFile.exists());
+ assertTrue(comparator.compare(nonExistentFile, moreFile) < 0, "less");
}
}
diff --git a/src/test/java/org/apache/commons/io/file/PathUtilsTest.java
b/src/test/java/org/apache/commons/io/file/PathUtilsTest.java
index 860ae36c..622937e4 100644
--- a/src/test/java/org/apache/commons/io/file/PathUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/file/PathUtilsTest.java
@@ -99,7 +99,7 @@ public class PathUtilsTest extends AbstractTempDirTest {
return Files.getLastModifiedTime(file).toMillis();
}
- private Path getNonExistantPath() {
+ private Path getNonExistentPath() {
return Paths.get("/does not exist/for/certain");
}
@@ -252,13 +252,13 @@ public class PathUtilsTest extends AbstractTempDirTest {
@Test
public void testGetLastModifiedFileTime_Path_Absent() throws IOException {
- assertNull(PathUtils.getLastModifiedFileTime(getNonExistantPath()));
+ assertNull(PathUtils.getLastModifiedFileTime(getNonExistentPath()));
}
@Test
public void testGetLastModifiedFileTime_Path_FileTime_Absent() throws
IOException {
final FileTime fromMillis = FileTime.fromMillis(0);
- assertEquals(fromMillis,
PathUtils.getLastModifiedFileTime(getNonExistantPath(), fromMillis));
+ assertEquals(fromMillis,
PathUtils.getLastModifiedFileTime(getNonExistentPath(), fromMillis));
}
@Test
diff --git a/src/test/java/org/apache/commons/io/function/IOBaseStreamTest.java
b/src/test/java/org/apache/commons/io/function/IOBaseStreamTest.java
index 45f68c95..1c05418c 100644
--- a/src/test/java/org/apache/commons/io/function/IOBaseStreamTest.java
+++ b/src/test/java/org/apache/commons/io/function/IOBaseStreamTest.java
@@ -107,14 +107,14 @@ public class IOBaseStreamTest {
baseStream = createStreamOfPaths();
ioBaseStream = createIOBaseStream();
ioBaseStreamPath = createIOBaseStreamPath();
- ioBaseStreamAdapter = createIOBaseStreamApapter();
+ ioBaseStreamAdapter = createIOBaseStreamAdapter();
}
private IOBaseStreamFixture<Path, ?, Stream<Path>> createIOBaseStream() {
return new IOBaseStreamFixture<>(createStreamOfPaths());
}
- private IOStream<Path> createIOBaseStreamApapter() {
+ private IOStream<Path> createIOBaseStreamAdapter() {
return IOStreamAdapter.adapt(createStreamOfPaths());
}
diff --git a/src/test/java/org/apache/commons/io/function/IOStreamTest.java
b/src/test/java/org/apache/commons/io/function/IOStreamTest.java
index 4fb8abe3..198a361c 100644
--- a/src/test/java/org/apache/commons/io/function/IOStreamTest.java
+++ b/src/test/java/org/apache/commons/io/function/IOStreamTest.java
@@ -214,7 +214,7 @@ public class IOStreamTest {
public void testForaAllIOConsumer() throws IOException {
// compile vs type
assertThrows(IOException.class, () ->
IOStream.of("A").forAll(TestUtils.throwingIOConsumer()));
- // compile vs inlnine
+ // compile vs inline
assertThrows(IOException.class, () -> IOStream.of("A").forAll(e -> {
throw new IOException("Failure");
}));
@@ -229,7 +229,7 @@ public class IOStreamTest {
public void testForaAllIOConsumerBiFunction() throws IOException {
// compile vs type
assertThrows(IOException.class, () ->
IOStream.of("A").forAll(TestUtils.throwingIOConsumer(), (i, e) -> e));
- // compile vs inlnine
+ // compile vs inline
assertThrows(IOException.class, () -> IOStream.of("A").forAll(e -> {
throw new IOException("Failure");
}, (i, e) -> e));
@@ -244,7 +244,7 @@ public class IOStreamTest {
public void testForaAllIOConsumerBiFunctionNull() throws IOException {
// compile vs type
assertDoesNotThrow(() ->
IOStream.of("A").forAll(TestUtils.throwingIOConsumer(), null));
- // compile vs inlnine
+ // compile vs inline
assertDoesNotThrow(() -> IOStream.of("A").forAll(e -> {
throw new IOException("Failure");
}, null));
@@ -259,7 +259,7 @@ public class IOStreamTest {
public void testForEachIOConsumerOfQsuperT() throws IOException {
// compile vs type
assertThrows(IOException.class, () ->
IOStream.of("A").forEach(TestUtils.throwingIOConsumer()));
- // compile vs inlnine
+ // compile vs inline
assertThrows(IOException.class, () -> IOStream.of("A").forEach(e -> {
throw new IOException("Failure");
}));
@@ -274,7 +274,7 @@ public class IOStreamTest {
public void testForEachOrdered() throws IOException {
// compile vs type
assertThrows(IOException.class, () ->
IOStream.of("A").forEach(TestUtils.throwingIOConsumer()));
- // compile vs inlnine
+ // compile vs inline
assertThrows(IOException.class, () -> IOStream.of("A").forEach(e -> {
throw new IOException("Failure");
}));
diff --git
a/src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java
b/src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java
index 42d95f45..71795e09 100644
---
a/src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java
+++
b/src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java
@@ -121,7 +121,7 @@ public class ReversedLinesFileReaderTestParamFile {
filePath = Files.copy(filePath, fileSystem.getPath("/" +
fileName));
}
- // We want to test null Charset in the
ReversedLinesFileReaderconstructor.
+ // We want to test null Charset in the ReversedLinesFileReader
constructor.
final Charset charset = charsetName != null ?
Charset.forName(charsetName) : null;
try (ReversedLinesFileReader reversedLinesFileReader = blockSize ==
null ? new ReversedLinesFileReader(filePath, charset)
: new ReversedLinesFileReader(filePath, blockSize, charset)) {
diff --git a/src/test/java/org/apache/commons/io/input/TailerTest.java
b/src/test/java/org/apache/commons/io/input/TailerTest.java
index a6315eba..f0e1f340 100644
--- a/src/test/java/org/apache/commons/io/input/TailerTest.java
+++ b/src/test/java/org/apache/commons/io/input/TailerTest.java
@@ -266,7 +266,7 @@ public class TailerTest {
}
@Test
- public void testCreaterWithDelayAndFromStartWithReopen() throws Exception {
+ public void testCreatorWithDelayAndFromStartWithReopen() throws Exception {
final File file = new File(temporaryFolder,
"tailer-create-with-delay-and-from-start-with-reopen.txt");
createFile(file, 0);
final TestTailerListener listener = new TestTailerListener(1);
@@ -326,7 +326,7 @@ public class TailerTest {
}
/*
- * Tests [IO-357][Tailer] InterruptedException while the thead is sleeping
is silently ignored.
+ * Tests [IO-357][Tailer] InterruptedException while the thread is
sleeping is silently ignored.
*/
@Test
public void testInterrupt() throws Exception {
diff --git
a/src/test/java/org/apache/commons/io/input/UnsynchronizedBufferedInputStreamTest.java
b/src/test/java/org/apache/commons/io/input/UnsynchronizedBufferedInputStreamTest.java
index 8314d745..715de5e5 100644
---
a/src/test/java/org/apache/commons/io/input/UnsynchronizedBufferedInputStreamTest.java
+++
b/src/test/java/org/apache/commons/io/input/UnsynchronizedBufferedInputStreamTest.java
@@ -410,11 +410,11 @@ public class UnsynchronizedBufferedInputStreamTest {
@Test
public void test_reset_scenario1() throws IOException {
final byte[] input = "12345678900".getBytes();
- final BufferedInputStream buffis = new BufferedInputStream(new
ByteArrayInputStream(input));
- buffis.read();
- buffis.mark(5);
- buffis.skip(5);
- buffis.reset();
+ final BufferedInputStream bufin = new BufferedInputStream(new
ByteArrayInputStream(input));
+ bufin.read();
+ bufin.mark(5);
+ bufin.skip(5);
+ bufin.reset();
}
/**
@@ -425,10 +425,10 @@ public class UnsynchronizedBufferedInputStreamTest {
@Test
public void test_reset_scenario2() throws IOException {
final byte[] input = "12345678900".getBytes();
- final BufferedInputStream buffis = new BufferedInputStream(new
ByteArrayInputStream(input));
- buffis.mark(5);
- buffis.skip(6);
- buffis.reset();
+ final BufferedInputStream bufin = new BufferedInputStream(new
ByteArrayInputStream(input));
+ bufin.mark(5);
+ bufin.skip(6);
+ bufin.reset();
}
/**
