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 5e901fa0b80b127da92ff022f639ffb5640eb23c Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Sat Dec 16 14:35:59 2023 -0500 Sort imports --- .../org/apache/commons/mail/HtmlEmailTest.java | 13 +++++++--- .../apache/commons/mail/ImageHtmlEmailTest.java | 30 ++++++++++++---------- .../mail/mocks/MockMultiPartEmailConcrete.java | 1 + .../mail/resolver/DataSourceUrlResolverTest.java | 2 +- 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/test/java/org/apache/commons/mail/HtmlEmailTest.java b/src/test/java/org/apache/commons/mail/HtmlEmailTest.java index 6b77111..aaac1a0 100644 --- a/src/test/java/org/apache/commons/mail/HtmlEmailTest.java +++ b/src/test/java/org/apache/commons/mail/HtmlEmailTest.java @@ -16,6 +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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import java.io.File; import java.io.IOException; import java.net.URL; @@ -28,11 +35,9 @@ import javax.mail.internet.MimeMessage; import org.apache.commons.mail.mocks.MockHtmlEmailConcrete; import org.apache.commons.mail.settings.EmailConfiguration; import org.apache.commons.mail.util.MimeMessageParser; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.BeforeEach; - -import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * JUnit test case for HtmlEmail Class. diff --git a/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java b/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java index 4e67e5c..e22f2c1 100644 --- a/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java +++ b/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java @@ -16,19 +16,9 @@ */ package org.apache.commons.mail; -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.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import javax.activation.DataSource; -import javax.mail.internet.MimeMessage; +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; @@ -41,7 +31,19 @@ import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.junit.jupiter.api.Assertions.*; +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.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class ImageHtmlEmailTest extends HtmlEmailTest { 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 22820ed..3cb69e4 100644 --- a/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java +++ b/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java @@ -19,6 +19,7 @@ package org.apache.commons.mail.mocks; import java.io.IOException; import javax.mail.MessagingException; + import org.apache.commons.mail.MultiPartEmail; /** 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 6fc281a..99d53ed 100644 --- a/src/test/java/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java +++ b/src/test/java/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java @@ -16,10 +16,10 @@ */ package org.apache.commons.mail.resolver; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; import java.io.IOException;