You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/06/17 16:41:34 UTC
svn commit: r785630 - in /camel/trunk/components/camel-mail: ./
src/test/java/org/apache/camel/component/mail/
Author: ningjiang
Date: Wed Jun 17 14:41:33 2009
New Revision: 785630
URL: http://svn.apache.org/viewvc?rev=785630&view=rev
Log:
CAMEL-1712 Upgraded the camel-mail to JUnit4
Modified:
camel/trunk/components/camel-mail/pom.xml
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/InvalidConfigurationTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java
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/MailUsingOwnComponentTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
Modified: camel/trunk/components/camel-mail/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/pom.xml?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/pom.xml (original)
+++ camel/trunk/components/camel-mail/pom.xml Wed Jun 17 14:41:33 2009
@@ -79,8 +79,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <type>test-jar</type>
+ <artifactId>camel-test</artifactId>
<optional>true</optional>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java Wed Jun 17 14:41:33 2009
@@ -18,21 +18,24 @@
import java.util.Properties;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* Unit test allowing end users to set additional mail.xxx properties.
*/
-public class AdditionalMailPropertiesTest extends ContextTestSupport {
+public class AdditionalMailPropertiesTest extends CamelTestSupport {
+ @Test
public void testAdditionalMailProperties() throws Exception {
MailEndpoint endpoint = (MailEndpoint) context.getEndpoint("pop3://localhost?username=james&mail.pop3.forgettopheaders=true");
Properties prop = endpoint.getConfiguration().getAdditionalJavaMailProperties();
assertEquals("true", prop.get("mail.pop3.forgettopheaders"));
}
+ @Test
public void testConsumeWithAdditionalProperties() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java Wed Jun 17 14:41:33 2009
@@ -16,18 +16,20 @@
*/
package org.apache.camel.component.mail;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
/**
* @version $Revision$
*/
-public class FromFileSendMailTest extends ContextTestSupport {
+public class FromFileSendMailTest extends CamelTestSupport {
+ @Test
public void testSendFileAsMail() throws Exception {
Mailbox.clearAll();
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/InvalidConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/InvalidConfigurationTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/InvalidConfigurationTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/InvalidConfigurationTest.java Wed Jun 17 14:41:33 2009
@@ -16,16 +16,18 @@
*/
package org.apache.camel.component.mail;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.PollingConsumer;
import org.apache.camel.ResolveEndpointFailedException;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* Unit test for various invalid configurations etc.
*/
-public class InvalidConfigurationTest extends ContextTestSupport {
+public class InvalidConfigurationTest extends CamelTestSupport {
+ @Test
public void testSMTPCanNotBeUsedForConsumingMails() throws Exception {
Endpoint endpoint = this.context.getEndpoint("smtp://localhost?username=james");
PollingConsumer consumer = endpoint.createPollingConsumer();
@@ -37,6 +39,7 @@
}
}
+ @Test
public void testSMTPSCanNotBeUsedForConsumingMails() throws Exception {
Endpoint endpoint = this.context.getEndpoint("smtps://localhost?username=james");
PollingConsumer consumer = endpoint.createPollingConsumer();
@@ -48,6 +51,7 @@
}
}
+ @Test
public void testNNTPNotSupported() throws Exception {
try {
this.context.getEndpoint("nntp://localhost?username=james");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java Wed Jun 17 14:41:33 2009
@@ -21,19 +21,21 @@
import javax.activation.DataHandler;
import javax.activation.FileDataSource;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* Unit test for Camel attachments and Mail attachments.
*/
-public class MailAttachmentTest extends ContextTestSupport {
+public class MailAttachmentTest extends CamelTestSupport {
+ @Test
public void testSendAndRecieveMailWithAttachments() throws Exception {
// START SNIPPET: e1
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java Wed Jun 17 14:41:33 2009
@@ -21,18 +21,20 @@
import javax.mail.Store;
import javax.mail.internet.MimeMessage;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
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.javamail.JavaMailSenderImpl;
/**
* Unit test for batch consumer.
*/
-public class MailBatchConsumerTest extends ContextTestSupport {
+public class MailBatchConsumerTest extends CamelTestSupport {
+ @Test
public void testBatchConsumer() throws Exception {
prepareMailbox();
Mailbox mailbox = Mailbox.get("jones@localhost");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java Wed Jun 17 14:41:33 2009
@@ -18,14 +18,16 @@
import javax.mail.Message;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class MailComponentTest extends ContextTestSupport {
+public class MailComponentTest extends CamelTestSupport {
+ @Test
public void testMailEndpointsAreConfiguredProperlyWhenUsingSmtp() throws Exception {
MailEndpoint endpoint = resolveMandatoryEndpoint("smtp://james@myhost:25/subject");
MailConfiguration config = endpoint.getConfiguration();
@@ -37,6 +39,7 @@
assertEquals("folder", "INBOX", config.getFolderName());
}
+ @Test
public void testMailEndpointsAreConfiguredProperlyWhenUsingImap() throws Exception {
MailEndpoint endpoint = resolveMandatoryEndpoint("imap://james@myhost:143/subject");
MailConfiguration config = endpoint.getConfiguration();
@@ -48,6 +51,7 @@
assertEquals("folder", "INBOX", config.getFolderName());
}
+ @Test
public void testMailEndpointsAreConfiguredProperlyWhenUsingPop() throws Exception {
MailEndpoint endpoint = resolveMandatoryEndpoint("pop3://james@myhost:110/subject");
MailConfiguration config = endpoint.getConfiguration();
@@ -59,6 +63,7 @@
assertEquals("folder", "INBOX", config.getFolderName());
}
+ @Test
public void testDefaultSMTPConfiguration() throws Exception {
MailEndpoint endpoint = resolveMandatoryEndpoint("smtp://james@myhost?password=secret");
MailConfiguration config = endpoint.getConfiguration();
@@ -78,6 +83,7 @@
assertEquals("unseen", true, config.isUnseen());
}
+ @Test
public void testDefaultPOP3Configuration() throws Exception {
MailEndpoint endpoint = resolveMandatoryEndpoint("pop3://james@myhost?password=secret");
MailConfiguration config = endpoint.getConfiguration();
@@ -97,6 +103,7 @@
assertEquals("unseen", true, config.isUnseen());
}
+ @Test
public void testDefaultIMAPConfiguration() throws Exception {
MailEndpoint endpoint = resolveMandatoryEndpoint("imap://james@myhost?password=secret");
MailConfiguration config = endpoint.getConfiguration();
@@ -116,6 +123,7 @@
assertEquals("unseen", true, config.isUnseen());
}
+ @Test
public void testManyConfigurations() throws Exception {
MailEndpoint endpoint = resolveMandatoryEndpoint("smtp://james@myhost:30/subject?password=secret"
+ "&from=me@camelriders.org&delete=true&defaultEncoding=iso-8859-1&folderName=riders"
@@ -137,6 +145,7 @@
assertEquals("contentType", "text/html", config.getContentType());
}
+ @Test
public void testTo() {
MailEndpoint endpoint = resolveMandatoryEndpoint("smtp://james@myhost:25/?password=secret&to=someone@outthere.com&folderName=XXX");
MailConfiguration config = endpoint.getConfiguration();
@@ -154,6 +163,7 @@
assertEquals("fetchSize", -1, config.getFetchSize());
}
+ @Test
public void testNoUserInfoButUsername() {
MailEndpoint endpoint = resolveMandatoryEndpoint("smtp://myhost:25/?password=secret&username=james");
MailConfiguration config = endpoint.getConfiguration();
@@ -171,6 +181,7 @@
assertEquals("fetchSize", -1, config.getFetchSize());
}
+ @Test
public void testMailEndpointsWithFetchSize() throws Exception {
MailEndpoint endpoint = resolveMandatoryEndpoint("pop3://james@myhost?fetchSize=5");
MailConfiguration config = endpoint.getConfiguration();
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java Wed Jun 17 14:41:33 2009
@@ -20,19 +20,21 @@
import javax.activation.DataHandler;
import javax.activation.FileDataSource;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* Unit test for Camel attachments and Mail attachments.
*/
-public class MailContentTypeResolverTest extends ContextTestSupport {
+public class MailContentTypeResolverTest extends CamelTestSupport {
+ @Test
public void testCustomContentTypeResolver() throws Exception {
// create an exchange with a normal body and attachment to be produced as email
Endpoint endpoint = context.getEndpoint("smtp://james@mymailserver.com?password=secret");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java Wed Jun 17 14:41:33 2009
@@ -18,15 +18,17 @@
import javax.mail.Message;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
/**
* Unit test for contentType option.
*/
-public class MailContentTypeTest extends ContextTestSupport {
+public class MailContentTypeTest extends CamelTestSupport {
+ @Test
public void testSendHtmlMail() throws Exception {
Mailbox.clearAll();
@@ -39,6 +41,7 @@
assertEquals("<html><body><h1>Hello</h1>World</body></html>", msg.getContent());
}
+ @Test
public void testSendPlainMail() throws Exception {
Mailbox.clearAll();
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java Wed Jun 17 14:41:33 2009
@@ -18,16 +18,18 @@
import javax.mail.Message;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
/**
* Unit test for contentType option.
*/
-public class MailCustomContentTypeTest extends ContextTestSupport {
+public class MailCustomContentTypeTest extends CamelTestSupport {
+ @Test
public void testSendHtmlMail() throws Exception {
Mailbox.clearAll();
@@ -41,6 +43,7 @@
assertEquals("<html><body><h1>Hello</h1>World</body></html>", msg.getContent());
}
+ @Test
public void testSendHtmlMailIso88591() throws Exception {
Mailbox.clearAll();
@@ -54,6 +57,7 @@
assertEquals("<html><body><h1>Hello</h1>World</body></html>", msg.getContent());
}
+ @Test
public void testSendPlainMailContentTypeInHeader() throws Exception {
Mailbox.clearAll();
@@ -65,6 +69,7 @@
assertEquals("Hello World", msg.getContent());
}
+ @Test
public void testSendPlainMailContentTypeInHeader2() throws Exception {
Mailbox.clearAll();
@@ -76,6 +81,7 @@
assertEquals("Hello World", msg.getContent());
}
+ @Test
public void testSendPlainMailContentTypeTinyTypeInHeader() throws Exception {
Mailbox.clearAll();
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java Wed Jun 17 14:41:33 2009
@@ -16,15 +16,17 @@
*/
package org.apache.camel.component.mail;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* Unit test for testing mail polling is happening according to the default poll interval.
*/
-public class MailDefaultDelayForMailConsumeTest extends ContextTestSupport {
+public class MailDefaultDelayForMailConsumeTest extends CamelTestSupport {
+ @Test
public void testConsuming() throws Exception {
template.sendBody("smtp://bond@localhost", "Hello London");
MockEndpoint mock = getMockEndpoint("mock:result");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java Wed Jun 17 14:41:33 2009
@@ -22,20 +22,22 @@
import javax.mail.Store;
import javax.mail.internet.MimeMessage;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
import org.springframework.mail.javamail.JavaMailSenderImpl;
/**
* Unit test for rollback option.
*/
-public class MailDoNotDeleteIfProcessFailsTest extends ContextTestSupport {
+public class MailDoNotDeleteIfProcessFailsTest extends CamelTestSupport {
private static int counter;
+ @Test
public void testRoolbackIfProcessFails() throws Exception {
prepareMailbox();
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java Wed Jun 17 14:41:33 2009
@@ -21,17 +21,19 @@
import javax.mail.Store;
import javax.mail.internet.MimeMessage;
-import org.apache.camel.ContextTestSupport;
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.javamail.JavaMailSenderImpl;
/**
* Unit test for fetch size.
*/
-public class MailFetchSizeTest extends ContextTestSupport {
+public class MailFetchSizeTest extends CamelTestSupport {
+ @Test
public void testFetchSize() throws Exception {
prepareMailbox();
Mailbox mailbox = Mailbox.get("jones@localhost");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java Wed Jun 17 14:41:33 2009
@@ -21,17 +21,19 @@
import javax.mail.Store;
import javax.mail.internet.MimeMessage;
-import org.apache.camel.ContextTestSupport;
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.javamail.JavaMailSenderImpl;
/**
* Unit test for a special corner case with fetchSize=0
*/
-public class MailFetchSizeZeroTest extends ContextTestSupport {
+public class MailFetchSizeZeroTest extends CamelTestSupport {
+ @Test
public void testFetchSize() throws Exception {
prepareMailbox();
Mailbox mailbox = Mailbox.get("bill@localhost");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java Wed Jun 17 14:41:33 2009
@@ -19,16 +19,18 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.ContextTestSupport;
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;
/**
* Unit test to verify that message headers override pre configuration.
*/
-public class MailHeaderOverrulePreConfigurationRecipientsTest extends ContextTestSupport {
+public class MailHeaderOverrulePreConfigurationRecipientsTest extends CamelTestSupport {
+ @Test
public void testSendWithRecipientsInHeaders() throws Exception {
Mailbox.clearAll();
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java Wed Jun 17 14:41:33 2009
@@ -21,19 +21,21 @@
import javax.activation.DataHandler;
import javax.activation.FileDataSource;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* Unit test for Camel html attachments and Mail attachments.
*/
-public class MailHtmlAttachmentTest extends ContextTestSupport {
+public class MailHtmlAttachmentTest extends CamelTestSupport {
+ @Test
public void testSendAndRecieveMailWithAttachments() throws Exception {
// START SNIPPET: e1
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java Wed Jun 17 14:41:33 2009
@@ -21,18 +21,20 @@
import javax.mail.Store;
import javax.mail.internet.MimeMessage;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
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.javamail.JavaMailSenderImpl;
/**
* Unit test for batch consumer.
*/
-public class MailMaxMessagesPerPollTest extends ContextTestSupport {
+public class MailMaxMessagesPerPollTest extends CamelTestSupport {
+ @Test
public void testBatchConsumer() throws Exception {
prepareMailbox();
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java Wed Jun 17 14:41:33 2009
@@ -25,19 +25,22 @@
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.ObjectHelper;
+import org.junit.Before;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class MailMessageTest extends ContextTestSupport {
+public class MailMessageTest extends CamelTestSupport {
private Session mailSession;
private MimeMessage mimeMessage;
private MailEndpoint endpoint;
private String body = "Hello World!";
+ @Test
public void testMailMessageHandlesMultipleHeaders() throws Exception {
mimeMessage.setRecipients(Message.RecipientType.TO, new Address[] {new InternetAddress("foo@localhost"), new InternetAddress("bar@localhost")});
@@ -61,6 +64,7 @@
}
}
+ @Test
public void testMailMessageHandlesSingleHeader() throws Exception {
mimeMessage.setRecipients(Message.RecipientType.TO, new Address[] {new InternetAddress("frank@localhost")});
@@ -74,7 +78,8 @@
}
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
super.setUp();
endpoint = resolveMandatoryEndpoint("pop3://someone@myhost:30/subject");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java Wed Jun 17 14:41:33 2009
@@ -19,16 +19,18 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.ContextTestSupport;
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;
/**
* Unit test to verift that we can have multiple recipients in To, CC and BCC
*/
-public class MailMultipleRecipientsTest extends ContextTestSupport {
+public class MailMultipleRecipientsTest extends CamelTestSupport {
+ @Test
public void testSendWithMultipleRecipientsInHeader() throws Exception {
Mailbox.clearAll();
@@ -48,6 +50,7 @@
assertMockEndpointsSatisfied();
}
+ @Test
public void testSendWithMultipleRecipientsPreConfigured() throws Exception {
Mailbox.clearAll();
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java Wed Jun 17 14:41:33 2009
@@ -19,13 +19,15 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.ContextTestSupport;
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;
-public class MailNameAndEmailInRecipientTest extends ContextTestSupport {
+public class MailNameAndEmailInRecipientTest extends CamelTestSupport {
+ @Test
public void testSendWithNameAndEmailInRecipient() throws Exception {
Mailbox.clearAll();
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java Wed Jun 17 14:41:33 2009
@@ -22,17 +22,19 @@
import javax.mail.Store;
import javax.mail.internet.MimeMessage;
-import org.apache.camel.ContextTestSupport;
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.javamail.JavaMailSenderImpl;
/**
* Unit test for unseen option.
*/
-public class MailProcessOnlyUnseenMessagesTest extends ContextTestSupport {
+public class MailProcessOnlyUnseenMessagesTest extends CamelTestSupport {
+ @Test
public void testProcessOnlyUnseenMessages() throws Exception {
prepareMailbox();
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java Wed Jun 17 14:41:33 2009
@@ -22,8 +22,9 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
/**
@@ -31,12 +32,14 @@
*
* @version $Revision$
*/
-public class MailProducerConcurrentTest extends ContextTestSupport {
+public class MailProducerConcurrentTest extends CamelTestSupport {
+ @Test
public void testNoConcurrentProducers() throws Exception {
doSendMessages(1, 1);
}
+ @Test
public void testConcurrentProducers() throws Exception {
doSendMessages(10, 5);
}
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java Wed Jun 17 14:41:33 2009
@@ -18,15 +18,17 @@
import javax.mail.Message;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
/**
* Unit test for recipients (To, CC, BCC)
*/
-public class MailRecipientsTest extends ContextTestSupport {
+public class MailRecipientsTest extends CamelTestSupport {
+ @Test
public void testMultiRecipients() throws Exception {
Mailbox.clearAll();
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java Wed Jun 17 14:41:33 2009
@@ -25,17 +25,19 @@
import javax.mail.MessagingException;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
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;
/**
* @version $Revision$
*/
-public class MailRouteTest extends ContextTestSupport {
+public class MailRouteTest extends CamelTestSupport {
+ @Test
public void testSendAndReceiveMails() throws Exception {
Mailbox.clearAll();
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java Wed Jun 17 14:41:33 2009
@@ -16,17 +16,19 @@
*/
package org.apache.camel.component.mail;
-import org.apache.camel.ContextTestSupport;
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;
/**
* Unit test for Mail subject support.
*/
-public class MailSubjectTest extends ContextTestSupport {
+public class MailSubjectTest extends CamelTestSupport {
private String subject = "Camel rocks";
+ @Test
public void testMailSubject() throws Exception {
Mailbox.clearAll();
Modified: 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/MailUsernameWithAtSignTest.java?rev=785630&r1=785629&r2=785630&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/MailUsernameWithAtSignTest.java Wed Jun 17 14:41:33 2009
@@ -16,16 +16,18 @@
*/
package org.apache.camel.component.mail;
-import org.apache.camel.ContextTestSupport;
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;
/**
* Unit test for Mail using @ in username option
*/
-public class MailUsernameWithAtSignTest extends ContextTestSupport {
+public class MailUsernameWithAtSignTest extends CamelTestSupport {
+ @Test
public void testMailUsingAtSignInUsername() throws Exception {
Mailbox.clearAll();
Modified: 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/MailUsingHeadersTest.java?rev=785630&r1=785629&r2=785630&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/MailUsingHeadersTest.java Wed Jun 17 14:41:33 2009
@@ -21,15 +21,17 @@
import javax.mail.Message;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
/**
* Unit test for Mail using camel headers to set recipeient subject.
*/
-public class MailUsingHeadersTest extends ContextTestSupport {
+public class MailUsingHeadersTest extends CamelTestSupport {
+ @Test
public void testMailUsingHeaders() throws Exception {
Mailbox.clearAll();
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java Wed Jun 17 14:41:33 2009
@@ -19,13 +19,14 @@
import javax.mail.Message;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
/**
* Unit test for CAMEL-1249
*/
-public class MailUsingOwnComponentTest extends ContextTestSupport {
+public class MailUsingOwnComponentTest extends CamelTestSupport {
@Override
public boolean isUseRouteBuilder() {
@@ -53,6 +54,7 @@
return context;
}
+ @Test
public void testUsingOwnMailComponent() throws Exception {
Mailbox.clearAll();
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java Wed Jun 17 14:41:33 2009
@@ -35,17 +35,19 @@
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class MimeMessageConsumeTest extends ContextTestSupport {
+public class MimeMessageConsumeTest extends CamelTestSupport {
private String body = "hello world!";
+ @Test
public void testSendAndReceiveMails() throws Exception {
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
resultEndpoint.expectedMinimumMessageCount(1);
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java Wed Jun 17 14:41:33 2009
@@ -23,16 +23,17 @@
import javax.activation.FileDataSource;
import javax.mail.internet.MimeMultipart;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Producer;
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 static org.apache.camel.component.mail.MailConstants.MAIL_ALTERNATIVE_BODY;
-public class MimeMultipartAlternativeTest extends ContextTestSupport {
+public class MimeMultipartAlternativeTest extends CamelTestSupport {
private String alternativeBody = "hello world! (plain text)";
private String htmlBody = "<html><body><h1>Hello</h1>World<img src=\"cid:0001\"></body></html>";
@@ -88,11 +89,14 @@
}
+
+ @Test
public void testMultipartEmailWithInlineAttachments() throws Exception {
sendMultipartEmail(true);
verifyTheRecivedEmail("Content-Disposition: inline; filename=\"cid:0001\"");
}
-
+
+ @Test
public void testMultipartEmailWithRegularAttachments() throws Exception {
sendMultipartEmail(false);
verifyTheRecivedEmail("Content-Disposition: attachment; filename=\"cid:0001\"");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java?rev=785630&r1=785629&r2=785630&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java Wed Jun 17 14:41:33 2009
@@ -28,20 +28,23 @@
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.ObjectHelper;
+import org.junit.Before;
+import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
/**
* @version $Revision$
*/
-public class MultipleDestinationConsumeTest extends ContextTestSupport {
+public class MultipleDestinationConsumeTest extends CamelTestSupport {
private String body = "hello world!";
private Session mailSession;
+ @Test
public void testSendAndReceiveMails() throws Exception {
Mailbox.clearAll();
@@ -96,7 +99,8 @@
}
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
Properties properties = new Properties();
properties.put("mail.smtp.host", "localhost");
mailSession = Session.getInstance(properties, null);