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 72da9c20 Use StandardCharsets
72da9c20 is described below
commit 72da9c20951b420854cf38dce415b9195dedd5a7
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Dec 23 11:21:10 2023 -0500
Use StandardCharsets
---
.../java/org/apache/commons/io/FileUtilsTest.java | 24 +++++++++++-----------
.../java/org/apache/commons/io/IOUtilsTest.java | 4 ++--
.../org/apache/commons/io/IOUtilsWriteTest.java | 8 ++++----
.../io/input/CharSequenceInputStreamTest.java | 2 +-
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/test/java/org/apache/commons/io/FileUtilsTest.java
b/src/test/java/org/apache/commons/io/FileUtilsTest.java
index 45ef7a41..78d0866f 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsTest.java
@@ -538,7 +538,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
// create a test file
final String text = "Imagination is more important than knowledge -
Einstein";
final File file = new File(tempDirFile, "checksum-test.txt");
- FileUtils.writeStringToFile(file, text, "US-ASCII");
+ FileUtils.writeStringToFile(file, text,
StandardCharsets.US_ASCII.name());
// compute the expected checksum
final Checksum expectedChecksum = new CRC32();
@@ -559,7 +559,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
// create a test file
final String text = "Imagination is more important than knowledge -
Einstein";
final File file = new File(tempDirFile, "checksum-test.txt");
- FileUtils.writeStringToFile(file, text, "US-ASCII");
+ FileUtils.writeStringToFile(file, text,
StandardCharsets.US_ASCII.name());
// compute the expected checksum
final Checksum expectedChecksum = new CRC32();
@@ -577,12 +577,12 @@ public class FileUtilsTest extends AbstractTempDirTest {
// create a test file
final String text1 = "Imagination is more important than knowledge -
Einstein";
final File file1 = new File(tempDirFile, "checksum-test.txt");
- FileUtils.writeStringToFile(file1, text1, "US-ASCII");
+ FileUtils.writeStringToFile(file1, text1,
StandardCharsets.US_ASCII.name());
// create a second test file
final String text2 = "To be or not to be - Shakespeare";
final File file2 = new File(tempDirFile, "checksum-test2.txt");
- FileUtils.writeStringToFile(file2, text2, "US-ASCII");
+ FileUtils.writeStringToFile(file2, text2,
StandardCharsets.US_ASCII.name());
// compute the expected checksum
final Checksum expectedChecksum = new CRC32();
@@ -609,7 +609,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
// create a test file
final String text = "Imagination is more important than knowledge -
Einstein";
final File file = new File(tempDirFile, "checksum-test.txt");
- FileUtils.writeStringToFile(file, text, "US-ASCII");
+ FileUtils.writeStringToFile(file, text,
StandardCharsets.US_ASCII.name());
assertThrows(NullPointerException.class, () ->
FileUtils.checksum(file, null));
}
@@ -2925,12 +2925,12 @@ public class FileUtilsTest extends AbstractTempDirTest {
final List<Object> list = Arrays.asList(data);
final File file = TestUtils.newFile(tempDirFile, "lines.txt");
- FileUtils.writeLines(file, "US-ASCII", list);
+ FileUtils.writeLines(file, StandardCharsets.US_ASCII.name(), list);
final String expected = "hello" + System.lineSeparator() + "world" +
System.lineSeparator() +
System.lineSeparator() + "this is" + System.lineSeparator() +
System.lineSeparator() + "some text" + System.lineSeparator();
- final String actual = FileUtils.readFileToString(file, "US-ASCII");
+ final String actual = FileUtils.readFileToString(file,
StandardCharsets.US_ASCII.name());
assertEquals(expected, actual);
}
@@ -2972,10 +2972,10 @@ public class FileUtilsTest extends AbstractTempDirTest {
final List<Object> list = Arrays.asList(data);
final File file = TestUtils.newFile(tempDirFile, "lines.txt");
- FileUtils.writeLines(file, "US-ASCII", list, "*");
+ FileUtils.writeLines(file, StandardCharsets.US_ASCII.name(), list,
"*");
final String expected = "hello*world**this is**some text*";
- final String actual = FileUtils.readFileToString(file, "US-ASCII");
+ final String actual = FileUtils.readFileToString(file,
StandardCharsets.US_ASCII.name());
assertEquals(expected, actual);
}
@@ -2986,19 +2986,19 @@ public class FileUtilsTest extends AbstractTempDirTest {
final List<Object> list = Arrays.asList(data);
final File file = TestUtils.newFile(tempDirFile, "lines.txt");
- FileUtils.writeLines(file, "US-ASCII", list, null);
+ FileUtils.writeLines(file, StandardCharsets.US_ASCII.name(), list,
null);
final String expected = "hello" + System.lineSeparator() + "world" +
System.lineSeparator() +
System.lineSeparator() + "this is" + System.lineSeparator() +
System.lineSeparator() + "some text" + System.lineSeparator();
- final String actual = FileUtils.readFileToString(file, "US-ASCII");
+ final String actual = FileUtils.readFileToString(file,
StandardCharsets.US_ASCII.name());
assertEquals(expected, actual);
}
@Test
public void testWriteLines_4arg_Writer_nullData() throws Exception {
final File file = TestUtils.newFile(tempDirFile, "lines.txt");
- FileUtils.writeLines(file, "US-ASCII", null, "*");
+ FileUtils.writeLines(file, StandardCharsets.US_ASCII.name(), null,
"*");
assertEquals(0, file.length(), "Sizes differ");
}
diff --git a/src/test/java/org/apache/commons/io/IOUtilsTest.java
b/src/test/java/org/apache/commons/io/IOUtilsTest.java
index 6abeab6b..e99e1aac 100644
--- a/src/test/java/org/apache/commons/io/IOUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/IOUtilsTest.java
@@ -1680,7 +1680,7 @@ public class IOUtilsTest {
@Test
public void testToString_URI_CharsetName() throws Exception {
- testToString_URI("US-ASCII");
+ testToString_URI(StandardCharsets.US_ASCII.name());
}
@Test
@@ -1705,7 +1705,7 @@ public class IOUtilsTest {
@Test
public void testToString_URL_CharsetName() throws Exception {
- testToString_URL("US-ASCII");
+ testToString_URL(StandardCharsets.US_ASCII.name());
}
@Test
diff --git a/src/test/java/org/apache/commons/io/IOUtilsWriteTest.java
b/src/test/java/org/apache/commons/io/IOUtilsWriteTest.java
index ded62ee7..8ebe4660 100644
--- a/src/test/java/org/apache/commons/io/IOUtilsWriteTest.java
+++ b/src/test/java/org/apache/commons/io/IOUtilsWriteTest.java
@@ -558,7 +558,7 @@ public class IOUtilsWriteTest {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, false, true);
- IOUtils.writeLines(null, "*", out, "US-ASCII");
+ IOUtils.writeLines(null, "*", out, StandardCharsets.US_ASCII.name());
out.off();
out.flush();
@@ -592,7 +592,7 @@ public class IOUtilsWriteTest {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final ThrowOnFlushAndCloseOutputStream out = new
ThrowOnFlushAndCloseOutputStream(baout, false, true);
- IOUtils.writeLines(list, null, out, "US-ASCII");
+ IOUtils.writeLines(list, null, out, StandardCharsets.US_ASCII.name());
out.off();
out.flush();
@@ -603,9 +603,9 @@ public class IOUtilsWriteTest {
@Test
public void testWriteLines_OutputStream_Encoding_nullStream() throws
Exception {
- final Object[] data = {"hello", "world"};
+ final Object[] data = { "hello", "world" };
final List<Object> list = Arrays.asList(data);
- assertThrows(NullPointerException.class, () ->
IOUtils.writeLines(list, "*", null, "US-ASCII"));
+ assertThrows(NullPointerException.class, () ->
IOUtils.writeLines(list, "*", null, StandardCharsets.US_ASCII.name()));
}
@Test
diff --git
a/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java
b/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java
index 848f41c5..cbdfc9eb 100644
--- a/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java
@@ -339,7 +339,7 @@ public class CharSequenceInputStreamTest {
@Test
public void testMarkReset_USASCII() throws Exception {
- testMarkReset("US-ASCII");
+ testMarkReset(StandardCharsets.US_ASCII.name());
}
@Test
