(commons-codec) branch master updated: Use StandardCharsets instead of magic string

[ggregory]

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-codec.git


The following commit(s) were added to refs/heads/master by this push:
     new 18b76b62 Use StandardCharsets instead of magic string
     new 7fd0e5f2 Merge branch 'master' of 
https://gitbox.apache.org/repos/asf/commons-codec
18b76b62 is described below

commit 18b76b62a8604204cd380b079c9fc1ecc1fb04a3
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Dec 15 16:08:11 2023 -0500

    Use StandardCharsets instead of magic string
---
 src/test/java/org/apache/commons/codec/CharsetsTest.java       | 10 +++++-----
 .../java/org/apache/commons/codec/binary/StringUtilsTest.java  |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/test/java/org/apache/commons/codec/CharsetsTest.java 
b/src/test/java/org/apache/commons/codec/CharsetsTest.java
index 2a0b99ad..ebc943f9 100644
--- a/src/test/java/org/apache/commons/codec/CharsetsTest.java
+++ b/src/test/java/org/apache/commons/codec/CharsetsTest.java
@@ -60,31 +60,31 @@ public class CharsetsTest {
     @SuppressWarnings("deprecation")
     @Test
     public void testUsAscii() {
-        assertEquals("US-ASCII", Charsets.US_ASCII.name());
+        assertEquals(StandardCharsets.US_ASCII.name(), 
Charsets.US_ASCII.name());
     }
 
     @SuppressWarnings("deprecation")
     @Test
     public void testUtf16() {
-        assertEquals("UTF-16", Charsets.UTF_16.name());
+        assertEquals(StandardCharsets.UTF_16.name(), Charsets.UTF_16.name());
     }
 
     @SuppressWarnings("deprecation")
     @Test
     public void testUtf16Be() {
-        assertEquals("UTF-16BE", Charsets.UTF_16BE.name());
+        assertEquals(StandardCharsets.UTF_16BE.name(), 
Charsets.UTF_16BE.name());
     }
 
     @SuppressWarnings("deprecation")
     @Test
     public void testUtf16Le() {
-        assertEquals("UTF-16LE", Charsets.UTF_16LE.name());
+        assertEquals(StandardCharsets.UTF_16LE.name(), 
Charsets.UTF_16LE.name());
     }
 
     @SuppressWarnings("deprecation")
     @Test
     public void testUtf8() {
-        assertEquals("UTF-8", Charsets.UTF_8.name());
+        assertEquals(StandardCharsets.UTF_8.name(), Charsets.UTF_8.name());
     }
 
 }
diff --git a/src/test/java/org/apache/commons/codec/binary/StringUtilsTest.java 
b/src/test/java/org/apache/commons/codec/binary/StringUtilsTest.java
index 616ca16e..af115d8d 100644
--- a/src/test/java/org/apache/commons/codec/binary/StringUtilsTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/StringUtilsTest.java
@@ -127,7 +127,7 @@ public class StringUtilsTest {
 
     @Test
     public void testGetBytesUtf16() throws UnsupportedEncodingException {
-        final String charsetName = "UTF-16";
+        final String charsetName = StandardCharsets.UTF_16.name();
         testGetBytesUnchecked(charsetName);
         final byte[] expected = STRING_FIXTURE.getBytes(charsetName);
         final byte[] actual = StringUtils.getBytesUtf16(STRING_FIXTURE);
@@ -136,7 +136,7 @@ public class StringUtilsTest {
 
     @Test
     public void testGetBytesUtf16Be() throws UnsupportedEncodingException {
-        final String charsetName = "UTF-16BE";
+        final String charsetName = StandardCharsets.UTF_16BE.name();
         testGetBytesUnchecked(charsetName);
         final byte[] expected = STRING_FIXTURE.getBytes(charsetName);
         final byte[] actual = StringUtils.getBytesUtf16Be(STRING_FIXTURE);
@@ -145,7 +145,7 @@ public class StringUtilsTest {
 
     @Test
     public void testGetBytesUtf16Le() throws UnsupportedEncodingException {
-        final String charsetName = "UTF-16LE";
+        final String charsetName = StandardCharsets.UTF_16LE.name();
         testGetBytesUnchecked(charsetName);
         final byte[] expected = STRING_FIXTURE.getBytes(charsetName);
         final byte[] actual = StringUtils.getBytesUtf16Le(STRING_FIXTURE);