Author: tn
Date: Fri Mar 22 21:30:31 2013
New Revision: 1460003
URL: http://svn.apache.org/r1460003
Log:
Move authors to pom also for testcode, add suppressions, use
javax.mail.util.ByteArrayDataSource.
Modified:
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/BaseEmailTestCase.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/DefaultAuthenticatorTest.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailLiveTest.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/HtmlEmailTest.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SendWithAttachmentsTest.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockEmailConcrete.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockSimpleEmail.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/settings/EmailConfiguration.java
Modified:
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/BaseEmailTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/BaseEmailTestCase.java?rev=1460003&r1=1460002&r2=1460003&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/BaseEmailTestCase.java
(original)
+++
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/BaseEmailTestCase.java
Fri Mar 22 21:30:31 2013
@@ -43,11 +43,9 @@ import org.subethamail.wiser.Wiser;
import org.subethamail.wiser.WiserMessage;
/**
- * Base test case for Email test classes
+ * Base test case for Email test classes.
*
* @since 1.0
- * @author <a href="mailto:corey.sc...@gmail.com";>Corey Scott</a>
- * @author <a href="mailto:ep...@opensourceconnections.com";>Eric Pugh</a>
* @version $Id$
*/
public abstract class BaseEmailTestCase extends TestCase
Modified:
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/DefaultAuthenticatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/DefaultAuthenticatorTest.java?rev=1460003&r1=1460002&r2=1460003&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/DefaultAuthenticatorTest.java
(original)
+++
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/DefaultAuthenticatorTest.java
Fri Mar 22 21:30:31 2013
@@ -21,10 +21,9 @@ import javax.mail.PasswordAuthentication
import junit.framework.TestCase;
/**
- * JUnit test case for DefaultAuthenticator Class
+ * JUnit test case for DefaultAuthenticator Class.
*
* @since 1.0
- * @author <a href="mailto:corey.sc...@gmail.com";>Corey Scott</a>
* @version $Id$
*/
public class DefaultAuthenticatorTest extends TestCase
Modified:
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java?rev=1460003&r1=1460002&r2=1460003&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java
(original)
+++
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java
Fri Mar 22 21:30:31 2013
@@ -20,10 +20,9 @@ import java.net.MalformedURLException;
import java.net.URL;
/**
- * JUnit test case for EmailAttachment Class
+ * JUnit test case for EmailAttachment Class.
*
* @since 1.0
- * @author <a href="mailto:corey.sc...@gmail.com";>Corey Scott</a>
* @version $Id$
*/
public class EmailAttachmentTest extends BaseEmailTestCase
Modified:
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailLiveTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailLiveTest.java?rev=1460003&r1=1460002&r2=1460003&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailLiveTest.java
(original)
+++
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailLiveTest.java
Fri Mar 22 21:30:31 2013
@@ -37,8 +37,8 @@ import java.util.List;
* servers using REAL recipients.
*
* The intention is to field-test certain aspects
- * of email using a variety of mail clients since I'm not
- * a mockist (see
http://martinfowler.com/articles/mocksArentStubs.html#ClassicalAndMockistTesting).
+ * of email using a variety of mail clients since I'm not a mockist
+ * (see
http://martinfowler.com/articles/mocksArentStubs.html#ClassicalAndMockistTesting).
*/
public class EmailLiveTest extends BaseEmailTestCase
{
@@ -267,7 +267,7 @@ public class EmailLiveTest extends BaseE
email.setMsg(textMsg);
// create a proper UTF-8 sequence for the text attachment (matching
our default charset)
- DataSource attachment = new
ByteArrayDataSource(textMsg.getBytes("utf-8"), "text/plain");
+ DataSource attachment = new
javax.mail.util.ByteArrayDataSource(textMsg.getBytes("utf-8"), "text/plain");
email.attach(attachment, attachmentName, "Attachment in Greek");
EmailUtils.writeMimeMessage( new
File("./target/test-emails/correct-encoding.eml"),
send(email).getMimeMessage());
Modified:
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java?rev=1460003&r1=1460002&r2=1460003&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java
(original)
+++
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java
Fri Mar 22 21:30:31 2013
@@ -42,7 +42,6 @@ import org.apache.commons.mail.mocks.Moc
* JUnit test case for Email Class
*
* @since 1.0
- * @author <a href="mailto:corey.sc...@gmail.com";>Corey Scott</a>
* @version $Id$
*/
public class EmailTest extends BaseEmailTestCase
Modified:
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/HtmlEmailTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/HtmlEmailTest.java?rev=1460003&r1=1460002&r2=1460003&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/HtmlEmailTest.java
(original)
+++
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/HtmlEmailTest.java
Fri Mar 22 21:30:31 2013
@@ -37,7 +37,6 @@ import org.powermock.modules.junit4.Powe
* JUnit test case for HtmlEmail Class.
*
* @since 1.0
- * @author <a href="mailto:corey.sc...@gmail.com";>Corey Scott</a>
* @version $Id$
*/
@RunWith(PowerMockRunner.class)
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=1460003&r1=1460002&r2=1460003&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
Fri Mar 22 21:30:31 2013
@@ -33,10 +33,9 @@ import org.powermock.core.classloader.an
import org.powermock.modules.junit4.PowerMockRunner;
/**
- * JUnit test case for MultiPartEmail Class
+ * JUnit test case for MultiPartEmail Class.
*
* @since 1.0
- * @author <a href="mailto:corey.sc...@gmail.com";>Corey Scott</a>
* @version $Id$
*/
@RunWith(PowerMockRunner.class)
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=1460003&r1=1460002&r2=1460003&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
Fri Mar 22 21:30:31 2013
@@ -27,7 +27,6 @@ import org.apache.commons.mail.settings.
* JUnit test case verifying bugzilla issue 30973 is fixed.
*
* @since 1.0
- * @author <a href="mailto:corey.sc...@gmail.com";>Corey Scott</a>
* @version $Id$
*/
public class SendWithAttachmentsTest extends BaseEmailTestCase
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=1460003&r1=1460002&r2=1460003&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
Fri Mar 22 21:30:31 2013
@@ -28,12 +28,10 @@ import org.apache.commons.mail.Email;
import org.apache.commons.mail.EmailException;
/**
- * Concrete Implementation on the Abstract Email
- * Class (used to allow testing only). Supplies
- * getters for methods that normally only have setters.
+ * Concrete Implementation on the Abstract Email Class (used to allow testing
only).
+ * Supplies getters for methods that normally only have setters.
*
* @since 1.0
- * @author <a href="mailto:corey.sc...@gmail.com";>Corey Scott</a>
* @version $Id$
*/
public class MockEmailConcrete extends Email
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=1460003&r1=1460002&r2=1460003&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
Fri Mar 22 21:30:31 2013
@@ -17,7 +17,6 @@
package org.apache.commons.mail.mocks;
import java.io.IOException;
-import java.util.List;
import java.util.Map;
import javax.mail.MessagingException;
@@ -30,7 +29,6 @@ import org.apache.commons.mail.HtmlEmail
* (used to allow testing only)
*
* @since 1.0
- * @author <a href="mailto:corey.sc...@gmail.com";>Corey Scott</a>
* @version $Id$
*/
public class MockHtmlEmailConcrete extends HtmlEmail
@@ -74,17 +72,9 @@ public class MockHtmlEmailConcrete exten
}
/**
- * @deprecated as of commons-email 1.1, replaced by {@link
#getInlineEmbeds}.
- */
- @Deprecated
- public List getInlineImages()
- {
- return inlineImages;
- }
-
- /**
* @return inlineEmbeds
*/
+ @SuppressWarnings("rawtypes") // InlineImage is a private inner class
public Map getInlineEmbeds()
{
return inlineEmbeds;
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=1460003&r1=1460002&r2=1460003&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
Fri Mar 22 21:30:31 2013
@@ -70,6 +70,7 @@ public class MockImageHtmlEmailConcrete
/**
* @return inlineEmbeds
*/
+ @SuppressWarnings("rawtypes") // InlineImage is a private inner class
public Map getInlineEmbeds()
{
return inlineEmbeds;
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=1460003&r1=1460002&r2=1460003&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
Fri Mar 22 21:30:31 2013
@@ -28,7 +28,6 @@ import org.apache.commons.mail.MultiPart
* (used to allow testing only)
*
* @since 1.0
- * @author <a href="mailto:corey.sc...@gmail.com";>Corey Scott</a>
* @version $Id$
*/
public class MockMultiPartEmailConcrete extends MultiPartEmail
Modified:
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockSimpleEmail.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockSimpleEmail.java?rev=1460003&r1=1460002&r2=1460003&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockSimpleEmail.java
(original)
+++
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockSimpleEmail.java
Fri Mar 22 21:30:31 2013
@@ -25,7 +25,6 @@ import org.apache.commons.mail.SimpleEma
* (used to allow testing only)
*
* @since 1.0
- * @author <a href="mailto:corey.sc...@gmail.com";>Corey Scott</a>
* @version $Id$
*/
public class MockSimpleEmail extends SimpleEmail
Modified:
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/settings/EmailConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/settings/EmailConfiguration.java?rev=1460003&r1=1460002&r2=1460003&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/settings/EmailConfiguration.java
(original)
+++
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/settings/EmailConfiguration.java
Fri Mar 22 21:30:31 2013
@@ -23,7 +23,6 @@ import org.apache.commons.mail.EmailCons
* for the JUnit tests.
*
* @since 1.0
- * @author Eric Pugh
* @version $Id$
*/
public final class EmailConfiguration
