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
commit 6930f1752d7edaac1792fdfc1f25433e59dabaa6
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Tue Dec 12 12:52:21 2023 -0500
Port to JUnit 5 except HtmlEmailTest, ImageHtmlEmailTest, and
MultiPartEmailTest
---
pom.xml | 16 ++++++++
.../apache/commons/mail/ByteArrayDataSource.java | 2 +-
.../apache/commons/mail/DataSourceResolver.java | 3 +-
src/main/java/org/apache/commons/mail/Email.java | 4 +-
.../org/apache/commons/mail/EmailConstants.java | 32 +++++++--------
.../java/org/apache/commons/mail/EmailUtils.java | 2 +-
.../java/org/apache/commons/mail/HtmlEmail.java | 16 ++++----
.../org/apache/commons/mail/ImageHtmlEmail.java | 3 +-
.../apache/commons/mail/InputStreamDataSource.java | 2 +-
.../org/apache/commons/mail/MultiPartEmail.java | 2 +-
.../mail/resolver/DataSourceClassPathResolver.java | 8 ++--
.../mail/resolver/DataSourceCompositeResolver.java | 5 ++-
.../mail/resolver/DataSourceFileResolver.java | 5 ++-
.../mail/resolver/DataSourceUrlResolver.java | 5 ++-
.../mail/util/IDNEmailAddressConverter.java | 3 +-
.../commons/mail/util/MimeMessageParser.java | 2 +-
.../apache/commons/mail/util/MimeMessageUtils.java | 7 ++--
.../org/apache/commons/mail/AbstractEmailTest.java | 45 ++++++++++++----------
.../commons/mail/DefaultAuthenticatorTest.java | 5 ++-
.../apache/commons/mail/EmailAttachmentTest.java | 8 ++--
.../org/apache/commons/mail/EmailLiveTest.java | 6 +--
.../java/org/apache/commons/mail/EmailTest.java | 19 +++++----
.../org/apache/commons/mail/EmailUtilsTest.java | 4 +-
.../org/apache/commons/mail/HtmlEmailTest.java | 6 ++-
.../apache/commons/mail/ImageHtmlEmailTest.java | 34 ++++++++--------
.../apache/commons/mail/InvalidAddressTest.java | 8 ++--
.../commons/mail/InvalidInternetAddressTest.java | 12 +++---
.../apache/commons/mail/MultiPartEmailTest.java | 12 ++++--
.../commons/mail/SendWithAttachmentsTest.java | 6 +--
.../org/apache/commons/mail/SimpleEmailTest.java | 18 ++++-----
.../commons/mail/mocks/MockEmailConcrete.java | 6 +--
.../commons/mail/mocks/MockHtmlEmailConcrete.java | 8 ++--
.../mail/mocks/MockImageHtmlEmailConcrete.java | 9 +++--
.../mail/mocks/MockMultiPartEmailConcrete.java | 2 +-
.../apache/commons/mail/mocks/MockSimpleEmail.java | 2 +-
.../resolver/DataSourceClassPathResolverTest.java | 8 ++--
.../resolver/DataSourceCompositeResolverTest.java | 12 +++---
.../mail/resolver/DataSourceFileResolverTest.java | 8 ++--
.../mail/resolver/DataSourceUrlResolverTest.java | 2 +-
.../mail/util/IDNEmailAddressConverterTest.java | 4 +-
.../commons/mail/util/MimeMessageParserTest.java | 12 +++---
41 files changed, 210 insertions(+), 163 deletions(-)
diff --git a/pom.xml b/pom.xml
index e7c4477..a7bf3b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -247,11 +247,26 @@
<artifactId>jakarta.mail</artifactId>
<version>1.6.7</version>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.junit.platform</groupId>-->
+<!-- <artifactId>junit-platform-runner</artifactId>-->
+<!-- <scope>test</scope>-->
+<!-- </dependency>-->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.junit.vintage</groupId>-->
+<!-- <artifactId>junit-vintage-engine</artifactId>-->
+<!-- <scope>test</scope>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
@@ -306,6 +321,7 @@
<commons.jira.id>EMAIL</commons.jira.id>
<commons.jira.pid>12310474</commons.jira.pid>
<commons.release.version>1.6.0</commons.release.version>
+ <commons.release.next>1.6.1</commons.release.next>
<commons.release.desc>(Java 8 or above)</commons.release.desc>
<commons.rc.version>RC1</commons.rc.version>
<commons.bc.version>1.5</commons.bc.version>
diff --git a/src/main/java/org/apache/commons/mail/ByteArrayDataSource.java
b/src/main/java/org/apache/commons/mail/ByteArrayDataSource.java
index b0415b3..2490676 100644
--- a/src/main/java/org/apache/commons/mail/ByteArrayDataSource.java
+++ b/src/main/java/org/apache/commons/mail/ByteArrayDataSource.java
@@ -54,7 +54,7 @@ public class ByteArrayDataSource implements DataSource {
/**
* The name associated with this data source. By default, the name is an
empty string, similar to javax.mail.util.ByteArrayDataSource.
- *
+ *
* @since 1.3.1
*/
private String name = "";
diff --git a/src/main/java/org/apache/commons/mail/DataSourceResolver.java
b/src/main/java/org/apache/commons/mail/DataSourceResolver.java
index c99e279..dbb6753 100644
--- a/src/main/java/org/apache/commons/mail/DataSourceResolver.java
+++ b/src/main/java/org/apache/commons/mail/DataSourceResolver.java
@@ -16,9 +16,10 @@
*/
package org.apache.commons.mail;
-import javax.activation.DataSource;
import java.io.IOException;
+import javax.activation.DataSource;
+
/**
* Creates a {@code DataSource} based on an URL.
*
diff --git a/src/main/java/org/apache/commons/mail/Email.java
b/src/main/java/org/apache/commons/mail/Email.java
index 45045a4..d15d99b 100644
--- a/src/main/java/org/apache/commons/mail/Email.java
+++ b/src/main/java/org/apache/commons/mail/Email.java
@@ -258,7 +258,7 @@ public abstract class Email {
/**
* Does server require TLS encryption for authentication?
- *
+ *
* @deprecated since 1.3, use setStartTLSEnabled() instead
*/
@Deprecated
@@ -266,7 +266,7 @@ public abstract class Email {
/**
* Does the current transport use SSL/TLS encryption upon connection?
- *
+ *
* @deprecated since 1.3, use setSSLOnConnect() instead
*/
@Deprecated
diff --git a/src/main/java/org/apache/commons/mail/EmailConstants.java
b/src/main/java/org/apache/commons/mail/EmailConstants.java
index 4363ae8..05f3e01 100644
--- a/src/main/java/org/apache/commons/mail/EmailConstants.java
+++ b/src/main/java/org/apache/commons/mail/EmailConstants.java
@@ -121,28 +121,28 @@ public final class EmailConstants {
/**
* Indicates if the STARTTLS command shall be used to initiate a
TLS-secured connection.
- *
+ *
* @since 1.1
*/
public static final String MAIL_TRANSPORT_STARTTLS_ENABLE =
"mail.smtp.starttls.enable";
/**
* Whether to use {@link java.net.Socket} as a fallback if the initial
connection fails or not.
- *
+ *
* @since 1.1
*/
public static final String MAIL_SMTP_SOCKET_FACTORY_FALLBACK =
"mail.smtp.socketFactory.fallback";
/**
* Specifies the {@link javax.net.SocketFactory} class to create smtp
sockets.
- *
+ *
* @since 1.1
*/
public static final String MAIL_SMTP_SOCKET_FACTORY_CLASS =
"mail.smtp.socketFactory.class";
/**
* Specifies the port to connect to when using a socket factory.
- *
+ *
* @since 1.1
*/
public static final String MAIL_SMTP_SOCKET_FACTORY_PORT =
"mail.smtp.socketFactory.port";
@@ -153,14 +153,14 @@ public final class EmailConstants {
/**
* Socket connection timeout value in milliseconds. Default is infinite
timeout.
- *
+ *
* @since 1.2
*/
public static final String MAIL_SMTP_CONNECTIONTIMEOUT =
"mail.smtp.connectiontimeout";
/**
* Socket I/O timeout value in milliseconds. Default is infinite timeout.
- *
+ *
* @since 1.2
*/
public static final String MAIL_SMTP_TIMEOUT = "mail.smtp.timeout";
@@ -171,42 +171,42 @@ public final class EmailConstants {
/**
* Default socket timeout.
- *
+ *
* @since 1.3
*/
public static final int SOCKET_TIMEOUT_MS = 60000;
/**
* If true, requires the use of the STARTTLS command. If the server
doesn't support the STARTTLS command, the connection will fail.
- *
+ *
* @since 1.3
*/
public static final String MAIL_TRANSPORT_STARTTLS_REQUIRED =
"mail.smtp.starttls.required";
/**
* If set to true, use SSL to connect and use the SSL port by default.
- *
+ *
* @since 1.3
*/
public static final String MAIL_SMTP_SSL_ENABLE = "mail.smtp.ssl.enable";
/**
* If set to true, check the server identity as specified in RFC 2595.
- *
+ *
* @since 1.3
*/
public static final String MAIL_SMTP_SSL_CHECKSERVERIDENTITY =
"mail.smtp.ssl.checkserveridentity";
/**
* Specifies the {@link javax.net.ssl.SSLSocketFactory} class to use to
create SMTP SSL sockets.
- *
+ *
* @since 1.3
*/
public static final String MAIL_SMTP_SSL_SOCKET_FACTORY_CLASS =
"mail.smtp.ssl.socketFactory.class";
/**
* Specifies the port to connect to when using the SMTP SSL socket factory.
- *
+ *
* @since 1.3
*/
public static final String MAIL_SMTP_SSL_SOCKET_FACTORY_PORT =
"mail.smtp.ssl.socketFactory.port";
@@ -218,7 +218,7 @@ public final class EmailConstants {
/**
* If set to true, and a message has some valid and some invalid
addresses, send the message anyway, reporting the partial failure with a
* SendFailedException. If set to false (the default), the message is not
sent to any of the recipients if there is an invalid recipient address.
- *
+ *
* @since 1.3.2
*/
public static final String MAIL_SMTP_SEND_PARTIAL =
"mail.smtp.sendpartial";
@@ -226,14 +226,14 @@ public final class EmailConstants {
/**
* If set to true, and a message has some valid and some invalid
addresses, send the message anyway, reporting the partial failure with a
* SendFailedException. If set to false (the default), the message is not
sent to any of the recipients if there is an invalid recipient address.
- *
+ *
* @since 1.3.2
*/
public static final String MAIL_SMTPS_SEND_PARTIAL =
"mail.smtps.sendpartial";
/**
* Defines the default mime charset to use when none has been specified
for the message.
- *
+ *
* @since 1.3.2
*/
public static final String MAIL_MIME_CHARSET = "mail.mime.charset";
@@ -244,7 +244,7 @@ public final class EmailConstants {
/**
* The from email address.
- *
+ *
* @since 1.4
*/
public static final String MAIL_FROM = "mail.from";
diff --git a/src/main/java/org/apache/commons/mail/EmailUtils.java
b/src/main/java/org/apache/commons/mail/EmailUtils.java
index 4fec3ef..aaca7d6 100644
--- a/src/main/java/org/apache/commons/mail/EmailUtils.java
+++ b/src/main/java/org/apache/commons/mail/EmailUtils.java
@@ -131,7 +131,7 @@ final class EmailUtils {
* <p>
* Copied from Commons Lang v2.1, svn 201930
* </p>
- *
+ *
* @param count the length of random string to create
* @return the random string
*/
diff --git a/src/main/java/org/apache/commons/mail/HtmlEmail.java
b/src/main/java/org/apache/commons/mail/HtmlEmail.java
index 96ec021..0493a9c 100644
--- a/src/main/java/org/apache/commons/mail/HtmlEmail.java
+++ b/src/main/java/org/apache/commons/mail/HtmlEmail.java
@@ -56,7 +56,7 @@ import javax.mail.internet.MimeMultipart;
*
* <p>
* It is also possible to embed URLs, files, or arbitrary {@code DataSource}s
directly into the body of the mail:
- *
+ *
* <pre>
* HtmlEmail he = new HtmlEmail();
* File img = new File("my/image.gif");
@@ -505,7 +505,7 @@ public class HtmlEmail extends MultiPartEmail {
/**
* Private bean class that encapsulates data about URL contents that are
embedded in the final email.
- *
+ *
* @since 1.1
*/
private static final class InlineImage {
@@ -518,7 +518,7 @@ public class HtmlEmail extends MultiPartEmail {
/**
* Creates an InlineImage object to represent the specified content ID
and {@code MimeBodyPart}.
- *
+ *
* @param cid the generated content ID
* @param dataSource the {@code DataSource} that represents the content
* @param mbp the {@code MimeBodyPart} that contains the
encoded data
@@ -531,7 +531,7 @@ public class HtmlEmail extends MultiPartEmail {
/**
* Returns the unique content ID of this InlineImage.
- *
+ *
* @return the unique content ID of this InlineImage
*/
public String getCid() {
@@ -540,7 +540,7 @@ public class HtmlEmail extends MultiPartEmail {
/**
* Returns the {@code DataSource} that represents the encoded content.
- *
+ *
* @return the {@code DataSource} representing the encoded content
*/
public DataSource getDataSource() {
@@ -549,7 +549,7 @@ public class HtmlEmail extends MultiPartEmail {
/**
* Returns the {@code MimeBodyPart} that contains the encoded
InlineImage data.
- *
+ *
* @return the {@code MimeBodyPart} containing the encoded InlineImage
data
*/
public MimeBodyPart getMbp() {
@@ -560,7 +560,7 @@ public class HtmlEmail extends MultiPartEmail {
// is stored as a entry in a Map.
/**
* {@inheritDoc}
- *
+ *
* @return true if the other object is also an InlineImage with the
same cid.
*/
@Override
@@ -579,7 +579,7 @@ public class HtmlEmail extends MultiPartEmail {
/**
* {@inheritDoc}
- *
+ *
* @return the cid hashCode.
*/
@Override
diff --git a/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java
b/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java
index 37629c5..2fe97a7 100644
--- a/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java
+++ b/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java
@@ -16,13 +16,14 @@
*/
package org.apache.commons.mail;
-import javax.activation.DataSource;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.activation.DataSource;
+
/**
* <p>
* Small wrapper class on top of HtmlEmail which encapsulates the required
logic to retrieve images that are contained in "<img src=../>" elements
in the
diff --git a/src/main/java/org/apache/commons/mail/InputStreamDataSource.java
b/src/main/java/org/apache/commons/mail/InputStreamDataSource.java
index 7a5fec9..4c9ea2d 100644
--- a/src/main/java/org/apache/commons/mail/InputStreamDataSource.java
+++ b/src/main/java/org/apache/commons/mail/InputStreamDataSource.java
@@ -28,7 +28,7 @@ import javax.activation.DataSource;
* <p>
* Copied from <a href="https://cxf.apache.org/";>Apache CXF</a> and modified.
* </p>
- *
+ *
* @since 1.6.0
*/
public final class InputStreamDataSource implements DataSource {
diff --git a/src/main/java/org/apache/commons/mail/MultiPartEmail.java
b/src/main/java/org/apache/commons/mail/MultiPartEmail.java
index e39662b..6c8aaba 100644
--- a/src/main/java/org/apache/commons/mail/MultiPartEmail.java
+++ b/src/main/java/org/apache/commons/mail/MultiPartEmail.java
@@ -140,7 +140,7 @@ public class MultiPartEmail extends Email {
/**
* Initialize the multipart email.
- *
+ *
* @since 1.0
*/
protected void init() {
diff --git
a/src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
b/src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
index 3b25ccf..a0083dd 100644
---
a/src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
+++
b/src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
@@ -16,14 +16,14 @@
*/
package org.apache.commons.mail.resolver;
-import javax.activation.DataSource;
-import javax.activation.FileTypeMap;
-import javax.mail.util.ByteArrayDataSource;
-
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import javax.activation.DataSource;
+import javax.activation.FileTypeMap;
+import javax.mail.util.ByteArrayDataSource;
+
/**
* Creates a {@code DataSource} based on an class path.
*
diff --git
a/src/main/java/org/apache/commons/mail/resolver/DataSourceCompositeResolver.java
b/src/main/java/org/apache/commons/mail/resolver/DataSourceCompositeResolver.java
index 3dafb90..92fdd23 100644
---
a/src/main/java/org/apache/commons/mail/resolver/DataSourceCompositeResolver.java
+++
b/src/main/java/org/apache/commons/mail/resolver/DataSourceCompositeResolver.java
@@ -16,10 +16,11 @@
*/
package org.apache.commons.mail.resolver;
-import org.apache.commons.mail.DataSourceResolver;
+import java.io.IOException;
import javax.activation.DataSource;
-import java.io.IOException;
+
+import org.apache.commons.mail.DataSourceResolver;
/**
* A composite data source resolver. It allows to resolve data sources coming
from multiple locations such as the classpath, the file system or an URL.
diff --git
a/src/main/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java
b/src/main/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java
index 52bf338..e45b42f 100644
--- a/src/main/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java
+++ b/src/main/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java
@@ -16,11 +16,12 @@
*/
package org.apache.commons.mail.resolver;
-import javax.activation.DataSource;
-import javax.activation.FileDataSource;
import java.io.File;
import java.io.IOException;
+import javax.activation.DataSource;
+import javax.activation.FileDataSource;
+
/**
* Creates a {@code DataSource} based on an URL. The implementation also
resolves file resources.
*
diff --git
a/src/main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java
b/src/main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java
index a522b1b..400b212 100644
--- a/src/main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java
+++ b/src/main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java
@@ -16,12 +16,13 @@
*/
package org.apache.commons.mail.resolver;
-import javax.activation.DataSource;
-import javax.activation.URLDataSource;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
+import javax.activation.DataSource;
+import javax.activation.URLDataSource;
+
/**
* Creates a {@code DataSource} based on an URL.
*
diff --git
a/src/main/java/org/apache/commons/mail/util/IDNEmailAddressConverter.java
b/src/main/java/org/apache/commons/mail/util/IDNEmailAddressConverter.java
index 64c4543..4892710 100644
--- a/src/main/java/org/apache/commons/mail/util/IDNEmailAddressConverter.java
+++ b/src/main/java/org/apache/commons/mail/util/IDNEmailAddressConverter.java
@@ -16,9 +16,10 @@
*/
package org.apache.commons.mail.util;
-import javax.mail.internet.InternetAddress;
import java.net.IDN;
+import javax.mail.internet.InternetAddress;
+
/**
* Converts email addresses containing International Domain Names into an
ASCII representation suitable for sending an email.
*
diff --git a/src/main/java/org/apache/commons/mail/util/MimeMessageParser.java
b/src/main/java/org/apache/commons/mail/util/MimeMessageParser.java
index 5f89412..fc25876 100644
--- a/src/main/java/org/apache/commons/mail/util/MimeMessageParser.java
+++ b/src/main/java/org/apache/commons/mail/util/MimeMessageParser.java
@@ -188,7 +188,7 @@ public class MimeMessageParser {
/**
* Strips the content id of any whitespace and angle brackets.
- *
+ *
* @param contentId the string to strip
* @return a stripped version of the content id
*/
diff --git a/src/main/java/org/apache/commons/mail/util/MimeMessageUtils.java
b/src/main/java/org/apache/commons/mail/util/MimeMessageUtils.java
index 6783247..d8a498f 100644
--- a/src/main/java/org/apache/commons/mail/util/MimeMessageUtils.java
+++ b/src/main/java/org/apache/commons/mail/util/MimeMessageUtils.java
@@ -16,9 +16,6 @@
*/
package org.apache.commons.mail.util;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.internet.MimeMessage;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -28,6 +25,10 @@ import java.io.InputStream;
import javax.mail.util.SharedByteArrayInputStream;
import java.nio.charset.Charset;
+import javax.mail.MessagingException;
+import javax.mail.Session;
+import javax.mail.internet.MimeMessage;
+
/**
* Static helper methods.
*
diff --git a/src/test/java/org/apache/commons/mail/AbstractEmailTest.java
b/src/test/java/org/apache/commons/mail/AbstractEmailTest.java
index f6d36ae..f963962 100644
--- a/src/test/java/org/apache/commons/mail/AbstractEmailTest.java
+++ b/src/test/java/org/apache/commons/mail/AbstractEmailTest.java
@@ -17,8 +17,10 @@
package org.apache.commons.mail;
import static org.easymock.EasyMock.expect;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.powermock.api.easymock.PowerMock.createMock;
import static org.powermock.api.easymock.PowerMock.replay;
@@ -39,8 +41,8 @@ import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import org.apache.commons.mail.settings.EmailConfiguration;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
import org.subethamail.wiser.Wiser;
import org.subethamail.wiser.WiserMessage;
@@ -98,7 +100,7 @@ public abstract class AbstractEmailTest {
/** counter for creating a file name */
private static int fileNameCounter;
- @Before
+ @BeforeEach
public void setUpAbstractEmailTest() {
emailOutputDir = new File("target/test-emails");
if (!emailOutputDir.exists()) {
@@ -106,12 +108,12 @@ public abstract class AbstractEmailTest {
}
}
- @After
+ @AfterEach
public void tearDownEmailTest() {
// stop the fake email server (if started)
if (this.fakeMailServer != null &&
!isMailServerStopped(fakeMailServer)) {
this.fakeMailServer.stop();
- assertTrue("Mail server didn't stop",
isMailServerStopped(fakeMailServer));
+ assertTrue(isMailServerStopped(fakeMailServer), "Mail server
didn't stop");
}
this.fakeMailServer = null;
@@ -119,7 +121,7 @@ public abstract class AbstractEmailTest {
/**
* Gets the mail server port.
- *
+ *
* @return the port the server is running on.
*/
protected int getMailServerPort() {
@@ -146,7 +148,7 @@ public abstract class AbstractEmailTest {
*/
public String getMessageAsString(final int intMsgNo) {
final List<?> receivedMessages = fakeMailServer.getMessages();
- assertTrue("mail server didn't get enough messages",
receivedMessages.size() >= intMsgNo);
+ assertTrue(receivedMessages.size() >= intMsgNo, "mail server didn't
get enough messages");
final WiserMessage emailMessage = (WiserMessage)
receivedMessages.get(intMsgNo);
@@ -173,7 +175,7 @@ public abstract class AbstractEmailTest {
this.fakeMailServer.setPort(getMailServerPort());
this.fakeMailServer.start();
- assertFalse("fake mail server didn't start",
isMailServerStopped(fakeMailServer));
+ assertFalse(isMailServerStopped(fakeMailServer), "fake mail server
didn't start");
final Date dtStartWait = new Date();
while (isMailServerStopped(fakeMailServer)) {
@@ -192,7 +194,7 @@ public abstract class AbstractEmailTest {
/**
* Validate the message was sent properly
- *
+ *
* @param mailServer reference to the fake mail server
* @param strSubject expected subject
* @param fromAdd expected from address
@@ -205,7 +207,7 @@ public abstract class AbstractEmailTest {
*/
protected WiserMessage validateSend(final Wiser mailServer, final String
strSubject, final InternetAddress fromAdd, final List<InternetAddress> toAdd,
final List<InternetAddress> ccAdd, final List<InternetAddress>
bccAdd, final boolean boolSaveToFile) throws IOException {
- assertTrue("mail server doesn't contain expected message",
mailServer.getMessages().size() == 1);
+ assertTrue(mailServer.getMessages().size() == 1, "mail server doesn't
contain expected message");
final WiserMessage emailMessage = mailServer.getMessages().get(0);
if (boolSaveToFile) {
@@ -223,22 +225,22 @@ public abstract class AbstractEmailTest {
final MimeMessage mimeMessage = emailMessage.getMimeMessage();
// test subject
- assertEquals("got wrong subject from mail", strSubject,
mimeMessage.getHeader("Subject", null));
+ assertEquals(strSubject, mimeMessage.getHeader("Subject", null),
"got wrong subject from mail");
// test from address
- assertEquals("got wrong From: address from mail",
fromAdd.toString(), mimeMessage.getHeader("From", null));
+ assertEquals(fromAdd.toString(), mimeMessage.getHeader("From",
null), "got wrong From: address from mail");
// test to address
- assertTrue("got wrong To: address from mail",
toAdd.toString().contains(mimeMessage.getHeader("To", null)));
+ assertTrue(toAdd.toString().contains(mimeMessage.getHeader("To",
null)), "got wrong To: address from mail");
// test cc address
if (!ccAdd.isEmpty()) {
- assertTrue("got wrong Cc: address from mail",
ccAdd.toString().contains(mimeMessage.getHeader("Cc", null)));
+
assertTrue(ccAdd.toString().contains(mimeMessage.getHeader("Cc", null)), "got
wrong Cc: address from mail");
}
// test bcc address
if (!bccAdd.isEmpty()) {
- assertTrue("got wrong Bcc: address from mail",
bccAdd.toString().contains(mimeMessage.getHeader("Bcc", null)));
+
assertTrue(bccAdd.toString().contains(mimeMessage.getHeader("Bcc", null)), "got
wrong Bcc: address from mail");
}
} catch (final MessagingException me) {
final IllegalStateException ise = new
IllegalStateException("caught MessagingException in validateSend()");
@@ -251,7 +253,7 @@ public abstract class AbstractEmailTest {
/**
* Validate the message was sent properly
- *
+ *
* @param mailServer reference to the fake mail server
* @param strSubject expected subject
* @param content the expected message content
@@ -276,12 +278,12 @@ public abstract class AbstractEmailTest {
// and -- (front and end)
final String emailMessageBody = getMessageBody(emailMessage);
final String strMessageBody =
emailMessageBody.substring(AbstractEmailTest.BODY_START_PAD,
emailMessageBody.length() - AbstractEmailTest.BODY_END_PAD);
- assertTrue("didn't find expected content type in message body",
strMessageBody.contains(strSentContent));
+ assertTrue(strMessageBody.contains(strSentContent), "didn't find
expected content type in message body");
}
/**
* Validate the message was sent properly
- *
+ *
* @param mailServer reference to the fake mail server
* @param strSubject expected subject
* @param strMessage the expected message as a string
@@ -299,7 +301,8 @@ public abstract class AbstractEmailTest {
final WiserMessage emailMessage = this.validateSend(mailServer,
strSubject, fromAdd, toAdd, ccAdd, bccAdd, true);
// test message content
- assertThat("didn't find expected message content in message body",
getMessageBody(emailMessage), containsString(strMessage));
+ // assertThat("didn't find expected message content in message body",
getMessageBody(emailMessage), containsString(strMessage));
+ assertTrue(getMessageBody(emailMessage).contains(strMessage));
}
/**
diff --git
a/src/test/java/org/apache/commons/mail/DefaultAuthenticatorTest.java
b/src/test/java/org/apache/commons/mail/DefaultAuthenticatorTest.java
index a8c66e3..51783cf 100644
--- a/src/test/java/org/apache/commons/mail/DefaultAuthenticatorTest.java
+++ b/src/test/java/org/apache/commons/mail/DefaultAuthenticatorTest.java
@@ -16,11 +16,12 @@
*/
package org.apache.commons.mail;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import javax.mail.PasswordAuthentication;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* JUnit test case for DefaultAuthenticator Class.
diff --git a/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java
b/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java
index 46b85f0..7e8cdc2 100644
--- a/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java
+++ b/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.mail;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.net.URL;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* JUnit test case for EmailAttachment Class.
@@ -31,7 +31,7 @@ import org.junit.Test;
public class EmailAttachmentTest extends AbstractEmailTest {
private EmailAttachment attachment;
- @Before
+ @BeforeEach
public void setUpAttachmentTest() {
attachment = new EmailAttachment();
}
diff --git a/src/test/java/org/apache/commons/mail/EmailLiveTest.java
b/src/test/java/org/apache/commons/mail/EmailLiveTest.java
index 18220dd..a8fde37 100644
--- a/src/test/java/org/apache/commons/mail/EmailLiveTest.java
+++ b/src/test/java/org/apache/commons/mail/EmailLiveTest.java
@@ -33,8 +33,8 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.mail.resolver.DataSourceUrlResolver;
import org.apache.commons.mail.settings.EmailConfiguration;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* This are regression test sending REAL email to REAL mail servers using REAL
recipients.
@@ -43,7 +43,7 @@ import org.junit.Test;
*
http://martinfowler.com/articles/mocksArentStubs.html#ClassicalAndMockistTesting).
*/
public class EmailLiveTest extends AbstractEmailTest {
- @Before
+ @BeforeEach
public void setUpLiveTest() {
// enforce a default charset UTF-8 otherwise non-ASCII attachment
names will not work
System.setProperty("mail.mime.charset", "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 5718bdc..ed49bb5 100644
--- a/src/test/java/org/apache/commons/mail/EmailTest.java
+++ b/src/test/java/org/apache/commons/mail/EmailTest.java
@@ -16,8 +16,13 @@
*/
package org.apache.commons.mail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.File;
import java.nio.charset.Charset;
@@ -41,8 +46,8 @@ import javax.mail.internet.MimeMultipart;
import javax.mail.internet.ParseException;
import org.apache.commons.mail.mocks.MockEmailConcrete;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* JUnit test case for Email Class
@@ -56,7 +61,7 @@ public class EmailTest extends AbstractEmailTest {
/** mock for testing */
private MockEmailConcrete email;
- @Before
+ @BeforeEach
public void setUpEmailTest() {
// reusable objects to be used across multiple tests
email = new MockEmailConcrete();
@@ -1015,7 +1020,7 @@ public class EmailTest extends AbstractEmailTest {
*
*
* Case 1: Setting a default charset results in adding that charset info
to to the content type of a text/based content object.
- *
+ *
* @throws Exception on any error
*/
@Test
@@ -1036,7 +1041,7 @@ public class EmailTest extends AbstractEmailTest {
/**
* Case 2: A default charset is overridden by an explicitly specified
charset in setContent().
- *
+ *
* @throws Exception on any error
*/
@Test
@@ -1057,7 +1062,7 @@ public class EmailTest extends AbstractEmailTest {
/**
* Case 3: A non-text content object ignores a default charset entirely.
- *
+ *
* @throws Exception on any error
*/
@Test
diff --git a/src/test/java/org/apache/commons/mail/EmailUtilsTest.java
b/src/test/java/org/apache/commons/mail/EmailUtilsTest.java
index 4df79fd..71a5159 100644
--- a/src/test/java/org/apache/commons/mail/EmailUtilsTest.java
+++ b/src/test/java/org/apache/commons/mail/EmailUtilsTest.java
@@ -17,9 +17,9 @@
package org.apache.commons.mail;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* JUnit test case for EmailUtils Class
diff --git a/src/test/java/org/apache/commons/mail/HtmlEmailTest.java
b/src/test/java/org/apache/commons/mail/HtmlEmailTest.java
index d583f90..d94876d 100644
--- a/src/test/java/org/apache/commons/mail/HtmlEmailTest.java
+++ b/src/test/java/org/apache/commons/mail/HtmlEmailTest.java
@@ -37,6 +37,7 @@ import org.apache.commons.mail.util.MimeMessageParser;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@@ -46,6 +47,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
*
* @since 1.0
*/
+@Disabled("TODO ASAP before 1.6.0, get running or coexist with JUnit 5.")
@RunWith(PowerMockRunner.class)
@PrepareForTest({ MockHtmlEmailConcrete.class })
public class HtmlEmailTest extends AbstractEmailTest {
@@ -499,8 +501,8 @@ public class HtmlEmailTest extends AbstractEmailTest {
}
/**
- * EMAIL-73 - check that providing a plain text content using setMsg()
creates a plain content and HTML content using {@code
- *
+ * EMAIL-73 - check that providing a plain text content using setMsg()
creates a plain content and HTML content using {@code
+ *
* <pre>
* } tags.
*/
diff --git a/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java
b/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java
index b24a683..626fc52 100644
--- a/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java
+++ b/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java
@@ -16,21 +16,9 @@
*/
package org.apache.commons.mail;
-import static org.junit.Assert.*;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.mail.resolver.DataSourceClassPathResolver;
-import org.apache.commons.mail.resolver.DataSourceCompositeResolver;
-import org.apache.commons.mail.resolver.DataSourceUrlResolver;
-import org.apache.commons.mail.mocks.MockImageHtmlEmailConcrete;
-import org.apache.commons.mail.util.MimeMessageParser;
-import org.apache.commons.mail.util.MimeMessageUtils;
-import org.junit.Before;
-import org.junit.Test;
-
-import javax.activation.DataSource;
-import javax.mail.internet.MimeMessage;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
@@ -42,6 +30,22 @@ import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.activation.DataSource;
+import javax.mail.internet.MimeMessage;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.mail.mocks.MockImageHtmlEmailConcrete;
+import org.apache.commons.mail.resolver.DataSourceClassPathResolver;
+import org.apache.commons.mail.resolver.DataSourceCompositeResolver;
+import org.apache.commons.mail.resolver.DataSourceUrlResolver;
+import org.apache.commons.mail.util.MimeMessageParser;
+import org.apache.commons.mail.util.MimeMessageUtils;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+
+@Disabled("TODO ASAP before 1.6.0, get running or coexist with JUnit 5.")
public class ImageHtmlEmailTest extends HtmlEmailTest {
private static final boolean TEST_IS_LENIENT = true;
diff --git a/src/test/java/org/apache/commons/mail/InvalidAddressTest.java
b/src/test/java/org/apache/commons/mail/InvalidAddressTest.java
index 908fa74..e7e531c 100644
--- a/src/test/java/org/apache/commons/mail/InvalidAddressTest.java
+++ b/src/test/java/org/apache/commons/mail/InvalidAddressTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.mail;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.commons.mail.mocks.MockEmailConcrete;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* JUnit test case for invalid Addresses in Email Class
@@ -43,7 +43,7 @@ public class InvalidAddressTest extends AbstractEmailTest {
private MockEmailConcrete email;
- @Before
+ @BeforeEach
public void setUpInvalidAddressTest() {
// reusable objects to be used across multiple tests
this.email = new MockEmailConcrete();
diff --git
a/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java
b/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java
index 702e7d6..d931aa2 100644
--- a/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java
+++ b/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java
@@ -16,16 +16,16 @@
*/
package org.apache.commons.mail;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
import javax.mail.internet.InternetAddress;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* JUnit test case demonstrating InternetAddress validation.
@@ -55,12 +55,12 @@ public class InvalidInternetAddressTest extends
AbstractEmailTest {
/**
* Setup for a test
*/
- @Before
+ @BeforeEach
public void setUpInvalidInternetAddressTest() {
try {
validateMethod = InternetAddress.class.getMethod("validate");
} catch (final Exception e) {
- assertEquals("Got wrong Exception when looking for validate()",
NoSuchMethodException.class, e.getClass());
+ assertEquals(NoSuchMethodException.class, e.getClass(), "Got wrong
Exception when looking for validate()");
}
}
diff --git a/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java
b/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java
index 2b630cf..93d3cd0 100644
--- a/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java
+++ b/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java
@@ -16,7 +16,9 @@
*/
package org.apache.commons.mail;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.File;
import java.io.IOException;
@@ -30,8 +32,9 @@ import javax.activation.URLDataSource;
import javax.mail.internet.MimeMultipart;
import org.apache.commons.mail.mocks.MockMultiPartEmailConcrete;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@@ -41,6 +44,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
*
* @since 1.0
*/
+@Disabled("TODO ASAP before 1.6.0, get running or coexist with JUnit 5.")
@RunWith(PowerMockRunner.class)
@PrepareForTest({ MockMultiPartEmailConcrete.class, URLDataSource.class })
public class MultiPartEmailTest extends AbstractEmailTest {
@@ -49,7 +53,7 @@ public class MultiPartEmailTest extends AbstractEmailTest {
/** File to used to test file attachments (Must be valid) */
private File testFile;
- @Before
+ @BeforeEach
public void setUpMultiPartEmailTest() throws Exception {
// reusable objects to be used across multiple tests
this.email = new MockMultiPartEmailConcrete();
diff --git a/src/test/java/org/apache/commons/mail/SendWithAttachmentsTest.java
b/src/test/java/org/apache/commons/mail/SendWithAttachmentsTest.java
index 814063e..7bcd27f 100644
--- a/src/test/java/org/apache/commons/mail/SendWithAttachmentsTest.java
+++ b/src/test/java/org/apache/commons/mail/SendWithAttachmentsTest.java
@@ -24,8 +24,8 @@ import javax.mail.internet.MimeUtility;
import org.apache.commons.mail.mocks.MockHtmlEmailConcrete;
import org.apache.commons.mail.settings.EmailConfiguration;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* JUnit test case verifying bugzilla issue 30973 is fixed.
@@ -35,7 +35,7 @@ import org.junit.Test;
public class SendWithAttachmentsTest extends AbstractEmailTest {
private MockHtmlEmailConcrete email;
- @Before
+ @BeforeEach
public void setUpSendWithAttachmentsTest() {
// reusable objects to be used across multiple tests
this.email = new MockHtmlEmailConcrete();
diff --git a/src/test/java/org/apache/commons/mail/SimpleEmailTest.java
b/src/test/java/org/apache/commons/mail/SimpleEmailTest.java
index 074156e..a4d5649 100644
--- a/src/test/java/org/apache/commons/mail/SimpleEmailTest.java
+++ b/src/test/java/org/apache/commons/mail/SimpleEmailTest.java
@@ -16,26 +16,26 @@
*/
package org.apache.commons.mail;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import org.apache.commons.mail.mocks.MockSimpleEmail;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* JUnit test case for SimpleEmailTest
- *
+ *
* @since 1.0
*/
public class SimpleEmailTest extends AbstractEmailTest {
private MockSimpleEmail email;
- @Before
+ @BeforeEach
public void setUpSimpleEmailTest() {
// reusable objects to be used across multiple tests
this.email = new MockSimpleEmail();
@@ -102,7 +102,7 @@ public class SimpleEmailTest extends AbstractEmailTest {
}
@Test
- @Ignore
+ @Disabled
public void testDefaultMimeCharset() throws EmailException, IOException {
/*
* disabling this test as it is dependent on execution order.
MimeUtility.getDefaultMIMECharset does some internal caching and if
mail.mime.charset is
diff --git a/src/test/java/org/apache/commons/mail/mocks/MockEmailConcrete.java
b/src/test/java/org/apache/commons/mail/mocks/MockEmailConcrete.java
index 6db7c9f..e8a2e7a 100644
--- a/src/test/java/org/apache/commons/mail/mocks/MockEmailConcrete.java
+++ b/src/test/java/org/apache/commons/mail/mocks/MockEmailConcrete.java
@@ -33,7 +33,7 @@ public class MockEmailConcrete extends Email {
/**
* Not Implemented, should be implemented in subclasses of Email
- *
+ *
* @param msg The email message
* @return Email msg.
*/
@@ -46,7 +46,7 @@ public class MockEmailConcrete extends Email {
/**
* Retrieve the current debug setting
- *
+ *
* @return debug
*/
public boolean isDebug() {
@@ -55,7 +55,7 @@ public class MockEmailConcrete extends Email {
/**
* Retrieve the current authentication setting
- *
+ *
* @return Authenticator Authenticator
*/
public Authenticator getAuthenticator() {
diff --git
a/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java
b/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java
index 0d30a03..1aaf579 100644
--- a/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java
+++ b/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java
@@ -17,6 +17,7 @@
package org.apache.commons.mail.mocks;
import java.io.IOException;
+
import javax.mail.MessagingException;
import javax.mail.internet.InternetAddress;
@@ -28,9 +29,10 @@ import org.apache.commons.mail.HtmlEmail;
* @since 1.0
*/
public class MockHtmlEmailConcrete extends HtmlEmail {
+
/**
* Retrieve the message content
- *
+ *
* @return Message Content
*/
public String getMsg() {
@@ -43,7 +45,7 @@ public class MockHtmlEmailConcrete extends HtmlEmail {
/**
* Retrieve the text msg
- *
+ *
* @return Message Content
*/
public String getTextMsg() {
@@ -52,7 +54,7 @@ public class MockHtmlEmailConcrete extends HtmlEmail {
/**
* Retrieve the html msg
- *
+ *
* @return Message Content
*/
public String getHtmlMsg() {
diff --git
a/src/test/java/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java
b/src/test/java/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java
index 5bc873b..91d14fe 100644
---
a/src/test/java/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java
+++
b/src/test/java/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java
@@ -16,18 +16,19 @@
*/
package org.apache.commons.mail.mocks;
-import org.apache.commons.mail.ImageHtmlEmail;
-
import java.io.IOException;
+
import javax.mail.MessagingException;
+import org.apache.commons.mail.ImageHtmlEmail;
+
/**
* Extension of the ImageHtmlEmail Class (used to allow testing only)
*/
public class MockImageHtmlEmailConcrete extends ImageHtmlEmail {
/**
* Retrieve the message content
- *
+ *
* @return Message Content
*/
public String getMsg() {
@@ -40,7 +41,7 @@ public class MockImageHtmlEmailConcrete extends
ImageHtmlEmail {
/**
* Retrieve the html msg
- *
+ *
* @return Message Content
*/
public String getHtmlMsg() {
diff --git
a/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java
b/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java
index 831f204..a8a1c80 100644
---
a/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java
+++
b/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java
@@ -32,7 +32,7 @@ public class MockMultiPartEmailConcrete extends
MultiPartEmail {
/**
* Retrieve the message content
- *
+ *
* @return Message Content
*/
public String getMsg() {
diff --git a/src/test/java/org/apache/commons/mail/mocks/MockSimpleEmail.java
b/src/test/java/org/apache/commons/mail/mocks/MockSimpleEmail.java
index e63f66e..e159284 100644
--- a/src/test/java/org/apache/commons/mail/mocks/MockSimpleEmail.java
+++ b/src/test/java/org/apache/commons/mail/mocks/MockSimpleEmail.java
@@ -28,7 +28,7 @@ import org.apache.commons.mail.SimpleEmail;
public class MockSimpleEmail extends SimpleEmail {
/**
* Retrieve the message content
- *
+ *
* @return Message Content
*/
public String getMsg() {
diff --git
a/src/test/java/org/apache/commons/mail/resolver/DataSourceClassPathResolverTest.java
b/src/test/java/org/apache/commons/mail/resolver/DataSourceClassPathResolverTest.java
index e7936aa..7ac8e2d 100644
---
a/src/test/java/org/apache/commons/mail/resolver/DataSourceClassPathResolverTest.java
+++
b/src/test/java/org/apache/commons/mail/resolver/DataSourceClassPathResolverTest.java
@@ -16,15 +16,15 @@
*/
package org.apache.commons.mail.resolver;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.IOException;
import org.apache.commons.mail.DataSourceResolver;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* JUnit test case for DataSourceClassPathResolver.
diff --git
a/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java
b/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java
index c17a4b0..190090f 100644
---
a/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java
+++
b/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java
@@ -16,15 +16,17 @@
*/
package org.apache.commons.mail.resolver;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.commons.mail.DataSourceResolver;
-import org.junit.Before;
-import org.junit.Test;
import java.io.IOException;
import java.net.URL;
+import org.apache.commons.mail.DataSourceResolver;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
/**
* JUnit test case for DateSourceResolver.
*
@@ -35,7 +37,7 @@ public class DataSourceCompositeResolverTest extends
AbstractDataSourceResolverT
private DataSourceResolver[] dataSourceResolvers;
private DataSourceResolver[] dataSourceResolversMissing;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
final DataSourceUrlResolver urlResolver = new
DataSourceUrlResolver(new URL("https://www.apache.org";), false);
final DataSourceUrlResolver urlResolverMissing = new
DataSourceUrlResolver(new URL("https://does.not.exist";), false);
diff --git
a/src/test/java/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java
b/src/test/java/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java
index 34ea1e9..4669f51 100644
---
a/src/test/java/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java
+++
b/src/test/java/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java
@@ -16,16 +16,16 @@
*/
package org.apache.commons.mail.resolver;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.File;
import java.io.IOException;
import org.apache.commons.mail.DataSourceResolver;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* JUnit test case for DateSourceResolver.
diff --git
a/src/test/java/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java
b/src/test/java/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java
index d74bfa6..d292b64 100644
---
a/src/test/java/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java
+++
b/src/test/java/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.mail.resolver;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git
a/src/test/java/org/apache/commons/mail/util/IDNEmailAddressConverterTest.java
b/src/test/java/org/apache/commons/mail/util/IDNEmailAddressConverterTest.java
index 0de1436..4cd031a 100644
---
a/src/test/java/org/apache/commons/mail/util/IDNEmailAddressConverterTest.java
+++
b/src/test/java/org/apache/commons/mail/util/IDNEmailAddressConverterTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.mail.util;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import javax.mail.internet.InternetAddress;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class IDNEmailAddressConverterTest {
diff --git
a/src/test/java/org/apache/commons/mail/util/MimeMessageParserTest.java
b/src/test/java/org/apache/commons/mail/util/MimeMessageParserTest.java
index c8215c9..b03efc1 100644
--- a/src/test/java/org/apache/commons/mail/util/MimeMessageParserTest.java
+++ b/src/test/java/org/apache/commons/mail/util/MimeMessageParserTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.mail.util;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.util.List;
@@ -31,7 +31,7 @@ import javax.mail.Session;
import javax.mail.internet.MimeMessage;
import org.apache.commons.mail.HtmlEmail;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Testing the MimeMessageParser.
