You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/06/26 13:14:05 UTC
svn commit: r1139760 -
/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
Author: davsclaus
Date: Sun Jun 26 11:14:04 2011
New Revision: 1139760
URL: http://svn.apache.org/viewvc?rev=1139760&view=rev
Log:
CAMEL-4093: Added unit test.
Added:
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
- copied, changed from r1139746, camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
Copied: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java (from r1139746, 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/RawMailMessageTest.java?p2=camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java&p1=camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java&r1=1139746&r2=1139760&rev=1139760&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/RawMailMessageTest.java Sun Jun 26 11:14:04 2011
@@ -18,9 +18,9 @@ package org.apache.camel.component.mail;
import java.util.HashMap;
import java.util.Map;
-
import javax.mail.Message;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -29,50 +29,38 @@ import org.jvnet.mock_javamail.Mailbox;
/**
* Unit test for Mail using camel headers to set recipient subject.
*/
-public class MailUsingHeadersTest extends CamelTestSupport {
+public class RawMailMessageTest extends CamelTestSupport {
@Test
- public void testMailUsingHeaders() throws Exception {
+ public void testGetRawJavaMailMessage() throws Exception {
Mailbox.clearAll();
- // START SNIPPET: e1
Map<String, Object> map = new HashMap<String, Object>();
map.put("To", "davsclaus@apache.org");
map.put("From", "jstrachan@apache.org");
map.put("Subject", "Camel rocks");
String body = "Hello Claus.\nYes it does.\n\nRegards James.";
- template.sendBodyAndHeaders("smtp://davsclaus@apache.org", body, map);
- // END SNIPPET: e1
- Mailbox box = Mailbox.get("davsclaus@apache.org");
- Message msg = box.get(0);
- assertEquals("davsclaus@apache.org", msg.getRecipients(Message.RecipientType.TO)[0].toString());
- assertEquals("jstrachan@apache.org", msg.getFrom()[0].toString());
- assertEquals("Camel rocks", msg.getSubject());
- }
-
- @Test
- public void testMailWithFromInEndpoint() throws Exception {
- Mailbox.clearAll();
+ getMockEndpoint("mock:mail").expectedMessageCount(1);
+ template.sendBodyAndHeaders("smtp://davsclaus@apache.org", body, map);
+ assertMockEndpointsSatisfied();
- Map<String, Object> map = new HashMap<String, Object>();
- map.put("Subject", "Camel rocks");
+ Exchange exchange = getMockEndpoint("mock:mail").getReceivedExchanges().get(0);
- String body = "Hello Claus.\nYes it does.\n\nRegards James.";
- template.sendBodyAndHeaders("smtp://davsclaus@apache.org?from=James Strachan <js...@apache.org>&to=davsclaus@apache.org", body, map);
+ // START SNIPPET: e1
+ // get access to the raw javax.mail.Message as shown below
+ Message javaMailMessage = exchange.getIn(MailMessage.class).getMessage();
+ assertNotNull(javaMailMessage);
- Mailbox box = Mailbox.get("davsclaus@apache.org");
- Message msg = box.get(0);
- assertEquals("davsclaus@apache.org", msg.getRecipients(Message.RecipientType.TO)[0].toString());
- assertEquals("James Strachan <js...@apache.org>", msg.getFrom()[0].toString());
- assertEquals("Camel rocks", msg.getSubject());
+ assertEquals("Camel rocks", javaMailMessage.getSubject());
+ // END SNIPPET: e1
}
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- // no routes
+ from("pop3://davsclaus@apache.org").to("mock:mail");
}
};
}