Author: ningjiang
Date: Wed Feb 4 05:26:16 2009
New Revision: 740613
URL: http://svn.apache.org/viewvc?rev=740613&view=rev
Log:
CAMEL-1313 refactoring the camel-ftp unit tests
Modified:
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpFilterTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileFilterTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByExpressionTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByIgnoreCaseExpressionTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByNestedExpressionTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSorterTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDirectoriesNotMatchedTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExcludeNameTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExpressionTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentRefTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMultipleDirectoriesTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerSkipDotFilesTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerUsingFTPClientConfigTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerWithNoFileOptionTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerBuildDirectoryTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerBuildPartOfDirectoryTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempPrefixTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
Modified:
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
(original)
+++
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
Wed Feb 4 05:26:16 2009
@@ -209,7 +209,7 @@
private boolean buildDirectoryChunks(String dirName) throws IOException,
SftpException {
final StringBuilder sb = new StringBuilder(dirName.length());
- final String[] dirs = dirName.split("\\/");
+ final String[] dirs = dirName.split("\\/|\\\\");
boolean success = false;
for (String dir : dirs) {
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
Wed Feb 4 05:26:16 2009
@@ -67,9 +67,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://ad...@localhost:"; + getPort() +
"/incoming/?password=admin&binary=true"
- + "&consumer.delay=2000&recursive=false";*/
+ // test that we can pool and store as a local file
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo.jpeg"));
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpFilterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpFilterTest.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpFilterTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpFilterTest.java
Wed Feb 4 05:26:16 2009
@@ -19,7 +19,6 @@
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.file.GenericFileFilter;
-import org.apache.camel.component.file.NewFileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
@@ -42,9 +41,8 @@
public void testFilterFiles() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(0);
-
- template.sendBodyAndHeader(getFtpUrl(), "This is a file to be
filtered",
- NewFileComponent.HEADER_FILE_NAME, "skipme.txt");
+
+ sendFile(getFtpUrl(), "This is a file to be filtered", "skipme.txt");
mock.setResultWaitTime(3000);
mock.assertIsSatisfied();
@@ -55,11 +53,9 @@
mock.expectedMessageCount(1);
mock.expectedBodiesReceived("Hello World");
- template.sendBodyAndHeader(getFtpUrl(), "This is a file to be
filtered",
- NewFileComponent.HEADER_FILE_NAME, "skipme.txt");
+ sendFile(getFtpUrl(), "This is a file to be filtered", "skipme.txt");
- template.sendBodyAndHeader(getFtpUrl(), "Hello World",
- NewFileComponent.HEADER_FILE_NAME, "hello.txt");
+ sendFile(getFtpUrl(), "Hello World", "hello.txt");
mock.assertIsSatisfied();
}
@@ -75,7 +71,7 @@
// START SNIPPET: e1
public class MyFileFilter implements GenericFileFilter {
public boolean accept(GenericFile file) {
- // we dont accept any files starting with skip in the name
+ // we don't accept any files starting with skip in the name
return !file.getFileName().startsWith("skip");
}
}
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileFilterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileFilterTest.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileFilterTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileFilterTest.java
Wed Feb 4 05:26:16 2009
@@ -17,7 +17,6 @@
package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.file.GenericFileFilter;
import org.apache.camel.component.mock.MockEndpoint;
@@ -54,12 +53,11 @@
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
- //String ftpUrl = "ftp://ad...@localhost:"; + getPort() +
"/filefilter/?password=admin";
- template.sendBodyAndHeader(getFtpUrl(), "Hello World",
NewFileComponent.HEADER_FILE_NAME, "hello.txt");
- template.sendBodyAndHeader(getFtpUrl(), "Report 1",
NewFileComponent.HEADER_FILE_NAME, "report1.txt");
- template.sendBodyAndHeader(getFtpUrl(), "Bye World",
NewFileComponent.HEADER_FILE_NAME, "bye.txt");
- template.sendBodyAndHeader(getFtpUrl(), "Report 2",
NewFileComponent.HEADER_FILE_NAME, "report2.txt");
+ // test that we can pool
+ sendFile(getFtpUrl(), "Hello World", "hello.txt");
+ sendFile(getFtpUrl(), "Report 1", "report1.txt");
+ sendFile(getFtpUrl(), "Bye World", "bye.txt");
+ sendFile(getFtpUrl(), "Report 2", "report2.txt");
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByExpressionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByExpressionTest.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByExpressionTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByExpressionTest.java
Wed Feb 4 05:26:16 2009
@@ -17,7 +17,6 @@
package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -72,11 +71,10 @@
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
- //String ftpUrl = "ftp://ad...@localhost:"; + getPort() +
"/sortby/?password=admin";
- template.sendBodyAndHeader(getFtpUrl(), "Hello Paris",
NewFileComponent.HEADER_FILE_NAME, "paris.dat");
- template.sendBodyAndHeader(getFtpUrl(), "Hello London",
NewFileComponent.HEADER_FILE_NAME, "london.txt");
- template.sendBodyAndHeader(getFtpUrl(), "Hello Copenhagen",
NewFileComponent.HEADER_FILE_NAME, "copenhagen.xml");
+ // test that we can pool
+ sendFile(getFtpUrl(), "Hello Paris", "paris.dat");
+ sendFile(getFtpUrl(), "Hello London", "london.txt");
+ sendFile(getFtpUrl(), "Hello Copenhagen", "copenhagen.xml");
}
}
\ No newline at end of file
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByIgnoreCaseExpressionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByIgnoreCaseExpressionTest.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByIgnoreCaseExpressionTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByIgnoreCaseExpressionTest.java
Wed Feb 4 05:26:16 2009
@@ -17,7 +17,6 @@
package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -87,11 +86,10 @@
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
- String ftpUrl = "ftp://ad...@localhost:"; + getPort() +
"/sortbyignore/?password=admin";
- template.sendBodyAndHeader(getFtpUrl(), "Hello Paris",
NewFileComponent.HEADER_FILE_NAME, "report-3.dat");
- template.sendBodyAndHeader(getFtpUrl(), "Hello London",
NewFileComponent.HEADER_FILE_NAME, "REPORT-2.txt");
- template.sendBodyAndHeader(getFtpUrl(), "Hello Copenhagen",
NewFileComponent.HEADER_FILE_NAME, "Report-1.xml");
+ // test that we can pool
+ sendFile(getFtpUrl(), "Hello Paris", "report-3.dat");
+ sendFile(getFtpUrl(), "Hello London", "REPORT-2.txt");
+ sendFile(getFtpUrl(), "Hello Copenhagen", "Report-1.xml");
}
}
\ No newline at end of file
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByNestedExpressionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByNestedExpressionTest.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByNestedExpressionTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByNestedExpressionTest.java
Wed Feb 4 05:26:16 2009
@@ -21,7 +21,7 @@
import org.apache.camel.component.mock.MockEndpoint;
/**
- * Unit test to verify remotefile sortby option.
+ * Unit test to verify remotefile sort by option.
*/
public class FromFtpRemoteFileSortByNestedExpressionTest extends
FtpServerTestSupport {
@@ -72,12 +72,11 @@
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
- String ftpUrl = "ftp://ad...@localhost:"; + getPort() +
"/sortbynested/?password=admin";
- template.sendBodyAndHeader(getFtpUrl(), "Hello Paris",
NewFileComponent.HEADER_FILE_NAME, "paris.txt");
- template.sendBodyAndHeader(getFtpUrl(), "Hello London",
NewFileComponent.HEADER_FILE_NAME, "london.txt");
- template.sendBodyAndHeader(getFtpUrl(), "Hello Copenhagen",
NewFileComponent.HEADER_FILE_NAME, "copenhagen.xml");
- template.sendBodyAndHeader(getFtpUrl(), "Hello Dublin",
NewFileComponent.HEADER_FILE_NAME, "dublin.txt");
+ // test that we can pool
+ sendFile(getFtpUrl(), "Hello Paris", "paris.txt");
+ sendFile(getFtpUrl(), "Hello London", "london.txt");
+ sendFile(getFtpUrl(), "Hello Copenhagen", "copenhagen.xml");
+ sendFile(getFtpUrl(), "Hello Dublin", "dublin.txt");
}
}
\ No newline at end of file
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSorterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSorterTest.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSorterTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSorterTest.java
Wed Feb 4 05:26:16 2009
@@ -19,7 +19,6 @@
import java.util.Comparator;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
@@ -54,11 +53,10 @@
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
- String ftpUrl = "ftp://ad...@localhost:"; + getPort() +
"/sorter/?password=admin";
- template.sendBodyAndHeader(getFtpUrl(), "Hello Paris",
NewFileComponent.HEADER_FILE_NAME, "paris.txt");
- template.sendBodyAndHeader(getFtpUrl(), "Hello London",
NewFileComponent.HEADER_FILE_NAME, "london.txt");
- template.sendBodyAndHeader(getFtpUrl(), "Hello Copenhagen",
NewFileComponent.HEADER_FILE_NAME, "copenhagen.txt");
+ // test that we can pool
+ sendFile(getFtpUrl(), "Hello Paris", "paris.txt");
+ sendFile(getFtpUrl(), "Hello London", "london.txt");
+ sendFile(getFtpUrl(), "Hello Copenhagen", "copenhagen.txt");
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDirectoriesNotMatchedTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDirectoriesNotMatchedTest.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDirectoriesNotMatchedTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDirectoriesNotMatchedTest.java
Wed Feb 4 05:26:16 2009
@@ -17,7 +17,6 @@
package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -45,17 +44,12 @@
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
- //String ftpUrl = "ftp://ad...@localhost:"; + getPort() +
"/dirnotmatched";
- template.sendBodyAndHeader(getFtpUrl() + "/?password=admin", "This is
a dot file",
- NewFileComponent.HEADER_FILE_NAME, ".skipme");
- template.sendBodyAndHeader(getFtpUrl() + "/?password=admin", "This is
a web file",
- NewFileComponent.HEADER_FILE_NAME, "index.html");
- template.sendBodyAndHeader(getFtpUrl() + "/?password=admin", "This is
a readme file",
- NewFileComponent.HEADER_FILE_NAME, "readme.txt");
- template.sendBodyAndHeader(getFtpUrl() + "/2007/?password=admin",
"2007 report",
- NewFileComponent.HEADER_FILE_NAME, "report2007.txt");
- template.sendBodyAndHeader(getFtpUrl() + "/2008/?password=admin",
"2008 report",
- NewFileComponent.HEADER_FILE_NAME, "report2008.txt");
+
+ sendFile(getFtpUrl() + "/?password=admin", "This is a dot file",
".skipme");
+ sendFile(getFtpUrl() + "/?password=admin", "This is a web file",
"index.html");
+ sendFile(getFtpUrl() + "/?password=admin", "This is a readme file",
"readme.txt");
+ sendFile(getFtpUrl() + "/2007/?password=admin", "2007 report",
"report2007.txt");
+ sendFile(getFtpUrl() + "/2008/?password=admin", "2008 report",
"report2008.txt");
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified:
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/FtpConsumerExcludeNameTest.java?rev=740613&r1=740612&r2=740613&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/FtpConsumerExcludeNameTest.java
Wed Feb 4 05:26:16 2009
@@ -17,7 +17,6 @@
package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -45,12 +44,11 @@
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
- // String ftpUrl = "ftp://ad...@localhost:"; + getPort() +
"/excludename/?password=admin";
- template.sendBodyAndHeader(getFtpUrl(), "Hello World",
NewFileComponent.HEADER_FILE_NAME, "hello.xml");
- template.sendBodyAndHeader(getFtpUrl(), "Reports",
NewFileComponent.HEADER_FILE_NAME, "report1.txt");
- template.sendBodyAndHeader(getFtpUrl(), "Bye World",
NewFileComponent.HEADER_FILE_NAME, "secret.txt");
- template.sendBodyAndHeader(getFtpUrl(), "Reports",
NewFileComponent.HEADER_FILE_NAME, "report2.txt");
+ // 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");
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExpressionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExpressionTest.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExpressionTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExpressionTest.java
Wed Feb 4 05:26:16 2009
@@ -21,7 +21,6 @@
import java.util.Date;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
@@ -53,7 +52,7 @@
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Reports");
- template.sendBodyAndHeader(getFtpUrl(), "Reports",
NewFileComponent.HEADER_FILE_NAME, "report2.txt");
+ sendFile(getFtpUrl(), "Reports", "report2.txt");
assertMockEndpointsSatisfied();
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentRefTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentRefTest.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentRefTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentRefTest.java
Wed Feb 4 05:26:16 2009
@@ -17,7 +17,6 @@
package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.spi.IdempotentRepository;
@@ -57,7 +56,7 @@
mock.expectedBodiesReceived("Hello World");
mock.expectedMessageCount(1);
- template.sendBodyAndHeader(getFtpUrl(), "Hello World",
NewFileComponent.HEADER_FILE_NAME, "report.txt");
+ sendFile(getFtpUrl(), "Hello World", "report.txt");
assertMockEndpointsSatisfied();
@@ -68,7 +67,7 @@
mock.expectedMessageCount(0);
// move file back
- template.sendBodyAndHeader(getFtpUrl(), "Hello World",
NewFileComponent.HEADER_FILE_NAME, "report.txt");
+ sendFile(getFtpUrl(), "Hello World", "report.txt");
// should NOT consume the file again, let 2 secs pass to let the
consumer try to consume it but it should not
Thread.sleep(2000);
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentTest.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentTest.java
Wed Feb 4 05:26:16 2009
@@ -17,7 +17,6 @@
package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -51,7 +50,7 @@
mock.expectedBodiesReceived("Hello World");
mock.expectedMessageCount(1);
- template.sendBodyAndHeader(getFtpUrl(), "Hello World",
NewFileComponent.HEADER_FILE_NAME, "report.txt");
+ sendFile(getFtpUrl(), "Hello World", "report.txt");
assertMockEndpointsSatisfied();
@@ -62,7 +61,7 @@
mock.expectedMessageCount(0);
// move file back
- template.sendBodyAndHeader(getFtpUrl(), "Hello World",
NewFileComponent.HEADER_FILE_NAME, "report.txt");
+ sendFile(getFtpUrl(), "Hello World", "report.txt");
// should NOT consume the file again, let 2 secs pass to let the
consumer try to consume it but it should not
Thread.sleep(2000);
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMultipleDirectoriesTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMultipleDirectoriesTest.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMultipleDirectoriesTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMultipleDirectoriesTest.java
Wed Feb 4 05:26:16 2009
@@ -17,7 +17,6 @@
package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -37,9 +36,9 @@
}
private void prepareFtpServer() throws Exception {
- template.sendBodyAndHeader(getFtpUrl(), "Bye World",
NewFileComponent.HEADER_FILE_NAME, "bye.txt");
- template.sendBodyAndHeader(getFtpUrl(), "Hello World",
NewFileComponent.HEADER_FILE_NAME, "sub/hello.txt");
- template.sendBodyAndHeader(getFtpUrl(), "Godday World",
NewFileComponent.HEADER_FILE_NAME, "sub/sub2/godday.txt");
+ sendFile(getFtpUrl(), "Bye World", "bye.txt");
+ sendFile(getFtpUrl(), "Hello World", "sub/hello.txt");
+ sendFile(getFtpUrl(), "Godday World", "sub/sub2/godday.txt");
}
public void testMultiDir() throws Exception {
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerSkipDotFilesTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerSkipDotFilesTest.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerSkipDotFilesTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerSkipDotFilesTest.java
Wed Feb 4 05:26:16 2009
@@ -17,7 +17,6 @@
package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -44,12 +43,11 @@
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
- String ftpUrl = "ftp://ad...@localhost:"; + getPort() +
"/dotfiles/?password=admin";
- template.sendBodyAndHeader(getFtpUrl(), "Hello World",
NewFileComponent.HEADER_FILE_NAME, ".skipme");
- template.sendBodyAndHeader(getFtpUrl(), "Reports",
NewFileComponent.HEADER_FILE_NAME, "report1.txt");
- template.sendBodyAndHeader(getFtpUrl(), "Bye World",
NewFileComponent.HEADER_FILE_NAME, ".camel");
- template.sendBodyAndHeader(getFtpUrl(), "Reports",
NewFileComponent.HEADER_FILE_NAME, "report2.txt");
+ // test that we can pool and store as a local file
+ sendFile(getFtpUrl(), "Hello World", ".skipme");
+ sendFile(getFtpUrl(), "Reports", "report1.txt");
+ sendFile(getFtpUrl(), "Bye World", ".camel");
+ sendFile(getFtpUrl(), "Reports", "report2.txt");
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerUsingFTPClientConfigTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerUsingFTPClientConfigTest.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerUsingFTPClientConfigTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerUsingFTPClientConfigTest.java
Wed Feb 4 05:26:16 2009
@@ -17,7 +17,6 @@
package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
import org.apache.commons.net.ftp.FTPClientConfig;
@@ -61,7 +60,7 @@
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
- template.sendBodyAndHeader(getFtpUrl(), "Hello World",
NewFileComponent.HEADER_FILE_NAME, "hello.txt");
+ sendFile(getFtpUrl(), "Hello World", "hello.txt");
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerWithNoFileOptionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerWithNoFileOptionTest.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerWithNoFileOptionTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerWithNoFileOptionTest.java
Wed Feb 4 05:26:16 2009
@@ -17,8 +17,6 @@
package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
-import org.apache.camel.component.file.NewFileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -41,7 +39,7 @@
}
private void prepareFtpServer() throws Exception {
- template.sendBodyAndHeader(getFtpUrl(), "Hello World",
NewFileComponent.HEADER_FILE_NAME, "hello.txt");
+ sendFile(getFtpUrl(), "Hello World", "hello.txt");
}
public void testWithNoFileInOption() throws Exception {
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerBuildDirectoryTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerBuildDirectoryTest.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerBuildDirectoryTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerBuildDirectoryTest.java
Wed Feb 4 05:26:16 2009
@@ -18,7 +18,6 @@
import java.io.File;
-import org.apache.camel.component.file.NewFileComponent;
import org.apache.camel.converter.IOConverter;
/**
@@ -33,7 +32,7 @@
public void testProduceAndBuildFullRemotFolderTest() throws Exception {
deleteDirectory(FTP_ROOT_DIR + "");
- template.sendBodyAndHeader(getFtpUrl(), "Hello World",
NewFileComponent.HEADER_FILE_NAME, "claus.txt");
+ sendFile(getFtpUrl(), "Hello World", "claus.txt");
File file = new File(FTP_ROOT_DIR + "upload/user/claus/claus.txt");
file = file.getAbsoluteFile();
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerBuildPartOfDirectoryTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerBuildPartOfDirectoryTest.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerBuildPartOfDirectoryTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerBuildPartOfDirectoryTest.java
Wed Feb 4 05:26:16 2009
@@ -18,7 +18,6 @@
import java.io.File;
-import org.apache.camel.component.file.NewFileComponent;
import org.apache.camel.converter.IOConverter;
/**
@@ -34,7 +33,7 @@
deleteDirectory(FTP_ROOT_DIR + "");
createDirectory(FTP_ROOT_DIR + "upload/user/superman");
- template.sendBodyAndHeader(getFtpUrl(), "Bye World",
NewFileComponent.HEADER_FILE_NAME, "claus.txt");
+ sendFile(getFtpUrl(), "Bye World", "claus.txt");
File file = new File(FTP_ROOT_DIR + "upload/user/claus/claus.txt");
file = file.getAbsoluteFile();
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java
Wed Feb 4 05:26:16 2009
@@ -22,7 +22,6 @@
import java.util.Date;
import java.util.GregorianCalendar;
-import org.apache.camel.component.file.NewFileComponent;
import org.apache.camel.impl.JndiRegistry;
/**
@@ -56,14 +55,14 @@
}
public void testProduceBeanByHeader() throws Exception {
- template.sendBodyAndHeader(getFtpUrl(), "Hello World",
NewFileComponent.HEADER_FILE_NAME, "${bean:myguidgenerator}.bak");
+ sendFile(getFtpUrl(), "Hello World", "${bean:myguidgenerator}.bak");
Thread.sleep(500);
assertFileExists(FTP_ROOT_DIR + "filelanguage/123.bak");
}
public void testProducerDateByHeader() throws Exception {
- template.sendBodyAndHeader(getFtpUrl(), "Hello World",
NewFileComponent.HEADER_FILE_NAME, "myfile-${date:now:yyyyMMdd}.txt");
+ sendFile(getFtpUrl(), "Hello World",
"myfile-${date:now:yyyyMMdd}.txt");
Thread.sleep(500);
String date = new SimpleDateFormat("yyyyMMdd").format(new Date());
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempPrefixTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempPrefixTest.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempPrefixTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempPrefixTest.java
Wed Feb 4 05:26:16 2009
@@ -33,7 +33,7 @@
public void testProduceTempPrefixTest() throws Exception {
deleteDirectory(FTP_ROOT_DIR + "");
- template.sendBodyAndHeader(getFtpUrl(), "Hello World",
NewFileComponent.HEADER_FILE_NAME, "claus.txt");
+ sendFile(getFtpUrl(), "Hello World", "claus.txt");
File file = new File(FTP_ROOT_DIR + "upload/user/claus/claus.txt");
file = file.getAbsoluteFile();
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java?rev=740613&r1=740612&r2=740613&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
Wed Feb 4 05:26:16 2009
@@ -21,6 +21,7 @@
import java.util.Random;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.component.file.NewFileComponent;
import org.apache.camel.converter.IOConverter;
import org.apache.ftpserver.FtpServer;
import org.apache.ftpserver.FtpServerFactory;
@@ -105,4 +106,9 @@
fos.close();
}
}
+
+ public void sendFile(String url, Object body, String fileName) {
+ template.sendBodyAndHeader(url, body,
+ NewFileComponent.HEADER_FILE_NAME,
fileName);
+ }
}
