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 2014/06/30 14:26:07 UTC
svn commit: r1606709 [3/3] - in /commons/proper/email/trunk/src:
main/java/org/apache/commons/mail/
main/java/org/apache/commons/mail/resolver/
main/java/org/apache/commons/mail/util/ test/java/org/apache/commons/mail/
test/java/org/apache/commons/mail...
Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java?rev=1606709&r1=1606708&r2=1606709&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java Mon Jun 30 12:26:06 2014
@@ -67,7 +67,7 @@ public class MultiPartEmailTest extends
// ====================================================================
// without charset set
- for (String validChar : testCharsValid)
+ for (final String validChar : testCharsValid)
{
this.email.setMsg(validChar);
assertEquals(validChar, this.email.getMsg());
@@ -75,7 +75,7 @@ public class MultiPartEmailTest extends
// with charset set
this.email.setCharset(EmailConstants.US_ASCII);
- for (String validChar : testCharsValid)
+ for (final String validChar : testCharsValid)
{
this.email.setMsg(validChar);
assertEquals(validChar, this.email.getMsg());
@@ -84,14 +84,14 @@ public class MultiPartEmailTest extends
// ====================================================================
// Test Exceptions
// ====================================================================
- for (String invalidChar : testCharsNotValid)
+ for (final String invalidChar : testCharsNotValid)
{
try
{
this.email.setMsg(invalidChar);
fail("Should have thrown an exception");
}
- catch (EmailException e)
+ catch (final EmailException e)
{
assertTrue(true);
}
@@ -110,15 +110,15 @@ public class MultiPartEmailTest extends
// ====================================================================
this.getMailServer();
- String strSubject = "Test Multipart Send Subject";
+ final String strSubject = "Test Multipart Send Subject";
- EmailAttachment attachment = new EmailAttachment();
+ final EmailAttachment attachment = new EmailAttachment();
attachment.setPath(testFile.getAbsolutePath());
attachment.setDisposition(EmailAttachment.ATTACHMENT);
attachment.setName("Test_Attachment");
attachment.setDescription("Test Attachment Desc");
- MockMultiPartEmailConcrete testEmail =
+ final MockMultiPartEmailConcrete testEmail =
new MockMultiPartEmailConcrete();
testEmail.setHostName(this.strTestMailServer);
testEmail.setSmtpPort(this.getMailServerPort());
@@ -139,7 +139,7 @@ public class MultiPartEmailTest extends
testEmail.setMsg("Test Message");
- Map<String, String> ht = new HashMap<String, String>();
+ final Map<String, String> ht = new HashMap<String, String>();
ht.put("X-Priority", "2");
ht.put("Disposition-Notification-To", this.strTestMailFrom);
ht.put("X-Mailer", "Sendmail");
@@ -181,7 +181,7 @@ public class MultiPartEmailTest extends
this.email.send();
fail("Should have thrown an exception");
}
- catch (EmailException e)
+ catch (final EmailException e)
{
this.fakeMailServer.stop();
}
@@ -226,7 +226,7 @@ public class MultiPartEmailTest extends
this.email.attach((EmailAttachment) null);
fail("Should have thrown an exception");
}
- catch (EmailException e)
+ catch (final EmailException e)
{
assertTrue(true);
}
@@ -239,7 +239,7 @@ public class MultiPartEmailTest extends
this.email.attach(attachment);
fail("Should have thrown an exception");
}
- catch (EmailException e)
+ catch (final EmailException e)
{
assertTrue(true);
}
@@ -252,7 +252,7 @@ public class MultiPartEmailTest extends
this.email.attach(attachment);
fail("Should have thrown an exception");
}
- catch (EmailException e)
+ catch (final EmailException e)
{
assertTrue(true);
}
@@ -297,11 +297,11 @@ public class MultiPartEmailTest extends
// null datasource
try
{
- URLDataSource urlDs = null;
+ final URLDataSource urlDs = null;
this.email.attach(urlDs, "Test Attachment", "Test Attachment Desc");
fail("Should have thrown an exception");
}
- catch (EmailException e)
+ catch (final EmailException e)
{
assertTrue(true);
}
@@ -309,11 +309,11 @@ public class MultiPartEmailTest extends
// invalid datasource
try
{
- URLDataSource urlDs = new URLDataSource(createInvalidURL());
+ final URLDataSource urlDs = new URLDataSource(createInvalidURL());
this.email.attach(urlDs, "Test Attachment", "Test Attachment Desc");
fail("Should have thrown an exception");
}
- catch (EmailException e)
+ catch (final EmailException e)
{
assertTrue(true);
}
@@ -327,7 +327,7 @@ public class MultiPartEmailTest extends
// resource on windows systems
// ====================================================================
- File tmpFile = File.createTempFile("attachment", ".eml");
+ final File tmpFile = File.createTempFile("attachment", ".eml");
this.email.attach(
new FileDataSource(tmpFile),
@@ -343,8 +343,8 @@ public class MultiPartEmailTest extends
// setup
this.email = new MockMultiPartEmailConcrete();
- String strMessage = "hello";
- String strContentType = "text/plain";
+ final String strMessage = "hello";
+ final String strContentType = "text/plain";
// add part
this.email.addPart(strMessage, strContentType);
@@ -366,7 +366,7 @@ public class MultiPartEmailTest extends
// setup
this.email = new MockMultiPartEmailConcrete();
- String strSubtype = "subtype/abc123";
+ final String strSubtype = "subtype/abc123";
// add part
this.email.addPart(new MimeMultipart(strSubtype));
@@ -401,7 +401,7 @@ public class MultiPartEmailTest extends
this.email.init();
fail("Should have thrown an exception");
}
- catch (IllegalStateException e)
+ catch (final IllegalStateException e)
{
assertTrue(true);
}
@@ -411,7 +411,7 @@ public class MultiPartEmailTest extends
@Test
public void testGetSetSubType()
{
- for (String validChar : testCharsValid)
+ for (final String validChar : testCharsValid)
{
this.email.setSubType(validChar);
assertEquals(validChar, this.email.getSubType());
Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SendWithAttachmentsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SendWithAttachmentsTest.java?rev=1606709&r1=1606708&r2=1606709&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SendWithAttachmentsTest.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SendWithAttachmentsTest.java Mon Jun 30 12:26:06 2014
@@ -53,7 +53,7 @@ public class SendWithAttachmentsTest ext
{
this.getMailServer();
- String strSubject = "Test HTML Send #1 Subject (w charset)";
+ final String strSubject = "Test HTML Send #1 Subject (w charset)";
this.email = new MockHtmlEmailConcrete();
this.email.setHostName(this.strTestMailServer);
@@ -66,10 +66,10 @@ public class SendWithAttachmentsTest ext
this.email.setCharset(EmailConstants.ISO_8859_1);
this.email.setSubject(strSubject);
- URL url = new URL(EmailConfiguration.TEST_URL);
- String cid = this.email.embed(url, "Apache Logo");
+ final URL url = new URL(EmailConfiguration.TEST_URL);
+ final String cid = this.email.embed(url, "Apache Logo");
- String strHtmlMsg =
+ final String strHtmlMsg =
"<html>The Apache logo - <img src=\"cid:" + cid + "\"><html>";
this.email.setHtmlMsg(strHtmlMsg);
@@ -109,7 +109,7 @@ public class SendWithAttachmentsTest ext
@Test
public void testSendWAttachments() throws EmailException, IOException
{
- EmailAttachment attachment = new EmailAttachment();
+ final EmailAttachment attachment = new EmailAttachment();
File testFile = null;
/** File to used to test file attachments (Must be valid) */
@@ -120,7 +120,7 @@ public class SendWithAttachmentsTest ext
// ====================================================================
this.getMailServer();
- String strSubject = "Test HTML Send #1 Subject (w charset)";
+ final String strSubject = "Test HTML Send #1 Subject (w charset)";
this.email = new MockHtmlEmailConcrete();
this.email.setHostName(this.strTestMailServer);
@@ -140,7 +140,7 @@ public class SendWithAttachmentsTest ext
this.email.setCharset(EmailConstants.ISO_8859_1);
this.email.setSubject(strSubject);
- String strHtmlMsg = "<html>Test Message<html>";
+ final String strHtmlMsg = "<html>Test Message<html>";
this.email.setHtmlMsg(strHtmlMsg);
this.email.setTextMsg(
Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SimpleEmailTest.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SimpleEmailTest.java?rev=1606709&r1=1606708&r2=1606709&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SimpleEmailTest.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SimpleEmailTest.java Mon Jun 30 12:26:06 2014
@@ -49,7 +49,7 @@ public class SimpleEmailTest extends Abs
// ====================================================================
// Test Success
// ====================================================================
- for (String validChar : testCharsValid)
+ for (final String validChar : testCharsValid)
{
this.email.setMsg(validChar);
assertEquals(validChar, this.email.getMsg());
@@ -58,14 +58,14 @@ public class SimpleEmailTest extends Abs
// ====================================================================
// Test Exception
// ====================================================================
- for (String invalidChar : this.testCharsNotValid)
+ for (final String invalidChar : this.testCharsNotValid)
{
try
{
this.email.setMsg(invalidChar);
fail("Should have thrown an exception");
}
- catch (EmailException e)
+ catch (final EmailException e)
{
assertTrue(true);
}
@@ -99,8 +99,8 @@ public class SimpleEmailTest extends Abs
this.strTestPasswd);
}
- String strSubject = "Test Msg Subject";
- String strMessage = "Test Msg Body";
+ final String strSubject = "Test Msg Subject";
+ final String strMessage = "Test Msg Body";
this.email.setCharset(EmailConstants.ISO_8859_1);
this.email.setSubject(strSubject);
@@ -151,8 +151,8 @@ public class SimpleEmailTest extends Abs
this.strTestPasswd);
}
- String strSubject = "Test Msg Subject";
- String strMessage = "Test Msg Body ä"; // add non-ascii character, otherwise us-ascii will be used
+ final String strSubject = "Test Msg Subject";
+ final String strMessage = "Test Msg Body ä"; // add non-ascii character, otherwise us-ascii will be used
this.email.setSubject(strSubject);
this.email.setMsg(strMessage);
@@ -171,7 +171,7 @@ public class SimpleEmailTest extends Abs
this.email.getBccAddresses(),
true);
- String message = getMessageAsString(0);
+ final String message = getMessageAsString(0);
// check that the charset has been correctly set
assertTrue(message.toLowerCase().contains("content-type: text/plain; charset=utf-8"));
Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockEmailConcrete.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockEmailConcrete.java?rev=1606709&r1=1606708&r2=1606709&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockEmailConcrete.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockEmailConcrete.java Mon Jun 30 12:26:06 2014
@@ -43,7 +43,7 @@ public class MockEmailConcrete extends E
* @return Email msg.
*/
@Override
- public Email setMsg(String msg)
+ public Email setMsg(final String msg)
{
// This abstract method should be tested in the concrete
// implementation classes only.
Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java?rev=1606709&r1=1606708&r2=1606709&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java Mon Jun 30 12:26:06 2014
@@ -43,11 +43,11 @@ public class MockHtmlEmailConcrete exten
{
return this.getPrimaryBodyPart().getContent().toString();
}
- catch (IOException ioE)
+ catch (final IOException ioE)
{
return null;
}
- catch (MessagingException msgE)
+ catch (final MessagingException msgE)
{
return null;
}
Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java?rev=1606709&r1=1606708&r2=1606709&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java Mon Jun 30 12:26:06 2014
@@ -39,11 +39,11 @@ public class MockImageHtmlEmailConcrete
{
return this.getPrimaryBodyPart().getContent().toString();
}
- catch (IOException ioE)
+ catch (final IOException ioE)
{
return null;
}
- catch (MessagingException msgE)
+ catch (final MessagingException msgE)
{
return null;
}
Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java?rev=1606709&r1=1606708&r2=1606709&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java Mon Jun 30 12:26:06 2014
@@ -43,11 +43,11 @@ public class MockMultiPartEmailConcrete
{
return this.getPrimaryBodyPart().getContent().toString();
}
- catch (IOException ioE)
+ catch (final IOException ioE)
{
return null;
}
- catch (MessagingException msgE)
+ catch (final MessagingException msgE)
{
return null;
}
Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/AbstractDataSourceResolverTest.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/AbstractDataSourceResolverTest.java?rev=1606709&r1=1606708&r2=1606709&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/AbstractDataSourceResolverTest.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/AbstractDataSourceResolverTest.java Mon Jun 30 12:26:06 2014
@@ -27,11 +27,11 @@ public abstract class AbstractDataSource
protected final int IMG_SIZE = 5866;
- protected byte[] toByteArray(DataSource dataSource) throws IOException
+ protected byte[] toByteArray(final DataSource dataSource) throws IOException
{
if(dataSource != null)
{
- InputStream is = dataSource.getInputStream();
+ final InputStream is = dataSource.getInputStream();
return IOUtils.toByteArray(is);
}
else
Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceClassPathResolverTest.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceClassPathResolverTest.java?rev=1606709&r1=1606708&r2=1606709&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceClassPathResolverTest.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceClassPathResolverTest.java Mon Jun 30 12:26:06 2014
@@ -52,7 +52,7 @@ public class DataSourceClassPathResolver
@Test(expected = IOException.class)
public void testResolvingClassPathNonLenient() throws Exception
{
- DataSourceResolver dataSourceResolver = new DataSourceClassPathResolver("/", false);
+ final DataSourceResolver dataSourceResolver = new DataSourceClassPathResolver("/", false);
assertNotNull(dataSourceResolver.resolve("images/asf_logo_wide.gif"));
dataSourceResolver.resolve("asf_logo_wide.gif");
Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java?rev=1606709&r1=1606708&r2=1606709&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java Mon Jun 30 12:26:06 2014
@@ -38,15 +38,15 @@ public class DataSourceCompositeResolver
@Before
public void setUp() throws Exception
{
- DataSourceUrlResolver urlResolver = new DataSourceUrlResolver(new URL("http://www.apache.org"), false);
- DataSourceClassPathResolver classPathResolver = new DataSourceClassPathResolver("/images", false);
+ final DataSourceUrlResolver urlResolver = new DataSourceUrlResolver(new URL("http://www.apache.org"), false);
+ final DataSourceClassPathResolver classPathResolver = new DataSourceClassPathResolver("/images", false);
dataSourceResolvers = new DataSourceResolver[] { urlResolver, classPathResolver };
}
@Test
public void testResolvingFilesLenient() throws Exception
{
- DataSourceResolver dataSourceResolver = new DataSourceCompositeResolver(dataSourceResolvers, true);
+ final DataSourceResolver dataSourceResolver = new DataSourceCompositeResolver(dataSourceResolvers, true);
// resolve using HTTP
assertTrue(toByteArray(dataSourceResolver.resolve("/images/feather-small.gif")).length > 0);
@@ -58,7 +58,7 @@ public class DataSourceCompositeResolver
@Test(expected = IOException.class)
public void testResolvingFilesNonLenient() throws Exception
{
- DataSourceResolver dataSourceResolver = new DataSourceCompositeResolver(dataSourceResolvers, false);
+ final DataSourceResolver dataSourceResolver = new DataSourceCompositeResolver(dataSourceResolvers, false);
dataSourceResolver.resolve("./image/does-not-exist.gif");
}
@@ -66,14 +66,14 @@ public class DataSourceCompositeResolver
@Test
public void testExternalModification() throws Exception
{
- DataSourceCompositeResolver dataSourceResolver = new DataSourceCompositeResolver(dataSourceResolvers, true);
+ final DataSourceCompositeResolver dataSourceResolver = new DataSourceCompositeResolver(dataSourceResolvers, true);
- DataSourceResolver[] arr = dataSourceResolver.getDataSourceResolvers();
+ final DataSourceResolver[] arr = dataSourceResolver.getDataSourceResolvers();
// modify an element in the returned array
arr[0] = null;
- DataSourceResolver[] arr2 = dataSourceResolver.getDataSourceResolvers();
+ final DataSourceResolver[] arr2 = dataSourceResolver.getDataSourceResolvers();
// assert that the external modification is not propagated to the internal array
assertNotNull(arr2[0]);
Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java?rev=1606709&r1=1606708&r2=1606709&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java Mon Jun 30 12:26:06 2014
@@ -35,7 +35,7 @@ public class DataSourceFileResolverTest
@Test
public void testResolvingFileLenient() throws Exception
{
- DataSourceResolver dataSourceResolver = new DataSourceFileResolver(new File("./src/test/resources"), true);
+ 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);
@@ -46,7 +46,7 @@ public class DataSourceFileResolverTest
@Test(expected = IOException.class)
public void testResolvingFileNonLenient() throws Exception
{
- DataSourceResolver dataSourceResolver = new DataSourceFileResolver(new File("."), false);
+ final DataSourceResolver dataSourceResolver = new DataSourceFileResolver(new File("."), false);
assertNotNull(dataSourceResolver.resolve("./src/test/resources/images/asf_logo_wide.gif"));
dataSourceResolver.resolve("asf_logo_wide.gif");
Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java?rev=1606709&r1=1606708&r2=1606709&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java Mon Jun 30 12:26:06 2014
@@ -42,7 +42,7 @@ public class DataSourceUrlResolverTest e
@Test
public void testResolvingFilesLenient() throws Exception
{
- DataSourceResolver dataSourceResolver = new DataSourceUrlResolver(new File("./src/test/resources").toURI().toURL(), true);
+ final DataSourceResolver dataSourceResolver = new DataSourceUrlResolver(new File("./src/test/resources").toURI().toURL(), 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);
assertNull(dataSourceResolver.resolve("./images/does-not-exist.gif"));
@@ -57,7 +57,7 @@ public class DataSourceUrlResolverTest e
@Test
public void testResolvingHttpLenient() throws Exception
{
- DataSourceResolver dataSourceResolver = new DataSourceUrlResolver(new URL("http://www.apache.org"), true);
+ final DataSourceResolver dataSourceResolver = new DataSourceUrlResolver(new URL("http://www.apache.org"), true);
assertTrue(toByteArray(dataSourceResolver.resolve("http://www.apache.org/images/feather-small.gif")).length > 1);
assertTrue(toByteArray(dataSourceResolver.resolve("images/feather-small.gif")).length > 1);
assertTrue(toByteArray(dataSourceResolver.resolve("./images/feather-small.gif")).length > 1);
@@ -73,7 +73,7 @@ public class DataSourceUrlResolverTest e
@Test(expected = IOException.class)
public void testResolvingHttpNonLenient() throws Exception
{
- DataSourceResolver dataSourceResolver = new DataSourceUrlResolver(new URL("http://www.apache.org"), false);
+ final DataSourceResolver dataSourceResolver = new DataSourceUrlResolver(new URL("http://www.apache.org"), false);
assertNotNull(dataSourceResolver.resolve("images/asf_logo_wide.gif"));
dataSourceResolver.resolve("images/does-not-exist.gif");
Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/util/MimeMessageParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/util/MimeMessageParserTest.java?rev=1606709&r1=1606708&r2=1606709&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/util/MimeMessageParserTest.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/util/MimeMessageParserTest.java Mon Jun 30 12:26:06 2014
@@ -41,9 +41,9 @@ public class MimeMessageParserTest
@Test
public void testParseSimpleEmail() throws Exception
{
- Session session = Session.getDefaultInstance(new Properties());
- MimeMessage message = MimeMessageUtils.createMimeMessage(session, new File("./src/test/resources/eml/simple.eml"));
- MimeMessageParser mimeMessageParser = new MimeMessageParser(message);
+ final Session session = Session.getDefaultInstance(new Properties());
+ final MimeMessage message = MimeMessageUtils.createMimeMessage(session, new File("./src/test/resources/eml/simple.eml"));
+ final MimeMessageParser mimeMessageParser = new MimeMessageParser(message);
mimeMessageParser.parse();
@@ -65,9 +65,9 @@ public class MimeMessageParserTest
@Test
public void testParseSimpleReplyEmail() throws Exception
{
- Session session = Session.getDefaultInstance(new Properties());
- MimeMessage message = MimeMessageUtils.createMimeMessage(session, new File("./src/test/resources/eml/simple-reply.eml"));
- MimeMessageParser mimeMessageParser = new MimeMessageParser(message);
+ final Session session = Session.getDefaultInstance(new Properties());
+ final MimeMessage message = MimeMessageUtils.createMimeMessage(session, new File("./src/test/resources/eml/simple-reply.eml"));
+ final MimeMessageParser mimeMessageParser = new MimeMessageParser(message);
mimeMessageParser.parse();
@@ -90,9 +90,9 @@ public class MimeMessageParserTest
public void testParseHtmlEmailWithAttachments() throws Exception
{
DataSource dataSource;
- Session session = Session.getDefaultInstance(new Properties());
- MimeMessage message = MimeMessageUtils.createMimeMessage(session, new File("./src/test/resources/eml/html-attachment.eml"));
- MimeMessageParser mimeMessageParser = new MimeMessageParser(message);
+ final Session session = Session.getDefaultInstance(new Properties());
+ final MimeMessage message = MimeMessageUtils.createMimeMessage(session, new File("./src/test/resources/eml/html-attachment.eml"));
+ final MimeMessageParser mimeMessageParser = new MimeMessageParser(message);
mimeMessageParser.parse();
@@ -109,7 +109,7 @@ public class MimeMessageParserTest
assertEquals("siegfried.goeschl@it20one.at", mimeMessageParser.getFrom());
assertEquals("siegfried.goeschl@it20one.at", mimeMessageParser.getReplyTo());
assertTrue(mimeMessageParser.hasAttachments());
- List<?> attachmentList = mimeMessageParser.getAttachmentList();
+ final List<?> attachmentList = mimeMessageParser.getAttachmentList();
assertTrue(attachmentList.size() == 2);
dataSource = mimeMessageParser.findAttachmentByName("Wasserlilien.jpg");
@@ -125,9 +125,9 @@ public class MimeMessageParserTest
public void testParseHtmlEmailWithAttachmentAndEncodedFilename() throws Exception
{
DataSource dataSource;
- Session session = Session.getDefaultInstance(new Properties());
- MimeMessage message = MimeMessageUtils.createMimeMessage(session, new File("./src/test/resources/eml/html-attachment-encoded-filename.eml"));
- MimeMessageParser mimeMessageParser = new MimeMessageParser(message);
+ final Session session = Session.getDefaultInstance(new Properties());
+ final MimeMessage message = MimeMessageUtils.createMimeMessage(session, new File("./src/test/resources/eml/html-attachment-encoded-filename.eml"));
+ final MimeMessageParser mimeMessageParser = new MimeMessageParser(message);
mimeMessageParser.parse();
@@ -144,7 +144,7 @@ public class MimeMessageParserTest
assertEquals("test_from@apache.org", mimeMessageParser.getFrom());
assertEquals("test_from@apache.org", mimeMessageParser.getReplyTo());
assertTrue(mimeMessageParser.hasAttachments());
- List<?> attachmentList = mimeMessageParser.getAttachmentList();
+ final List<?> attachmentList = mimeMessageParser.getAttachmentList();
assertTrue(attachmentList.size() == 1);
dataSource = mimeMessageParser.getAttachmentList().get(0);
@@ -163,9 +163,9 @@ public class MimeMessageParserTest
public void testParseMultipartReport() throws Exception
{
DataSource dataSource;
- Session session = Session.getDefaultInstance(new Properties());
- MimeMessage message = MimeMessageUtils.createMimeMessage(session, new File("./src/test/resources/eml/multipart-report.eml"));
- MimeMessageParser mimeMessageParser = new MimeMessageParser(message);
+ final Session session = Session.getDefaultInstance(new Properties());
+ final MimeMessage message = MimeMessageUtils.createMimeMessage(session, new File("./src/test/resources/eml/multipart-report.eml"));
+ final MimeMessageParser mimeMessageParser = new MimeMessageParser(message);
mimeMessageParser.parse();
@@ -182,7 +182,7 @@ public class MimeMessageParserTest
assertEquals("siegfried.goeschl@it20one.at", mimeMessageParser.getFrom());
assertEquals("siegfried.goeschl@it20one.at", mimeMessageParser.getReplyTo());
assertTrue(mimeMessageParser.hasAttachments());
- List<?> attachmentList = mimeMessageParser.getAttachmentList();
+ final List<?> attachmentList = mimeMessageParser.getAttachmentList();
assertTrue(attachmentList.size() == 1);
dataSource = (DataSource) attachmentList.get(0);
@@ -201,9 +201,9 @@ public class MimeMessageParserTest
public void testAttachmentOnly() throws Exception
{
DataSource dataSource;
- Session session = Session.getDefaultInstance(new Properties());
- MimeMessage message = MimeMessageUtils.createMimeMessage(session, new File("./src/test/resources/eml/attachment-only.eml"));
- MimeMessageParser mimeMessageParser = new MimeMessageParser(message);
+ final Session session = Session.getDefaultInstance(new Properties());
+ final MimeMessage message = MimeMessageUtils.createMimeMessage(session, new File("./src/test/resources/eml/attachment-only.eml"));
+ final MimeMessageParser mimeMessageParser = new MimeMessageParser(message);
mimeMessageParser.parse();
@@ -220,7 +220,7 @@ public class MimeMessageParserTest
assertEquals("siegfried.goeschl@it20one.at", mimeMessageParser.getFrom());
assertEquals("siegfried.goeschl@it20one.at", mimeMessageParser.getReplyTo());
assertTrue(mimeMessageParser.hasAttachments());
- List<?> attachmentList = mimeMessageParser.getAttachmentList();
+ final List<?> attachmentList = mimeMessageParser.getAttachmentList();
assertTrue(attachmentList.size() == 1);
dataSource = mimeMessageParser.findAttachmentByName("Kunde 100029 Auftrag 3600.pdf");
@@ -238,9 +238,9 @@ public class MimeMessageParserTest
@Test
public void testParseNoHeaderSeperatorWithOutOfMemory() throws Exception
{
- Session session = Session.getDefaultInstance(new Properties());
- MimeMessage message = MimeMessageUtils.createMimeMessage(session, new File("./src/test/resources/eml/outofmemory-no-header-seperation.eml"));
- MimeMessageParser mimeMessageParser = new MimeMessageParser(message);
+ final Session session = Session.getDefaultInstance(new Properties());
+ final MimeMessage message = MimeMessageUtils.createMimeMessage(session, new File("./src/test/resources/eml/outofmemory-no-header-seperation.eml"));
+ final MimeMessageParser mimeMessageParser = new MimeMessageParser(message);
mimeMessageParser.parse();
@@ -265,9 +265,9 @@ public class MimeMessageParserTest
public void testMultipartTextAttachment() throws Exception
{
DataSource dataSource;
- Session session = Session.getDefaultInstance(new Properties());
- MimeMessage message = MimeMessageUtils.createMimeMessage(session, new File("./src/test/resources/eml/multipart-text-attachment.eml"));
- MimeMessageParser mimeMessageParser = new MimeMessageParser(message);
+ final Session session = Session.getDefaultInstance(new Properties());
+ final MimeMessage message = MimeMessageUtils.createMimeMessage(session, new File("./src/test/resources/eml/multipart-text-attachment.eml"));
+ final MimeMessageParser mimeMessageParser = new MimeMessageParser(message);
mimeMessageParser.parse();
@@ -284,7 +284,7 @@ public class MimeMessageParserTest
assertEquals("test_from@apache.org", mimeMessageParser.getFrom());
assertEquals("test_from@apache.org", mimeMessageParser.getReplyTo());
assertTrue(mimeMessageParser.hasAttachments());
- List<?> attachmentList = mimeMessageParser.getAttachmentList();
+ final List<?> attachmentList = mimeMessageParser.getAttachmentList();
assertTrue(attachmentList.size() == 1);
dataSource = mimeMessageParser.findAttachmentByName("test.txt");
@@ -301,9 +301,9 @@ public class MimeMessageParserTest
public void testMultipartTextAttachmentOnly() throws Exception
{
DataSource dataSource;
- Session session = Session.getDefaultInstance(new Properties());
- MimeMessage message = MimeMessageUtils.createMimeMessage(session, new File("./src/test/resources/eml/multipart-text-attachment-only.eml"));
- MimeMessageParser mimeMessageParser = new MimeMessageParser(message);
+ final Session session = Session.getDefaultInstance(new Properties());
+ final MimeMessage message = MimeMessageUtils.createMimeMessage(session, new File("./src/test/resources/eml/multipart-text-attachment-only.eml"));
+ final MimeMessageParser mimeMessageParser = new MimeMessageParser(message);
mimeMessageParser.parse();
@@ -320,7 +320,7 @@ public class MimeMessageParserTest
assertEquals("test_from@apache.org", mimeMessageParser.getFrom());
assertEquals("test_from@apache.org", mimeMessageParser.getReplyTo());
assertTrue(mimeMessageParser.hasAttachments());
- List<?> attachmentList = mimeMessageParser.getAttachmentList();
+ final List<?> attachmentList = mimeMessageParser.getAttachmentList();
assertTrue(attachmentList.size() == 1);
dataSource = mimeMessageParser.findAttachmentByName("test.txt");
@@ -337,9 +337,9 @@ public class MimeMessageParserTest
public void testParseHtmlEmailWithHtmlAttachment() throws Exception
{
DataSource dataSource;
- Session session = Session.getDefaultInstance(new Properties());
- MimeMessage message = MimeMessageUtils.createMimeMessage(session, new File("./src/test/resources/eml/html-attachment-content-disposition.eml"));
- MimeMessageParser mimeMessageParser = new MimeMessageParser(message);
+ final Session session = Session.getDefaultInstance(new Properties());
+ final MimeMessage message = MimeMessageUtils.createMimeMessage(session, new File("./src/test/resources/eml/html-attachment-content-disposition.eml"));
+ final MimeMessageParser mimeMessageParser = new MimeMessageParser(message);
mimeMessageParser.parse();
@@ -356,7 +356,7 @@ public class MimeMessageParserTest
assertEquals("test_from@apache.org", mimeMessageParser.getFrom());
assertEquals("test_from@apache.org", mimeMessageParser.getReplyTo());
assertTrue(mimeMessageParser.hasAttachments());
- List<?> attachmentList = mimeMessageParser.getAttachmentList();
+ final List<?> attachmentList = mimeMessageParser.getAttachmentList();
assertTrue(attachmentList.size() == 1);
dataSource = mimeMessageParser.findAttachmentByName("test.html");
@@ -367,9 +367,9 @@ public class MimeMessageParserTest
@Test
public void testParseCreatedHtmlEmailWithNoContent() throws Exception
{
- Session session = Session.getDefaultInstance(new Properties());
+ final Session session = Session.getDefaultInstance(new Properties());
- HtmlEmail email = new HtmlEmail();
+ final HtmlEmail email = new HtmlEmail();
email.setMailSession(session);
@@ -378,9 +378,9 @@ public class MimeMessageParserTest
email.addTo("test_to@apache.org");
email.buildMimeMessage();
- MimeMessage msg = email.getMimeMessage();
+ final MimeMessage msg = email.getMimeMessage();
- MimeMessageParser mimeMessageParser = new MimeMessageParser(msg);
+ final MimeMessageParser mimeMessageParser = new MimeMessageParser(msg);
mimeMessageParser.parse();
assertEquals("Test Subject", mimeMessageParser.getSubject());
@@ -401,9 +401,9 @@ public class MimeMessageParserTest
@Test
public void testParseCreatedHtmlEmailWithTextContent() throws Exception
{
- Session session = Session.getDefaultInstance(new Properties());
+ final Session session = Session.getDefaultInstance(new Properties());
- HtmlEmail email = new HtmlEmail();
+ final HtmlEmail email = new HtmlEmail();
email.setMailSession(session);
@@ -413,9 +413,9 @@ public class MimeMessageParserTest
email.setTextMsg("My test message");
email.buildMimeMessage();
- MimeMessage msg = email.getMimeMessage();
+ final MimeMessage msg = email.getMimeMessage();
- MimeMessageParser mimeMessageParser = new MimeMessageParser(msg);
+ final MimeMessageParser mimeMessageParser = new MimeMessageParser(msg);
mimeMessageParser.parse();
assertEquals("Test Subject", mimeMessageParser.getSubject());
@@ -436,9 +436,9 @@ public class MimeMessageParserTest
@Test
public void testParseCreatedHtmlEmailWithMixedContent() throws Exception
{
- Session session = Session.getDefaultInstance(new Properties());
+ final Session session = Session.getDefaultInstance(new Properties());
- HtmlEmail email = new HtmlEmail();
+ final HtmlEmail email = new HtmlEmail();
email.setMailSession(session);
@@ -449,9 +449,9 @@ public class MimeMessageParserTest
email.setHtmlMsg("<p>My HTML message</p>");
email.buildMimeMessage();
- MimeMessage msg = email.getMimeMessage();
+ final MimeMessage msg = email.getMimeMessage();
- MimeMessageParser mimeMessageParser = new MimeMessageParser(msg);
+ final MimeMessageParser mimeMessageParser = new MimeMessageParser(msg);
mimeMessageParser.parse();
assertEquals("Test Subject", mimeMessageParser.getSubject());