svn commit: r744031 - in /camel/trunk: components/camel-mail/src/main/java/org/apache/camel/component/mail/ tests/camel-itest/src/test/java/org/apache/camel/itest/mail/ tests/camel-itest/src/test/resources/org/apache/camel/itest/mail/

[davsclaus]

Author: davsclaus
Date: Fri Feb 13 08:38:38 2009
New Revision: 744031

URL: http://svn.apache.org/viewvc?rev=744031&view=rev
Log:
Trying to fix failed unit test

Modified:
    
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
    
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/mail/SpringMailEndpointTest.java
    
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/mail/SpringMailEndpointTest-context.xml

Modified: 
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java?rev=744031&r1=744030&r2=744031&view=diff
==============================================================================
--- 
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
 (original)
+++ 
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
 Fri Feb 13 08:38:38 2009
@@ -113,7 +113,7 @@
                 if (folder.isOpen()) {
                     folder.close(true);
                 }
-            } catch (MessagingException e) {
+            } catch (Exception e) {
                 // some mail servers will lock the folder so we ignore in this 
case (CAMEL-1263)
                 LOG.debug("Could not close mailbox folder: " + 
folder.getName(), e);
             }

Modified: 
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/mail/SpringMailEndpointTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/mail/SpringMailEndpointTest.java?rev=744031&r1=744030&r2=744031&view=diff
==============================================================================
--- 
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/mail/SpringMailEndpointTest.java
 (original)
+++ 
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/mail/SpringMailEndpointTest.java
 Fri Feb 13 08:38:38 2009
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.itest.mail;
 
-import org.apache.camel.Endpoint;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -33,8 +32,6 @@
 
     @Autowired
     protected ProducerTemplate template;
-    @EndpointInject(name = "myMailEndpoint")
-    protected Endpoint inputFTP;
     @EndpointInject(uri = "mock:result")
     protected MockEndpoint result;
 
@@ -43,9 +40,8 @@
 
         String body = "Hello Claus.\nYes it does.\n\nRegards James.";
 
-        result.expectedMessageCount(1);
-        result.expectedHeaderReceived("subject", "Hello Camel");
         result.expectedBodiesReceived(body);
+        result.expectedHeaderReceived("subject", "Hello Camel");
 
         template.sendBodyAndHeader("smtp://jam...@localhost", body, "subject", 
"Hello Camel");
 

Modified: 
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/mail/SpringMailEndpointTest-context.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/mail/SpringMailEndpointTest-context.xml?rev=744031&r1=744030&r2=744031&view=diff
==============================================================================
--- 
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/mail/SpringMailEndpointTest-context.xml
 (original)
+++ 
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/mail/SpringMailEndpointTest-context.xml
 Fri Feb 13 08:38:38 2009
@@ -25,6 +25,11 @@
     <bean id="myMailEndpoint" 
class="org.apache.camel.component.mail.MailEndpoint">
         <property name="camelContext" ref="camel"/>
         <property name="configuration" ref="mailConfig"/>
+        <property name="consumerProperties">
+            <map key-type="java.lang.String">
+                <entry key="delay" value="1000"/>
+            </map>
+        </property>
     </bean>
 
     <bean id="mailConfig" 
class="org.apache.camel.component.mail.MailConfiguration">
@@ -33,6 +38,7 @@
         <property name="username" value="james2"/>
         <property name="password" value="james2"/>
         <property name="protocol" value="pop3"/>
+        <property name="processOnlyUnseenMessages" value="false"/>
     </bean>
 
     <!-- START SNIPPET: example -->