Author: davsclaus
Date: Tue Dec 1 11:00:12 2009
New Revision: 885729
URL: http://svn.apache.org/viewvc?rev=885729&view=rev
Log:
Added ftp polling consumer unit test. Fixed a test on slower boxes.
Added:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollingConsumerTest.java
- copied, changed from r885675,
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExcludeNameTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelStreamingTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java?rev=885729&r1=885728&r2=885729&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
Tue Dec 1 11:00:12 2009
@@ -36,6 +36,7 @@
import org.apache.camel.NoSuchPropertyException;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.TypeConverter;
+import org.apache.camel.impl.DefaultUnitOfWork;
import org.apache.camel.spi.UnitOfWork;
/**
@@ -63,6 +64,20 @@
}
/**
+ * Done the given {...@link Exchange} which allows {...@link
org.apache.camel.spi.UnitOfWork}
+ * to done.
+ *
+ * @param exchange the given exchange
+ */
+ public static void done(Exchange exchange) {
+ if (exchange.getUnitOfWork() == null) {
+ UnitOfWork uow = new DefaultUnitOfWork(exchange);
+ exchange.setUnitOfWork(uow);
+ }
+ exchange.getUnitOfWork().done(exchange);
+ }
+
+ /**
* Attempts to resolve the endpoint for the given value
*
* @param exchange the message exchange being processed
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelStreamingTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelStreamingTest.java?rev=885729&r1=885728&r2=885729&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelStreamingTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelStreamingTest.java
Tue Dec 1 11:00:12 2009
@@ -39,7 +39,7 @@
public void testMulticastParallel() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMessageCount(20);
+ mock.expectedMessageCount(10);
mock.whenAnyExchangeReceived(new Processor() {
public void process(Exchange exchange) throws Exception {
// they should all be BA as B is faster than A
@@ -47,7 +47,7 @@
}
});
- for (int i = 0; i < 20; i++) {
+ for (int i = 0; i < 10; i++) {
template.sendBody("direct:start", "Hello");
}
@@ -76,7 +76,7 @@
.end()
.to("mock:result");
- from("direct:a").delay(100).setBody(constant("A"));
+ from("direct:a").delay(500).setBody(constant("A"));
from("direct:b").setBody(constant("B"));
}
Copied:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollingConsumerTest.java
(from r885675,
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExcludeNameTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollingConsumerTest.java?p2=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollingConsumerTest.java&p1=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExcludeNameTest.java&r1=885675&r2=885729&rev=885729&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExcludeNameTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollingConsumerTest.java
Tue Dec 1 11:00:12 2009
@@ -16,51 +16,70 @@
*/
package org.apache.camel.component.file.remote;
-import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.Exchange;
+import org.apache.camel.PollingConsumer;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.DefaultUnitOfWork;
+import org.apache.camel.spi.UnitOfWork;
+import org.apache.camel.util.ExchangeHelper;
import org.junit.Before;
import org.junit.Test;
/**
* Unit test that ftp consumer will exclude pre and postfixes
*/
-public class FtpConsumerExcludeNameTest extends FtpServerTestSupport {
+public class FtpPollingConsumerTest extends FtpServerTestSupport {
private String getFtpUrl() {
- return "ftp://ad...@localhost:" + getPort() +
"/excludename?password=admin"
- + "&exclude=secret.*|.*xml";
+ return "ftp://ad...@localhost:" + getPort() +
"/polling?password=admin&move=done";
}
@Override
@Before
public void setUp() throws Exception {
+ deleteDirectory(FTP_ROOT_DIR + "polling");
super.setUp();
prepareFtpServer();
}
@Test
- public void testExludePreAndPostfixes() throws Exception {
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMessageCount(2);
- mock.expectedBodiesReceived("Reports", "Reports");
- mock.assertIsSatisfied();
- }
+ public void testPollingConsumer() throws Exception {
+ MockEndpoint result = getMockEndpoint("mock:result");
+ result.expectedBodiesReceivedInAnyOrder("Message 1", "Message 2",
"Message 3", "Message 4", "Message 5");
+ result.expectedFileExists(FTP_ROOT_DIR + "polling/done/1.txt");
+ result.expectedFileExists(FTP_ROOT_DIR + "polling/done/2.txt");
+ result.expectedFileExists(FTP_ROOT_DIR + "polling/done/3.txt");
+ result.expectedFileExists(FTP_ROOT_DIR + "polling/done/4.txt");
+ result.expectedFileExists(FTP_ROOT_DIR + "polling/done/5.txt");
+
+ PollingConsumer consumer =
context.getEndpoint(getFtpUrl()).createPollingConsumer();
+ consumer.start();
+
+ boolean done = false;
+ while (!done) {
+ Exchange exchange = consumer.receive(2000);
+ if (exchange == null) {
+ done = true;
+ break;
+ }
- private void prepareFtpServer() throws Exception {
- // prepares the FTP Server by creating files on the server that we
want to unit
- // test that we can pool and store as a local file
- sendFile(getFtpUrl(), "Hello World", "hello.xml");
- sendFile(getFtpUrl(), "Reports", "report1.txt");
- sendFile(getFtpUrl(), "Bye World", "secret.txt");
- sendFile(getFtpUrl(), "Reports", "report2.txt");
+ String body = exchange.getIn().getBody(String.class);
+ template.sendBody("mock:result", body);
+
+ // must done to move the files
+ ExchangeHelper.done(exchange);
+ }
+ consumer.stop();
+
+ assertMockEndpointsSatisfied();
}
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- public void configure() throws Exception {
- from(getFtpUrl()).to("mock:result");
- }
- };
+ private void prepareFtpServer() throws Exception {
+ sendFile(getFtpUrl(), "Message 1", "1.txt");
+ sendFile(getFtpUrl(), "Message 2", "2.txt");
+ sendFile(getFtpUrl(), "Message 3", "3.txt");
+ sendFile(getFtpUrl(), "Message 4", "4.txt");
+ sendFile(getFtpUrl(), "Message 5", "5.txt");
}
-}
+}
\ No newline at end of file