Author: davsclaus
Date: Tue Jan 18 15:56:18 2011
New Revision: 1060427

URL: http://svn.apache.org/viewvc?rev=1060427&view=rev
Log:
Fixed test.

Modified:
    
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/MailAttachmentTest.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/MailDefaultDelayForMailConsumeTest.java
    
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java

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=1060427&r1=1060426&r2=1060427&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
 Tue Jan 18 15:56:18 2011
@@ -22,6 +22,7 @@ import org.apache.camel.builder.RouteBui
 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 allowing end users to set additional mail.xxx properties.
@@ -30,6 +31,9 @@ public class AdditionalMailPropertiesTes
 
     @Test
     public void testAdditionalMailProperties() throws Exception {
+        // clear mailbox
+        Mailbox.clearAll();
+
         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"));
@@ -37,6 +41,9 @@ public class AdditionalMailPropertiesTes
 
     @Test
     public void testConsumeWithAdditionalProperties() throws Exception {
+        // clear mailbox
+        Mailbox.clearAll();
+
         MockEndpoint mock = getMockEndpoint("mock:result");
 
         template.sendBodyAndHeader("smtp://james@localhost", "Hello james how 
are you?", "subject", "Hello");

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=1060427&r1=1060426&r2=1060427&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
 Tue Jan 18 15:56:18 2011
@@ -29,6 +29,7 @@ import org.apache.camel.builder.RouteBui
 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 Camel attachments and Mail attachments.
@@ -37,6 +38,9 @@ public class MailAttachmentTest extends 
 
     @Test
     public void testSendAndRecieveMailWithAttachments() throws Exception {
+        // clear mailbox
+        Mailbox.clearAll();
+
         // START SNIPPET: e1
 
         // create an exchange with a normal body and attachment to be produced 
as email

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=1060427&r1=1060426&r2=1060427&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
 Tue Jan 18 15:56:18 2011
@@ -28,6 +28,7 @@ import org.apache.camel.builder.RouteBui
 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 Camel attachments and Mail attachments.
@@ -36,6 +37,9 @@ public class MailContentTypeResolverTest
 
     @Test
     public void testCustomContentTypeResolver() throws Exception {
+        // clear mailbox
+        Mailbox.clearAll();
+
         // create an exchange with a normal body and attachment to be produced 
as email
         Endpoint endpoint = 
context.getEndpoint("smtp://[email protected]?password=secret");
 

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=1060427&r1=1060426&r2=1060427&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
 Tue Jan 18 15:56:18 2011
@@ -21,6 +21,7 @@ import org.apache.camel.component.mock.M
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.camel.util.StopWatch;
 import org.junit.Test;
+import org.jvnet.mock_javamail.Mailbox;
 
 /**
  * Unit test for testing mail polling is happening according to the default 
poll interval.
@@ -29,6 +30,9 @@ public class MailDefaultDelayForMailCons
 
     @Test
     public void testConsuming() throws Exception {
+        // clear mailbox
+        Mailbox.clearAll();
+
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedBodiesReceived("Hello London");
 

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=1060427&r1=1060426&r2=1060427&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
 Tue Jan 18 15:56:18 2011
@@ -29,6 +29,7 @@ import org.apache.camel.builder.RouteBui
 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 Camel html attachments and Mail attachments.
@@ -37,6 +38,9 @@ public class MailHtmlAttachmentTest exte
 
     @Test
     public void testSendAndRecieveMailWithAttachments() throws Exception {
+        // clear mailbox
+        Mailbox.clearAll();
+
         // START SNIPPET: e1
 
         // create an exchange with a normal body and attachment to be produced 
as email


Reply via email to