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 c149c4b Better JUnit API usage
new b5511b9 Merge branch 'master' of
https://gitbox.apache.org/repos/asf/commons-email.git
c149c4b is described below
commit c149c4b1a8d26b0f6835503ea7c33cff9699e88c
Author: Gary Gregory <[email protected]>
AuthorDate: Sat Aug 5 15:59:24 2023 -0400
Better JUnit API usage
---
.../java/org/apache/commons/mail/EmailTest.java | 4 +--
.../apache/commons/mail/ImageHtmlEmailTest.java | 10 +++---
.../resolver/DataSourceClassPathResolverTest.java | 21 +++++------
.../mail/resolver/DataSourceFileResolverTest.java | 11 +++---
.../commons/mail/util/MimeMessageParserTest.java | 42 +++++++++++-----------
5 files changed, 45 insertions(+), 43 deletions(-)
diff --git a/src/test/java/org/apache/commons/mail/EmailTest.java
b/src/test/java/org/apache/commons/mail/EmailTest.java
index 67ed153..d97068f 100644
--- a/src/test/java/org/apache/commons/mail/EmailTest.java
+++ b/src/test/java/org/apache/commons/mail/EmailTest.java
@@ -928,7 +928,7 @@ public class EmailTest extends AbstractEmailTest
final String headerValue = "1234567890 1234567890 123456789
01234567890 123456789 0123456789 01234567890 01234567890";
email.addHeader("X-LongHeader", headerValue);
- assertTrue(email.getHeaders().size() == 1);
+ assertEquals(1, email.getHeaders().size());
// the header should not yet be folded -> will be done by
buildMimeMessage()
assertFalse(email.getHeaders().get("X-LongHeader").contains("\r\n"));
@@ -945,7 +945,7 @@ public class EmailTest extends AbstractEmailTest
assertEquals(2, lines.length);
// there should only be one line-break
- assertTrue(values[0].indexOf("\n") == values[0].lastIndexOf("\n"));
+ assertEquals(values[0].indexOf("\n"), values[0].lastIndexOf("\n"));
}
@Test
diff --git a/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java
b/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java
index cee8378..d7ac83a 100644
--- a/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java
+++ b/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java
@@ -98,7 +98,7 @@ public class ImageHtmlEmailTest extends HtmlEmailTest {
final MimeMessageParser mimeMessageParser = new
MimeMessageParser(mimeMessage).parse();
assertTrue(mimeMessageParser.getHtmlContent().contains("\"cid:"));
- assertTrue(mimeMessageParser.getAttachmentList().size() == 3);
+ assertEquals(3, mimeMessageParser.getAttachmentList().size());
}
@Test
@@ -239,7 +239,7 @@ public class ImageHtmlEmailTest extends HtmlEmailTest {
final MimeMessageParser mimeMessageParser = new
MimeMessageParser(mimeMessage).parse();
assertTrue(mimeMessageParser.getHtmlContent().contains("\"cid:"));
- assertTrue(mimeMessageParser.getAttachmentList().size() == 1);
+ assertEquals(1, mimeMessageParser.getAttachmentList().size());
}
@Test
@@ -279,7 +279,7 @@ public class ImageHtmlEmailTest extends HtmlEmailTest {
final MimeMessageParser mimeMessageParser = new
MimeMessageParser(mimeMessage).parse();
assertTrue(mimeMessageParser.getHtmlContent().contains("\"cid:"));
- assertTrue(mimeMessageParser.getAttachmentList().size() == 1);
+ assertEquals(1, mimeMessageParser.getAttachmentList().size());
}
@Test
@@ -322,7 +322,7 @@ public class ImageHtmlEmailTest extends HtmlEmailTest {
final MimeMessageParser mimeMessageParser = new
MimeMessageParser(mimeMessage).parse();
assertTrue(mimeMessageParser.getHtmlContent().contains("\"cid:"));
- assertTrue(mimeMessageParser.getAttachmentList().size() == 1);
+ assertEquals(1, mimeMessageParser.getAttachmentList().size());
}
@Test
@@ -365,7 +365,7 @@ public class ImageHtmlEmailTest extends HtmlEmailTest {
final MimeMessageParser mimeMessageParser = new
MimeMessageParser(mimeMessage).parse();
assertTrue(mimeMessageParser.getHtmlContent().contains("\"cid:"));
- assertTrue(mimeMessageParser.getAttachmentList().size() == 3);
+ assertEquals(3, mimeMessageParser.getAttachmentList().size());
}
@Test
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 24c2407..64431da 100644
---
a/src/test/java/org/apache/commons/mail/resolver/DataSourceClassPathResolverTest.java
+++
b/src/test/java/org/apache/commons/mail/resolver/DataSourceClassPathResolverTest.java
@@ -16,14 +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.assertThrows;
-import static org.junit.Assert.*;
+
+import java.io.IOException;
import org.apache.commons.mail.DataSourceResolver;
import org.junit.Test;
-import org.junit.jupiter.api.function.Executable;
-
-import java.io.IOException;
/**
* JUnit test case for DataSourceClassPathResolver.
@@ -39,15 +40,15 @@ public class DataSourceClassPathResolverTest extends
AbstractDataSourceResolverT
DataSourceResolver dataSourceResolver;
dataSourceResolver = new DataSourceClassPathResolver("/", true);
-
assertTrue(toByteArray(dataSourceResolver.resolve("images/asf_logo_wide.gif")).length
== IMG_SIZE);
-
assertTrue(toByteArray(dataSourceResolver.resolve("./images/asf_logo_wide.gif")).length
== IMG_SIZE);
-
assertTrue(toByteArray(dataSourceResolver.resolve("/images/asf_logo_wide.gif")).length
== IMG_SIZE);
+ assertEquals(IMG_SIZE,
toByteArray(dataSourceResolver.resolve("images/asf_logo_wide.gif")).length);
+ assertEquals(IMG_SIZE,
toByteArray(dataSourceResolver.resolve("./images/asf_logo_wide.gif")).length);
+ assertEquals(IMG_SIZE,
toByteArray(dataSourceResolver.resolve("/images/asf_logo_wide.gif")).length);
assertNull(dataSourceResolver.resolve("/asf_logo_wide.gif"));
dataSourceResolver = new DataSourceClassPathResolver("/images", true);
-
assertTrue(toByteArray(dataSourceResolver.resolve("asf_logo_wide.gif")).length
== IMG_SIZE);
-
assertTrue(toByteArray(dataSourceResolver.resolve("./asf_logo_wide.gif")).length
== IMG_SIZE);
-
assertTrue(toByteArray(dataSourceResolver.resolve("/asf_logo_wide.gif")).length
== IMG_SIZE);
+ assertEquals(IMG_SIZE,
toByteArray(dataSourceResolver.resolve("asf_logo_wide.gif")).length);
+ assertEquals(IMG_SIZE,
toByteArray(dataSourceResolver.resolve("./asf_logo_wide.gif")).length);
+ assertEquals(IMG_SIZE,
toByteArray(dataSourceResolver.resolve("/asf_logo_wide.gif")).length);
assertNull(dataSourceResolver.resolve("./images/asf_logo_wide.gif"));
}
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 012d355..6e7d002 100644
---
a/src/test/java/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java
+++
b/src/test/java/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java
@@ -16,7 +16,9 @@
*/
package org.apache.commons.mail.resolver;
-import static org.junit.Assert.*;
+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.assertThrows;
import java.io.File;
@@ -24,7 +26,6 @@ import java.io.IOException;
import org.apache.commons.mail.DataSourceResolver;
import org.junit.Test;
-import org.junit.jupiter.api.function.Executable;
/**
* JUnit test case for DateSourceResolver.
@@ -38,9 +39,9 @@ public class DataSourceFileResolverTest extends
AbstractDataSourceResolverTest
public void testResolvingFileLenient() throws Exception
{
final DataSourceResolver dataSourceResolver = new
DataSourceFileResolver(new File("./src/test/resources"), true);
-
assertTrue(toByteArray(dataSourceResolver.resolve("images/asf_logo_wide.gif")).length
== IMG_SIZE);
-
assertTrue(toByteArray(dataSourceResolver.resolve("./images/asf_logo_wide.gif")).length
== IMG_SIZE);
-
assertTrue(toByteArray(dataSourceResolver.resolve("../resources/images/asf_logo_wide.gif")).length
== IMG_SIZE);
+ assertEquals(IMG_SIZE,
toByteArray(dataSourceResolver.resolve("images/asf_logo_wide.gif")).length);
+ assertEquals(IMG_SIZE,
toByteArray(dataSourceResolver.resolve("./images/asf_logo_wide.gif")).length);
+ assertEquals(IMG_SIZE,
toByteArray(dataSourceResolver.resolve("../resources/images/asf_logo_wide.gif")).length);
assertNull(toByteArray(dataSourceResolver.resolve("/images/does-not-exist.gif")));
assertNull(dataSourceResolver.resolve("./images/does-not-exist.gif"));
}
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 5b507d4..f153aaf 100644
--- a/src/test/java/org/apache/commons/mail/util/MimeMessageParserTest.java
+++ b/src/test/java/org/apache/commons/mail/util/MimeMessageParserTest.java
@@ -54,7 +54,7 @@ public class MimeMessageParserTest
assertTrue(mimeMessageParser.hasPlainContent());
assertNotNull(mimeMessageParser.getPlainContent());
assertNull(mimeMessageParser.getHtmlContent());
- assertTrue(mimeMessageParser.getTo().size() == 1);
+ assertEquals(1, mimeMessageParser.getTo().size());
assertTrue(mimeMessageParser.getCc().isEmpty());
assertTrue(mimeMessageParser.getBcc().isEmpty());
assertEquals("[email protected]", mimeMessageParser.getFrom());
@@ -78,7 +78,7 @@ public class MimeMessageParserTest
assertTrue(mimeMessageParser.hasPlainContent());
assertNotNull(mimeMessageParser.getPlainContent());
assertNull(mimeMessageParser.getHtmlContent());
- assertTrue(mimeMessageParser.getTo().size() == 1);
+ assertEquals(1, mimeMessageParser.getTo().size());
assertTrue(mimeMessageParser.getCc().isEmpty());
assertTrue(mimeMessageParser.getBcc().isEmpty());
assertEquals("[email protected]", mimeMessageParser.getFrom());
@@ -103,14 +103,14 @@ public class MimeMessageParserTest
assertTrue(mimeMessageParser.hasPlainContent());
assertNotNull(mimeMessageParser.getPlainContent());
assertNotNull(mimeMessageParser.getHtmlContent());
- assertTrue(mimeMessageParser.getTo().size() == 1);
+ assertEquals(1, mimeMessageParser.getTo().size());
assertTrue(mimeMessageParser.getCc().isEmpty());
assertTrue(mimeMessageParser.getBcc().isEmpty());
assertEquals("[email protected]",
mimeMessageParser.getFrom());
assertEquals("[email protected]",
mimeMessageParser.getReplyTo());
assertTrue(mimeMessageParser.hasAttachments());
final List<?> attachmentList = mimeMessageParser.getAttachmentList();
- assertTrue(attachmentList.size() == 2);
+ assertEquals(2, attachmentList.size());
dataSource =
mimeMessageParser.findAttachmentByName("Wasserlilien.jpg");
assertNotNull(dataSource);
@@ -138,14 +138,14 @@ public class MimeMessageParserTest
assertTrue(mimeMessageParser.hasPlainContent());
assertNotNull(mimeMessageParser.getPlainContent());
assertNotNull(mimeMessageParser.getHtmlContent());
- assertTrue(mimeMessageParser.getTo().size() == 1);
+ assertEquals(1, mimeMessageParser.getTo().size());
assertTrue(mimeMessageParser.getCc().isEmpty());
assertTrue(mimeMessageParser.getBcc().isEmpty());
assertEquals("[email protected]", mimeMessageParser.getFrom());
assertEquals("[email protected]", mimeMessageParser.getReplyTo());
assertTrue(mimeMessageParser.hasAttachments());
final List<?> attachmentList = mimeMessageParser.getAttachmentList();
- assertTrue(attachmentList.size() == 1);
+ assertEquals(1, attachmentList.size());
dataSource = mimeMessageParser.getAttachmentList().get(0);
assertNotNull(dataSource);
@@ -176,14 +176,14 @@ public class MimeMessageParserTest
assertFalse(mimeMessageParser.hasPlainContent());
assertNull(mimeMessageParser.getPlainContent());
assertNotNull(mimeMessageParser.getHtmlContent());
- assertTrue(mimeMessageParser.getTo().size() == 1);
+ assertEquals(1, mimeMessageParser.getTo().size());
assertTrue(mimeMessageParser.getCc().isEmpty());
assertTrue(mimeMessageParser.getBcc().isEmpty());
assertEquals("[email protected]",
mimeMessageParser.getFrom());
assertEquals("[email protected]",
mimeMessageParser.getReplyTo());
assertTrue(mimeMessageParser.hasAttachments());
final List<?> attachmentList = mimeMessageParser.getAttachmentList();
- assertTrue(attachmentList.size() == 1);
+ assertEquals(1, attachmentList.size());
dataSource = (DataSource) attachmentList.get(0);
assertNotNull(dataSource);
@@ -214,14 +214,14 @@ public class MimeMessageParserTest
assertFalse(mimeMessageParser.hasPlainContent());
assertNull(mimeMessageParser.getPlainContent());
assertNull(mimeMessageParser.getHtmlContent());
- assertTrue(mimeMessageParser.getTo().size() == 1);
+ assertEquals(1, mimeMessageParser.getTo().size());
assertTrue(mimeMessageParser.getCc().isEmpty());
assertTrue(mimeMessageParser.getBcc().isEmpty());
assertEquals("[email protected]",
mimeMessageParser.getFrom());
assertEquals("[email protected]",
mimeMessageParser.getReplyTo());
assertTrue(mimeMessageParser.hasAttachments());
final List<?> attachmentList = mimeMessageParser.getAttachmentList();
- assertTrue(attachmentList.size() == 1);
+ assertEquals(1, attachmentList.size());
dataSource = mimeMessageParser.findAttachmentByName("Kunde 100029
Auftrag 3600.pdf");
assertNotNull(dataSource);
@@ -251,7 +251,7 @@ public class MimeMessageParserTest
assertFalse(mimeMessageParser.hasPlainContent());
assertNull(mimeMessageParser.getPlainContent());
assertNull(mimeMessageParser.getHtmlContent());
- assertEquals(mimeMessageParser.getTo().size(), 1);
+ assertEquals(1, mimeMessageParser.getTo().size());
assertEquals(mimeMessageParser.getCc().size(), 0);
assertEquals(mimeMessageParser.getBcc().size(), 0);
}
@@ -278,14 +278,14 @@ public class MimeMessageParserTest
assertTrue(mimeMessageParser.hasPlainContent());
assertNotNull(mimeMessageParser.getPlainContent());
assertNull(mimeMessageParser.getHtmlContent());
- assertTrue(mimeMessageParser.getTo().size() == 1);
+ assertEquals(1, mimeMessageParser.getTo().size());
assertTrue(mimeMessageParser.getCc().isEmpty());
assertTrue(mimeMessageParser.getBcc().isEmpty());
assertEquals("[email protected]", mimeMessageParser.getFrom());
assertEquals("[email protected]", mimeMessageParser.getReplyTo());
assertTrue(mimeMessageParser.hasAttachments());
final List<?> attachmentList = mimeMessageParser.getAttachmentList();
- assertTrue(attachmentList.size() == 1);
+ assertEquals(1, attachmentList.size());
dataSource = mimeMessageParser.findAttachmentByName("test.txt");
assertNotNull(dataSource);
@@ -314,14 +314,14 @@ public class MimeMessageParserTest
assertFalse(mimeMessageParser.hasPlainContent());
assertNull(mimeMessageParser.getPlainContent());
assertNull(mimeMessageParser.getHtmlContent());
- assertTrue(mimeMessageParser.getTo().size() == 1);
+ assertEquals(1, mimeMessageParser.getTo().size());
assertTrue(mimeMessageParser.getCc().isEmpty());
assertTrue(mimeMessageParser.getBcc().isEmpty());
assertEquals("[email protected]", mimeMessageParser.getFrom());
assertEquals("[email protected]", mimeMessageParser.getReplyTo());
assertTrue(mimeMessageParser.hasAttachments());
final List<?> attachmentList = mimeMessageParser.getAttachmentList();
- assertTrue(attachmentList.size() == 1);
+ assertEquals(1, attachmentList.size());
dataSource = mimeMessageParser.findAttachmentByName("test.txt");
assertNotNull(dataSource);
@@ -350,14 +350,14 @@ public class MimeMessageParserTest
assertTrue(mimeMessageParser.hasPlainContent());
assertNotNull(mimeMessageParser.getPlainContent());
assertNull(mimeMessageParser.getHtmlContent());
- assertTrue(mimeMessageParser.getTo().size() == 1);
+ assertEquals(1, mimeMessageParser.getTo().size());
assertTrue(mimeMessageParser.getCc().isEmpty());
assertTrue(mimeMessageParser.getBcc().isEmpty());
assertEquals("[email protected]", mimeMessageParser.getFrom());
assertEquals("[email protected]", mimeMessageParser.getReplyTo());
assertTrue(mimeMessageParser.hasAttachments());
final List<?> attachmentList = mimeMessageParser.getAttachmentList();
- assertTrue(attachmentList.size() == 1);
+ assertEquals(1, attachmentList.size());
dataSource = mimeMessageParser.findAttachmentByName("test.html");
assertNotNull(dataSource);
@@ -390,7 +390,7 @@ public class MimeMessageParserTest
assertFalse(mimeMessageParser.hasPlainContent());
assertNull(mimeMessageParser.getPlainContent());
assertNull(mimeMessageParser.getHtmlContent());
- assertTrue(mimeMessageParser.getTo().size() == 1);
+ assertEquals(1, mimeMessageParser.getTo().size());
assertTrue(mimeMessageParser.getCc().isEmpty());
assertTrue(mimeMessageParser.getBcc().isEmpty());
assertEquals("[email protected]", mimeMessageParser.getFrom());
@@ -425,7 +425,7 @@ public class MimeMessageParserTest
assertTrue(mimeMessageParser.hasPlainContent());
assertNotNull(mimeMessageParser.getPlainContent());
assertNull(mimeMessageParser.getHtmlContent());
- assertTrue(mimeMessageParser.getTo().size() == 1);
+ assertEquals(1, mimeMessageParser.getTo().size());
assertTrue(mimeMessageParser.getCc().isEmpty());
assertTrue(mimeMessageParser.getBcc().isEmpty());
assertEquals("[email protected]", mimeMessageParser.getFrom());
@@ -461,7 +461,7 @@ public class MimeMessageParserTest
assertTrue(mimeMessageParser.hasPlainContent());
assertNotNull(mimeMessageParser.getPlainContent());
assertNotNull(mimeMessageParser.getHtmlContent());
- assertTrue(mimeMessageParser.getTo().size() == 1);
+ assertEquals(1, mimeMessageParser.getTo().size());
assertTrue(mimeMessageParser.getCc().isEmpty());
assertTrue(mimeMessageParser.getBcc().isEmpty());
assertEquals("[email protected]", mimeMessageParser.getFrom());
@@ -483,7 +483,7 @@ public class MimeMessageParserTest
assertTrue(mimeMessageParser.isMultipart());
assertTrue(mimeMessageParser.hasHtmlContent());
assertNotNull(mimeMessageParser.getHtmlContent());
- assertTrue(mimeMessageParser.getTo().size() == 1);
+ assertEquals(1, mimeMessageParser.getTo().size());
assertTrue(mimeMessageParser.getCc().isEmpty());
assertTrue(mimeMessageParser.getBcc().isEmpty());
assertEquals("[email protected]",
mimeMessageParser.getFrom());
