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 2010/05/18 07:57:20 UTC
svn commit: r945507 - in /camel/trunk/components:
camel-mail/src/test/java/org/apache/camel/component/mail/
camel-mina/src/test/data/
camel-mina/src/test/java/org/apache/camel/component/mina/
Author: davsclaus
Date: Tue May 18 05:57:20 2010
New Revision: 945507
URL: http://svn.apache.org/viewvc?rev=945507&view=rev
Log:
Fixed tests
Modified:
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
camel/trunk/components/camel-mina/src/test/data/message1.txt
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java?rev=945507&r1=945506&r2=945507&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java Tue May 18 05:57:20 2010
@@ -40,14 +40,30 @@ public class MailShutdownCompleteAllTask
prepareMailbox();
}
+ @Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
@Test
public void testShutdownCompleteAllTasks() throws Exception {
// give it 20 seconds to shutdown
context.getShutdownStrategy().setTimeout(20);
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("pop3://jones@localhost?password=secret").routeId("route1")
+ // let it complete all tasks during shutdown
+ .shutdownRunningTask(ShutdownRunningTask.CompleteAllTasks)
+ .delay(1000).to("seda:foo");
+
+ from("seda:foo").routeId("route2").to("mock:bar");
+ }
+ });
+ context.start();
MockEndpoint bar = getMockEndpoint("mock:bar");
- bar.expectedMinimumMessageCount(1);
- bar.setResultWaitTime(3000);
+ bar.expectedMinimumMessageCount(2);
assertMockEndpointsSatisfied();
@@ -68,7 +84,7 @@ public class MailShutdownCompleteAllTask
folder.open(Folder.READ_WRITE);
folder.expunge();
- // inserts 8 new messages
+ // inserts 5 new messages
Message[] messages = new Message[5];
for (int i = 0; i < 5; i++) {
messages[i] = new MimeMessage(sender.getSession());
@@ -78,18 +94,4 @@ public class MailShutdownCompleteAllTask
folder.close(true);
}
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret").routeId("route1")
- // let it complete all tasks during shutdown
- .shutdownRunningTask(ShutdownRunningTask.CompleteAllTasks)
- .delay(1000).to("seda:foo");
-
- from("seda:foo").routeId("route2").to("mock:bar");
- }
- };
- }
-
-
}
\ No newline at end of file
Modified: camel/trunk/components/camel-mina/src/test/data/message1.txt
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/data/message1.txt?rev=945507&r1=945506&r2=945507&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/test/data/message1.txt (original)
+++ camel/trunk/components/camel-mina/src/test/data/message1.txt Tue May 18 05:57:20 2010
@@ -1 +1 @@
-Hello World
+Hello World
\ No newline at end of file
Modified: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java?rev=945507&r1=945506&r2=945507&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java (original)
+++ camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java Tue May 18 05:57:20 2010
@@ -40,7 +40,7 @@ public class MinaFileTcpTest extends Con
from("mina:tcp://localhost:9123?sync=false&textline=true")
.to("mock:results");
- from("file:src/test/data?noop=true").
+ from("file:src/test/data?noop=true&fileName=message1.txt").
to("mina:tcp://localhost:9123?sync=false&textline=true");
}
};