Author: davsclaus
Date: Fri Oct 16 15:49:42 2009
New Revision: 825961
URL: http://svn.apache.org/viewvc?rev=825961&view=rev
Log:
MR-195: Added more unit tests
Added:
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
- copied, changed from r825923,
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNoRecipientsTest.java
- copied, changed from r825923,
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java
Copied:
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
(from r825923,
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java?p2=camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java&p1=camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java&r1=825923&r2=825961&rev=825961&view=diff
==============================================================================
---
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
(original)
+++
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
Fri Oct 16 15:49:42 2009
@@ -18,7 +18,6 @@
import java.util.HashMap;
import java.util.Map;
-
import javax.mail.Message;
import org.apache.camel.builder.RouteBuilder;
@@ -29,25 +28,27 @@
/**
* Unit test for Mail using camel headers to set recipeient subject.
*/
-public class MailUsingHeadersTest extends CamelTestSupport {
+public class MailMultipleRecipientsUsingHeadersTest extends CamelTestSupport {
@Test
- public void testMailUsingHeaders() throws Exception {
+ public void testMailMultipleRecipientUsingHeaders() throws Exception {
Mailbox.clearAll();
// START SNIPPET: e1
Map map = new HashMap();
- map.put("To", "[email protected]");
+
+ map.put("To", new String[] {"[email protected]",
"[email protected]"});
map.put("From", "[email protected]");
map.put("Subject", "Camel rocks");
- String body = "Hello Claus.\nYes it does.\n\nRegards James.";
+ String body = "Hello Riders.\nYes it does.\n\nRegards James.";
template.sendBodyAndHeaders("smtp://[email protected]", body, map);
// END SNIPPET: e1
Mailbox box = Mailbox.get("[email protected]");
Message msg = box.get(0);
assertEquals("[email protected]",
msg.getRecipients(Message.RecipientType.TO)[0].toString());
+ assertEquals("[email protected]",
msg.getRecipients(Message.RecipientType.TO)[1].toString());
assertEquals("[email protected]", msg.getFrom()[0].toString());
assertEquals("Camel rocks", msg.getSubject());
}
Copied:
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNoRecipientsTest.java
(from r825923,
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNoRecipientsTest.java?p2=camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNoRecipientsTest.java&p1=camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java&r1=825923&r2=825961&rev=825961&view=diff
==============================================================================
---
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java
(original)
+++
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNoRecipientsTest.java
Fri Oct 16 15:49:42 2009
@@ -16,36 +16,33 @@
*/
package org.apache.camel.component.mail;
+import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-import org.jvnet.mock_javamail.Mailbox;
+import org.springframework.mail.MailPreparationException;
/**
- * Unit test for Mail using @ in username option
+ * Unit test for no recipients
*/
-public class MailUsernameWithAtSignTest extends CamelTestSupport {
+public class MailNoRecipientsTest extends CamelTestSupport {
@Test
- public void testMailUsingAtSignInUsername() throws Exception {
- Mailbox.clearAll();
-
- String body = "Hello Claus.\nYes it does.\n\nRegards James.";
- template.sendBody("direct:a", body);
-
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMessageCount(1);
- mock.expectedBodiesReceived(body);
- mock.assertIsSatisfied();
+ public void testMailNoRecipients() throws Exception {
+ try {
+ template.sendBody("direct:a", "Hello World");
+ fail("Should have thrown exception");
+ } catch (CamelExecutionException e) {
+ MailPreparationException mpe =
assertIsInstanceOf(MailPreparationException.class, e.getCause());
+ IllegalArgumentException iae =
assertIsInstanceOf(IllegalArgumentException.class, mpe.getCause());
+ assertEquals("The mail message does not have any recipients set.",
iae.getMessage());
+ }
}
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
-
from("direct:a").to("smtp://localhost?username=ja...@localhost");
-
-
from("pop3://localhost?username=james&password=secret&consumer.delay=1000").to("mock:result");
+ from("direct:a").to("smtp://localhost");
}
};
}
