You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2019/12/18 21:09:21 UTC
[commons-email] 01/02: Remove trailing white spaces on all lines.
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 e1c6c7626db139189d834bff7597d68ed1691c19
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Dec 18 15:29:45 2019 -0500
Remove trailing white spaces on all lines.
---
.../java/org/apache/commons/mail/AbstractEmailTest.java | 4 ++--
src/test/java/org/apache/commons/mail/EmailLiveTest.java | 2 +-
src/test/java/org/apache/commons/mail/EmailTest.java | 14 +++++++-------
src/test/java/org/apache/commons/mail/HtmlEmailTest.java | 2 +-
.../java/org/apache/commons/mail/ImageHtmlEmailTest.java | 6 +++---
.../java/org/apache/commons/mail/MultiPartEmailTest.java | 4 ++--
.../mail/resolver/DataSourceCompositeResolverTest.java | 8 ++++----
.../apache/commons/mail/util/MimeMessageParserTest.java | 14 +++++++-------
8 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/test/java/org/apache/commons/mail/AbstractEmailTest.java b/src/test/java/org/apache/commons/mail/AbstractEmailTest.java
index 6cf2ba2..2d23c92 100644
--- a/src/test/java/org/apache/commons/mail/AbstractEmailTest.java
+++ b/src/test/java/org/apache/commons/mail/AbstractEmailTest.java
@@ -519,7 +519,7 @@ public abstract class AbstractEmailTest
protected boolean isMailServerStopped(final Wiser fakeMailServer) {
return !fakeMailServer.getServer().isRunning();
}
-
+
/**
* Create a mocked URL object which always throws an IOException
* when the openStream() method is called.
@@ -533,7 +533,7 @@ public abstract class AbstractEmailTest
final URL url = createMock(URL.class);
expect(url.openStream()).andThrow(new IOException());
replay(url);
-
+
return url;
}
}
diff --git a/src/test/java/org/apache/commons/mail/EmailLiveTest.java b/src/test/java/org/apache/commons/mail/EmailLiveTest.java
index 4c75d7d..3742a51 100644
--- a/src/test/java/org/apache/commons/mail/EmailLiveTest.java
+++ b/src/test/java/org/apache/commons/mail/EmailLiveTest.java
@@ -235,7 +235,7 @@ public class EmailLiveTest extends AbstractEmailTest
htmlEmail4.setHtmlMsg(htmlMsg);
htmlEmail4.attach(attachment);
- EmailUtils.writeMimeMessage( new File("./target/test-emails/htmlemail4.eml"), send(htmlEmail4).getMimeMessage());
+ EmailUtils.writeMimeMessage( new File("./target/test-emails/htmlemail4.eml"), send(htmlEmail4).getMimeMessage());
}
/**
diff --git a/src/test/java/org/apache/commons/mail/EmailTest.java b/src/test/java/org/apache/commons/mail/EmailTest.java
index acf7e2f..1551060 100644
--- a/src/test/java/org/apache/commons/mail/EmailTest.java
+++ b/src/test/java/org/apache/commons/mail/EmailTest.java
@@ -343,7 +343,7 @@ public class EmailTest extends AbstractEmailTest
email.setFrom("me@home.com", "me@home.com", "bad.encoding\uc5ec\n");
}
- @Test
+ @Test
public void testAddTo() throws Exception
{
// ====================================================================
@@ -913,7 +913,7 @@ public class EmailTest extends AbstractEmailTest
assertEquals(ht.size(), email.getHeaders().size());
}
-
+
@Test
public void testFoldingHeaders() throws Exception
{
@@ -925,23 +925,23 @@ 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);
// the header should not yet be folded -> will be done by buildMimeMessage()
assertFalse(email.getHeaders().get("X-LongHeader").contains("\r\n"));
-
+
email.buildMimeMessage();
final MimeMessage msg = email.getMimeMessage();
msg.saveChanges();
-
+
final String[] values = msg.getHeader("X-LongHeader");
assertEquals(1, values.length);
-
+
// the header should be split in two lines
final String[] lines = values[0].split("\\r\\n");
assertEquals(2, lines.length);
-
+
// there should only be one line-break
assertTrue(values[0].indexOf("\n") == values[0].lastIndexOf("\n"));
}
diff --git a/src/test/java/org/apache/commons/mail/HtmlEmailTest.java b/src/test/java/org/apache/commons/mail/HtmlEmailTest.java
index 4504cae..9711527 100644
--- a/src/test/java/org/apache/commons/mail/HtmlEmailTest.java
+++ b/src/test/java/org/apache/commons/mail/HtmlEmailTest.java
@@ -599,7 +599,7 @@ public class HtmlEmailTest extends AbstractEmailTest
this.email.getCcAddresses(),
this.email.getBccAddresses(),
false);
-
+
// make sure that no double dots show up
assertTrue(this.email.getHtmlMsg().contains("3DTZC268X93337.zip"));
assertFalse(this.email.getHtmlMsg().contains("3DTZC268X93337..zip"));
diff --git a/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java b/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java
index 4e4f932..5f52098 100644
--- a/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java
+++ b/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java
@@ -476,7 +476,7 @@ public class ImageHtmlEmailTest extends HtmlEmailTest {
email.getFromAddress(), email.getToAddresses(),
email.getCcAddresses(), email.getBccAddresses(), true);
}
-
+
private String loadUrlContent(final URL url) throws IOException {
final InputStream stream = url.openStream();
final StringBuilder html = new StringBuilder();
@@ -490,7 +490,7 @@ public class ImageHtmlEmailTest extends HtmlEmailTest {
}
return html.toString();
}
-
+
private static final class MockDataSourceClassPathResolver extends DataSourceClassPathResolver {
public MockDataSourceClassPathResolver(final String classPathBase, final boolean lenient) {
@@ -504,6 +504,6 @@ public class ImageHtmlEmailTest extends HtmlEmailTest {
ds.setName(null);
return ds;
}
-
+
}
}
diff --git a/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java b/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java
index b217e66..84178d4 100644
--- a/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java
+++ b/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java
@@ -327,7 +327,7 @@ public class MultiPartEmailTest extends AbstractEmailTest
// ====================================================================
final File tmpFile = File.createTempFile("attachment", ".eml");
-
+
this.email.attach(
new FileDataSource(tmpFile),
"Test Attachment",
@@ -335,7 +335,7 @@ public class MultiPartEmailTest extends AbstractEmailTest
assertTrue(tmpFile.delete());
}
-
+
@Test
public void testAddPart() throws Exception
{
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 5107b12..cd391e6 100644
--- a/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java
+++ b/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java
@@ -69,14 +69,14 @@ public class DataSourceCompositeResolverTest extends AbstractDataSourceResolverT
final DataSourceCompositeResolver dataSourceResolver = new DataSourceCompositeResolver(dataSourceResolvers, true);
final DataSourceResolver[] arr = dataSourceResolver.getDataSourceResolvers();
-
+
// modify an element in the returned array
arr[0] = null;
-
+
final DataSourceResolver[] arr2 = dataSourceResolver.getDataSourceResolvers();
-
+
// assert that the external modification is not propagated to the internal array
- assertNotNull(arr2[0]);
+ assertNotNull(arr2[0]);
}
}
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 38fe5a4..12ea7eb 100644
--- a/src/test/java/org/apache/commons/mail/util/MimeMessageParserTest.java
+++ b/src/test/java/org/apache/commons/mail/util/MimeMessageParserTest.java
@@ -159,7 +159,7 @@ public class MimeMessageParserTest
*
* @throws Exception the test failed
*/
- @Test
+ @Test
public void testParseMultipartReport() throws Exception
{
DataSource dataSource;
@@ -197,7 +197,7 @@ public class MimeMessageParserTest
*
* @throws Exception the test failed
*/
- @Test
+ @Test
public void testAttachmentOnly() throws Exception
{
DataSource dataSource;
@@ -227,15 +227,15 @@ public class MimeMessageParserTest
assertNotNull(dataSource);
assertEquals("application/pdf", dataSource.getContentType());
}
-
+
/**
* This test parses an eml file published with issue EMAIL-110.
* This eml file has a corrupted attachment but should not create
* an OutOfMemoryException.
- *
+ *
* @throws Exception the test failed
*/
- @Test
+ @Test
public void testParseNoHeaderSeperatorWithOutOfMemory() throws Exception
{
final Session session = Session.getDefaultInstance(new Properties());
@@ -261,7 +261,7 @@ public class MimeMessageParserTest
*
* @throws Exception the test failed
*/
- @Test
+ @Test
public void testMultipartTextAttachment() throws Exception
{
DataSource dataSource;
@@ -297,7 +297,7 @@ public class MimeMessageParserTest
*
* @throws Exception the test failed
*/
- @Test
+ @Test
public void testMultipartTextAttachmentOnly() throws Exception
{
DataSource dataSource;