Author: davsclaus
Date: Mon Aug 18 21:20:46 2008
New Revision: 686956
URL: http://svn.apache.org/viewvc?rev=686956&view=rev
Log:
CAMEL-834: Added unit test to try to verifty if there is a bug
Added:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
(contents, props changed)
- copied, changed from r686819,
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java
Modified:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
Copied:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
(from r686819,
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java)
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java?p2=activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java&p1=activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java&r1=686819&r2=686956&rev=686956&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java
(original)
+++
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
Mon Aug 18 21:20:46 2008
@@ -27,14 +27,16 @@
import org.apache.camel.converter.IOConverter;
/**
- * Unit test to verify that we can pool a BINARY file from the FTP Server and
store it on a local file path
+ * Unit test to verify that we can pool a BINARY file in a directory from the
+ * FTP Server and store it on a local file path. Based on CAMEL-834.
*/
-public class FromFtpToBinaryFilesTest extends FtpServerTestSupport {
+public class FromFtpDirectoryToBinaryFilesTest extends FtpServerTestSupport {
- private int port = 20015;
+ private int port = 20034;
+
+ private String ftpUrl = "ftp://[EMAIL PROTECTED]:" + port +
"/incoming/?password=admin&directory=true"
+ +
"&binary=true&consumer.useFixedDelay=false&consumer.setNames=true&consumer.recursive=false";
// must user "consumer." prefix on the parameters to the file component
- private String ftpUrl = "ftp://[EMAIL PROTECTED]:" + port +
"/incoming?password=admin&binary=true"
- + "&consumer.delay=2000&consumer.recursive=true&consumer.append=false";
public void testFtpRoute() throws Exception {
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
@@ -48,7 +50,7 @@
Thread.sleep(1000);
// assert the file
- File file = new File("target/ftptest/a/logo1.jpeg");
+ File file = new File("target/ftptest/logo1.jpeg");
assertTrue("The binary file should exists", file.exists());
assertTrue("Logo size wrong", file.length() > 10000);
@@ -56,7 +58,7 @@
file = new File("target/ftptest/logo.jpeg");
assertTrue(" The binary file should exists", file.exists());
assertTrue("Logo size wrong", file.length() > 10000);
-
+
// let some time pass to let the consumer etc. properly do its
business before closing
Thread.sleep(1000);
}
@@ -74,7 +76,7 @@
private void prepareFtpServer() throws Exception {
// prepares the FTP Server by creating a file on the server that we
want to unit
// test that we can pool and store as a local file
- String ftpUrl = "ftp://[EMAIL PROTECTED]:" + port +
"/incoming?password=admin&binary=true"
+ String ftpUrl = "ftp://[EMAIL PROTECTED]:" + port +
"/incoming/?password=admin&binary=true"
+
"&consumer.delay=2000&consumer.recursive=false&consumer.append=false";
Endpoint endpoint = context.getEndpoint(ftpUrl);
Exchange exchange = endpoint.createExchange();
@@ -84,8 +86,7 @@
producer.start();
producer.process(exchange);
producer.stop();
- ftpUrl = "ftp://[EMAIL PROTECTED]:" + port +
"/incoming/a?password=admin&binary=true"
- +
"&consumer.delay=2000&consumer.recursive=false&consumer.append=false";
+
endpoint = context.getEndpoint(ftpUrl);
exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo1.jpeg"));
@@ -95,7 +96,7 @@
producer.process(exchange);
producer.stop();
}
-
+
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
@@ -105,4 +106,4 @@
};
}
-}
+}
\ No newline at end of file
Propchange:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java?rev=686956&r1=686955&r2=686956&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
(original)
+++
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
Mon Aug 18 21:20:46 2008
@@ -18,7 +18,6 @@
import org.apache.camel.ContextTestSupport;
import org.apache.ftpserver.FtpServer;
-import org.apache.ftpserver.interfaces.FtpServerContext;
/**
* Base class for unit testing using a FTPServer
