(commons-email) branch master updated: Use a constant instead of a magic string

[gg...@apache.org]

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


The following commit(s) were added to refs/heads/master by this push:
     new e1a909f  Use a constant instead of a magic string
e1a909f is described below

commit e1a909f295349b193513c25a65c72eb7bf5ae15d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Dec 10 10:57:19 2023 -0500

    Use a constant instead of a magic string
---
 src/test/java/org/apache/commons/mail/EmailLiveTest.java             | 2 +-
 src/test/java/org/apache/commons/mail/EmailTest.java                 | 3 ++-
 .../java/org/apache/commons/mail/InvalidInternetAddressTest.java     | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/apache/commons/mail/EmailLiveTest.java b/src/test/java/org/apache/commons/mail/EmailLiveTest.java
index 03e34ca..f80c8ad 100644
--- a/src/test/java/org/apache/commons/mail/EmailLiveTest.java
+++ b/src/test/java/org/apache/commons/mail/EmailLiveTest.java
@@ -74,7 +74,7 @@ public class EmailLiveTest extends AbstractEmailTest
         final URLDataSource dataSource = new URLDataSource(url);
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
         IOUtils.copy(dataSource.getInputStream(), baos);
-        return new String(baos.toByteArray(), "UTF-8");
+        return new String(baos.toByteArray(), StandardCharsets.UTF_8);
     }
 
     /**
diff --git a/src/test/java/org/apache/commons/mail/EmailTest.java b/src/test/java/org/apache/commons/mail/EmailTest.java
index 0ea8099..428b1b9 100644
--- a/src/test/java/org/apache/commons/mail/EmailTest.java
+++ b/src/test/java/org/apache/commons/mail/EmailTest.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.*;
 import java.io.File;
 import java.nio.charset.Charset;
 import java.nio.charset.IllegalCharsetNameException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
@@ -152,7 +153,7 @@ public class EmailTest extends AbstractEmailTest
         email.setCharset(set.name());
         assertEquals(set.name(), email.getCharset());
 
-        set = Charset.forName("UTF-8");
+        set = StandardCharsets.UTF_8;
         email.setCharset(set.name());
         assertEquals(set.name(), email.getCharset());
     }
diff --git a/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java b/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java
index 272f978..b738e7d 100644
--- a/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java
+++ b/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
 
 import javax.mail.internet.InternetAddress;
 
@@ -201,7 +202,7 @@ public class InvalidInternetAddressTest extends AbstractEmailTest
         for (int i = 0; i < ARR_INVALID_EMAILS.length; i++)
         {
 
-            final InternetAddress address = new InternetAddress(ARR_INVALID_EMAILS[i], "Joe", "UTF-8");
+            final InternetAddress address = new InternetAddress(ARR_INVALID_EMAILS[i], "Joe", StandardCharsets.UTF_8.name());
 
             // N.B. validate() doesn't check addresses containing quotes or '['
             final boolean quoted = ARR_INVALID_EMAILS[i].contains("\"");
@@ -232,7 +233,7 @@ public class InvalidInternetAddressTest extends AbstractEmailTest
         // test valid 'quoted' Email addresses
         try
         {
-            validateMethod.invoke(new InternetAddress(VALID_QUOTED_EMAIL, "Joe", "UTF-8"), (Object[]) null);
+            validateMethod.invoke(new InternetAddress(VALID_QUOTED_EMAIL, "Joe", StandardCharsets.UTF_8.name()), (Object[]) null);
         }
         catch (final Exception ex)
         {