Author: sgoeschl
Date: Tue Feb 24 22:07:26 2009
New Revision: 747572
URL: http://svn.apache.org/viewvc?rev=747572&view=rev
Log:
[EMAIL-81] Add getTo and getReplyTo to Email class - Corey Scott did also
aligned the mock classes with the Email interface.
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailTest.java
commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java
commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
commons/proper/email/trunk/src/test/org/apache/commons/mail/SendWithAttachmentsTest.java
commons/proper/email/trunk/src/test/org/apache/commons/mail/SimpleEmailTest.java
commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockEmailConcrete.java
commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java
commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java
commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockSimpleEmail.java
commons/proper/email/trunk/xdocs/changes.xml
Modified: commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java?rev=747572&r1=747571&r2=747572&view=diff
==============================================================================
--- commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
(original)
+++ commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java Tue
Feb 24 22:07:26 2009
@@ -1354,4 +1354,46 @@
{
this.sslSmtpPort = sslSmtpPort;
}
+
+ /**
+ * Get the list of "To" addresses.
+ *
+ * @return List addresses
+ */
+ public List getToAddresses()
+ {
+ return this.toList;
+ }
+
+ /**
+ * Get the list of "CC" addresses.
+ *
+ * @return List addresses
+ */
+ public List getCcAddresses()
+ {
+ return this.ccList;
+ }
+
+ /**
+ * Get the list of "Bcc" addresses.
+ *
+ * @return List addresses
+ */
+ public List getBccAddresses()
+ {
+ return this.bccList;
+ }
+
+ /**
+ * Get the list of "Reply-To" addresses.
+ *
+ * @return List addresses
+ */
+ public List getReplyToAddresses()
+ {
+ return this.replyList;
+ }
+
+
}
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailTest.java?rev=747572&r1=747571&r2=747572&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailTest.java
(original)
+++ commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailTest.java
Tue Feb 24 22:07:26 2009
@@ -416,8 +416,8 @@
}
// retrieve and verify
- assertEquals(arrExpected.size(), this.email.getToList().size());
- assertEquals(arrExpected.toString(),
this.email.getToList().toString());
+ assertEquals(arrExpected.size(), this.email.getToAddresses().size());
+ assertEquals(arrExpected.toString(),
this.email.getToAddresses().toString());
}
/**
@@ -455,8 +455,8 @@
}
// retrieve and verify
- assertEquals(arrExpected.size(), this.email.getToList().size());
- assertEquals(arrExpected.toString(),
this.email.getToList().toString());
+ assertEquals(arrExpected.size(), this.email.getToAddresses().size());
+ assertEquals(arrExpected.toString(),
this.email.getToAddresses().toString());
}
/**
@@ -489,8 +489,8 @@
}
// retrieve and verify
- assertEquals(arrExpected.size(), this.email.getToList().size());
- assertEquals(arrExpected.toString(),
this.email.getToList().toString());
+ assertEquals(arrExpected.size(), this.email.getToAddresses().size());
+ assertEquals(arrExpected.toString(),
this.email.getToAddresses().toString());
// ====================================================================
// Test Exceptions
@@ -534,10 +534,10 @@
this.email.setTo(testEmailValid2);
// retrieve and verify
- assertEquals(testEmailValid2.size(), this.email.getToList().size());
+ assertEquals(testEmailValid2.size(),
this.email.getToAddresses().size());
assertEquals(
testEmailValid2.toString(),
- this.email.getToList().toString());
+ this.email.getToAddresses().toString());
// ====================================================================
// Exception (Null Input)
@@ -594,8 +594,8 @@
}
// retrieve and verify
- assertEquals(arrExpected.size(), this.email.getCcList().size());
- assertEquals(arrExpected.toString(),
this.email.getCcList().toString());
+ assertEquals(arrExpected.size(), this.email.getCcAddresses().size());
+ assertEquals(arrExpected.toString(),
this.email.getCcAddresses().toString());
}
/**
@@ -633,8 +633,8 @@
}
// retrieve and verify
- assertEquals(arrExpected.size(), this.email.getCcList().size());
- assertEquals(arrExpected.toString(),
this.email.getCcList().toString());
+ assertEquals(arrExpected.size(), this.email.getCcAddresses().size());
+ assertEquals(arrExpected.toString(),
this.email.getCcAddresses().toString());
}
/**
@@ -667,8 +667,8 @@
}
// retrieve and verify
- assertEquals(arrExpected.size(), this.email.getCcList().size());
- assertEquals(arrExpected.toString(),
this.email.getCcList().toString());
+ assertEquals(arrExpected.size(), this.email.getCcAddresses().size());
+ assertEquals(arrExpected.toString(),
this.email.getCcAddresses().toString());
// ====================================================================
// Test Exceptions
@@ -704,7 +704,7 @@
"\"someone_h...@work.com.au\" <someone_h...@work.com.au>");
this.email.setCc(testEmailValid2);
- assertEquals(testEmailValid2, this.email.getCcList());
+ assertEquals(testEmailValid2, this.email.getCcAddresses());
// ====================================================================
// Exception (Null Input)
@@ -761,10 +761,10 @@
}
// retrieve and verify
- assertEquals(arrExpected.size(), this.email.getBccList().size());
+ assertEquals(arrExpected.size(), this.email.getBccAddresses().size());
assertEquals(
arrExpected.toString(),
- this.email.getBccList().toString());
+ this.email.getBccAddresses().toString());
}
/**
@@ -802,10 +802,10 @@
}
// retrieve and verify
- assertEquals(arrExpected.size(), this.email.getBccList().size());
+ assertEquals(arrExpected.size(), this.email.getBccAddresses().size());
assertEquals(
arrExpected.toString(),
- this.email.getBccList().toString());
+ this.email.getBccAddresses().toString());
}
/**
@@ -839,10 +839,10 @@
}
// retrieve and verify
- assertEquals(arrExpected.size(), this.email.getBccList().size());
+ assertEquals(arrExpected.size(), this.email.getBccAddresses().size());
assertEquals(
arrExpected.toString(),
- this.email.getBccList().toString());
+ this.email.getBccAddresses().toString());
// ====================================================================
// Test Exceptions
@@ -884,7 +884,7 @@
"someone_h...@work-address.com.au"));
this.email.setBcc(testInetEmailValid);
- assertEquals(testInetEmailValid, this.email.getBccList());
+ assertEquals(testInetEmailValid, this.email.getBccAddresses());
// ====================================================================
// Exception (Null Input)
@@ -941,10 +941,10 @@
}
// retrieve and verify
- assertEquals(arrExpected.size(), this.email.getReplyList().size());
+ assertEquals(arrExpected.size(),
this.email.getReplyToAddresses().size());
assertEquals(
arrExpected.toString(),
- this.email.getReplyList().toString());
+ this.email.getReplyToAddresses().toString());
}
/**
@@ -982,10 +982,10 @@
}
// retrieve and verify
- assertEquals(arrExpected.size(), this.email.getReplyList().size());
+ assertEquals(arrExpected.size(),
this.email.getReplyToAddresses().size());
assertEquals(
arrExpected.toString(),
- this.email.getReplyList().toString());
+ this.email.getReplyToAddresses().toString());
}
/**
@@ -1018,10 +1018,10 @@
}
// retrieve and verify
- assertEquals(arrExpected.size(), this.email.getReplyList().size());
+ assertEquals(arrExpected.size(),
this.email.getReplyToAddresses().size());
assertEquals(
arrExpected.toString(),
- this.email.getReplyList().toString());
+ this.email.getReplyToAddresses().toString());
// ====================================================================
// Test Exceptions
@@ -1327,8 +1327,7 @@
this.email.setBcc(testInetEmailValid);
assertEquals(
testInetEmailValid.size(),
- this.email.toInternetAddressArray(
- this.email.getBccList()).length);
+ this.email.getBccAddresses().size());
}
/** */
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java?rev=747572&r1=747571&r2=747572&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java
(original)
+++
commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java
Tue Feb 24 22:07:26 2009
@@ -343,9 +343,9 @@
strSubject,
this.email.getTextMsg(),
this.email.getFromAddress(),
- this.email.getToList(),
- this.email.getCcList(),
- this.email.getBccList(),
+ this.email.getToAddresses(),
+ this.email.getCcAddresses(),
+ this.email.getBccAddresses(),
true);
// validate html message
@@ -354,9 +354,9 @@
strSubject,
this.email.getHtmlMsg(),
this.email.getFromAddress(),
- this.email.getToList(),
- this.email.getCcList(),
- this.email.getBccList(),
+ this.email.getToAddresses(),
+ this.email.getCcAddresses(),
+ this.email.getBccAddresses(),
false);
// validate attachment
@@ -365,9 +365,9 @@
strSubject,
attachment.getName(),
this.email.getFromAddress(),
- this.email.getToList(),
- this.email.getCcList(),
- this.email.getBccList(),
+ this.email.getToAddresses(),
+ this.email.getCcAddresses(),
+ this.email.getBccAddresses(),
false);
this.getMailServer();
@@ -397,9 +397,9 @@
strSubject,
this.email.getTextMsg(),
this.email.getFromAddress(),
- this.email.getToList(),
- this.email.getCcList(),
- this.email.getBccList(),
+ this.email.getToAddresses(),
+ this.email.getCcAddresses(),
+ this.email.getBccAddresses(),
true);
}
@@ -440,9 +440,9 @@
strSubject,
this.email.getTextMsg(),
this.email.getFromAddress(),
- this.email.getToList(),
- this.email.getCcList(),
- this.email.getBccList(),
+ this.email.getToAddresses(),
+ this.email.getCcAddresses(),
+ this.email.getBccAddresses(),
true);
// validate html message
@@ -451,9 +451,9 @@
strSubject,
this.email.getHtmlMsg(),
this.email.getFromAddress(),
- this.email.getToList(),
- this.email.getCcList(),
- this.email.getBccList(),
+ this.email.getToAddresses(),
+ this.email.getCcAddresses(),
+ this.email.getBccAddresses(),
false);
this.getMailServer();
@@ -484,9 +484,9 @@
strSubject,
this.email.getTextMsg(),
this.email.getFromAddress(),
- this.email.getToList(),
- this.email.getCcList(),
- this.email.getBccList(),
+ this.email.getToAddresses(),
+ this.email.getCcAddresses(),
+ this.email.getBccAddresses(),
true);
// validate html message
@@ -495,9 +495,9 @@
strSubject,
this.email.getHtmlMsg(),
this.email.getFromAddress(),
- this.email.getToList(),
- this.email.getCcList(),
- this.email.getBccList(),
+ this.email.getToAddresses(),
+ this.email.getCcAddresses(),
+ this.email.getBccAddresses(),
false);
}
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java?rev=747572&r1=747571&r2=747572&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
(original)
+++
commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
Tue Feb 24 22:07:26 2009
@@ -157,9 +157,9 @@
strSubject,
testEmail.getMsg(),
testEmail.getFromAddress(),
- testEmail.getToList(),
- testEmail.getCcList(),
- testEmail.getBccList(),
+ testEmail.getToAddresses(),
+ testEmail.getCcAddresses(),
+ testEmail.getBccAddresses(),
true);
// validate attachment
@@ -168,9 +168,9 @@
strSubject,
attachment.getName(),
testEmail.getFromAddress(),
- testEmail.getToList(),
- testEmail.getCcList(),
- testEmail.getBccList(),
+ testEmail.getToAddresses(),
+ testEmail.getCcAddresses(),
+ testEmail.getBccAddresses(),
false);
// ====================================================================
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/SendWithAttachmentsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/SendWithAttachmentsTest.java?rev=747572&r1=747571&r2=747572&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/org/apache/commons/mail/SendWithAttachmentsTest.java
(original)
+++
commons/proper/email/trunk/src/test/org/apache/commons/mail/SendWithAttachmentsTest.java
Tue Feb 24 22:07:26 2009
@@ -93,9 +93,9 @@
strSubject,
this.email.getTextMsg(),
this.email.getFromAddress(),
- this.email.getToList(),
- this.email.getCcList(),
- this.email.getBccList(),
+ this.email.getToAddresses(),
+ this.email.getCcAddresses(),
+ this.email.getBccAddresses(),
true);
// validate html message
@@ -104,9 +104,9 @@
strSubject,
this.email.getHtmlMsg(),
this.email.getFromAddress(),
- this.email.getToList(),
- this.email.getCcList(),
- this.email.getBccList(),
+ this.email.getToAddresses(),
+ this.email.getCcAddresses(),
+ this.email.getBccAddresses(),
false);
}
@@ -164,9 +164,9 @@
strSubject,
this.email.getTextMsg(),
this.email.getFromAddress(),
- this.email.getToList(),
- this.email.getCcList(),
- this.email.getBccList(),
+ this.email.getToAddresses(),
+ this.email.getCcAddresses(),
+ this.email.getBccAddresses(),
true);
// validate html message
@@ -175,9 +175,9 @@
strSubject,
this.email.getHtmlMsg(),
this.email.getFromAddress(),
- this.email.getToList(),
- this.email.getCcList(),
- this.email.getBccList(),
+ this.email.getToAddresses(),
+ this.email.getCcAddresses(),
+ this.email.getBccAddresses(),
false);
// validate attachment
@@ -186,9 +186,9 @@
strSubject,
attachment.getName(),
this.email.getFromAddress(),
- this.email.getToList(),
- this.email.getCcList(),
- this.email.getBccList(),
+ this.email.getToAddresses(),
+ this.email.getCcAddresses(),
+ this.email.getBccAddresses(),
false);
}
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/SimpleEmailTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/SimpleEmailTest.java?rev=747572&r1=747571&r2=747572&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/org/apache/commons/mail/SimpleEmailTest.java
(original)
+++
commons/proper/email/trunk/src/test/org/apache/commons/mail/SimpleEmailTest.java
Tue Feb 24 22:07:26 2009
@@ -120,9 +120,9 @@
strSubject,
this.email.getMsg(),
this.email.getFromAddress(),
- this.email.getToList(),
- this.email.getCcList(),
- this.email.getBccList(),
+ this.email.getToAddresses(),
+ this.email.getCcAddresses(),
+ this.email.getBccAddresses(),
true);
}
}
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockEmailConcrete.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockEmailConcrete.java?rev=747572&r1=747571&r2=747572&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockEmailConcrete.java
(original)
+++
commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockEmailConcrete.java
Tue Feb 24 22:07:26 2009
@@ -16,7 +16,6 @@
*/
package org.apache.commons.mail.mocks;
-import java.util.List;
import java.util.Map;
import javax.mail.Authenticator;
@@ -71,22 +70,6 @@
}
/**
- * @return bccList
- */
- public List getBccList()
- {
- return this.bccList;
- }
-
- /**
- * @return ccList
- */
- public List getCcList()
- {
- return this.ccList;
- }
-
- /**
* @return charset
*/
public String getCharset()
@@ -175,14 +158,6 @@
}
/**
- * @return replyList
- */
- public List getReplyList()
- {
- return this.replyList;
- }
-
- /**
* @return smtpPort
*/
public String getSmtpPort()
@@ -199,14 +174,6 @@
}
/**
- * @return toList
- */
- public List getToList()
- {
- return this.toList;
- }
-
- /**
* @return contentType
*/
public String getContentType()
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java?rev=747572&r1=747571&r2=747572&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java
(original)
+++
commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java
Tue Feb 24 22:07:26 2009
@@ -97,28 +97,4 @@
return this.fromAddress;
}
- /**
- * @return toList
- */
- public List getToList()
- {
- return this.toList;
- }
-
- /**
- * @return bccList
- */
- public List getBccList()
- {
- return this.bccList;
- }
-
- /**
- * @return ccList
- */
- public List getCcList()
- {
- return this.ccList;
- }
-
}
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java?rev=747572&r1=747571&r2=747572&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java
(original)
+++
commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java
Tue Feb 24 22:07:26 2009
@@ -17,7 +17,6 @@
package org.apache.commons.mail.mocks;
import java.io.IOException;
-import java.util.List;
import javax.mail.MessagingException;
import javax.mail.internet.InternetAddress;
@@ -70,28 +69,4 @@
return this.fromAddress;
}
- /**
- * @return toList
- */
- public List getToList()
- {
- return this.toList;
- }
-
- /**
- * @return bccList
- */
- public List getBccList()
- {
- return this.bccList;
- }
-
- /**
- * @return ccList
- */
- public List getCcList()
- {
- return this.ccList;
- }
-
}
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockSimpleEmail.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockSimpleEmail.java?rev=747572&r1=747571&r2=747572&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockSimpleEmail.java
(original)
+++
commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockSimpleEmail.java
Tue Feb 24 22:07:26 2009
@@ -16,8 +16,6 @@
*/
package org.apache.commons.mail.mocks;
-import java.util.List;
-
import javax.mail.internet.InternetAddress;
import org.apache.commons.mail.SimpleEmail;
@@ -49,28 +47,4 @@
return this.fromAddress;
}
- /**
- * @return toList
- */
- public List getToList()
- {
- return this.toList;
- }
-
- /**
- * @return bccList
- */
- public List getBccList()
- {
- return this.bccList;
- }
-
- /**
- * @return ccList
- */
- public List getCcList()
- {
- return this.ccList;
- }
-
}
Modified: commons/proper/email/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/xdocs/changes.xml?rev=747572&r1=747571&r2=747572&view=diff
==============================================================================
--- commons/proper/email/trunk/xdocs/changes.xml (original)
+++ commons/proper/email/trunk/xdocs/changes.xml Tue Feb 24 22:07:26 2009
@@ -24,16 +24,19 @@
<body>
<release version="1.2-SNAPSHOT" date="as in SVN">
- <action dev="sgoeschl" type="fix" issue="EMAIL-78" due-to="Aaron
Digulla, Corey Scott">
+ <action dev="sgoeschl" type="fix" issue="EMAIL-81" date="2009-02-22"
due-to="Travis Reader, Corey Scott">
+ Add getTo and getReplyTo to Email class.
+ </action>
+ <action dev="sgoeschl" type="fix" issue="EMAIL-78" date="2009-02-08"
due-to="Aaron Digulla, Corey Scott">
Provide better diagnostics when attaching documents fail.
</action>
- <action dev="sgoeschl" type="fix" issue="EMAIL-70" due-to="F. Andy
Seidl">
+ <action dev="sgoeschl" type="fix" issue="EMAIL-70" date="2008-12-29"
due-to="F. Andy Seidl">
When mail authentication is required and no username/password is
supplied
than the provided mail session is used. If a username/password is found
the implementation creates a new mail session and a
DefaultAuthenticator
as convinence implementation.
</action>
- <action dev="sgoeschl" type="fix" issue="EMAIL-65" due-to="Kenneth
Gendron">
+ <action dev="sgoeschl" type="fix" issue="EMAIL-65" date="2008-12-29"
due-to="Kenneth Gendron">
Using Kenneth's implementation of HtmlEmail.buildMimeMessage() to fix a
couple of HtmlEmail layout issues. Also thanks to Martin Lau and Morten
Hattesen for providing in-depth analysis of the problem
