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 2009/01/20 09:42:44 UTC
svn commit: r735968 [1/2] - in /camel/trunk/components/camel-ftp/src:
main/java/org/apache/camel/component/file/remote/
test/java/org/apache/camel/component/file/remote/
Author: davsclaus
Date: Tue Jan 20 00:42:43 2009
New Revision: 735968
URL: http://svn.apache.org/viewvc?rev=735968&view=rev
Log:
Fixed unit tests failing on other platforms.
Modified:
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDeleteFileTest.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/FromFtpExclusiveReadNoneStrategyTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadRenameStrategyTest.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/FromFtpMoveFilePostfixTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoFilesTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPollFileOnlyTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFileExpressionTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRegexPatternTest.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/FromFtpSetNamesWithMultiDirectoriesTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileNoBodyConversionTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFileTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToFileNoFileNameHeaderTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToMockTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromQueueThenConsumeFtpToMockTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerBodyAsStringTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDeleteNoWritePermissionTest.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/FtpLoginTest.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/RemoteFileConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java Tue Jan 20 00:42:43 2009
@@ -53,7 +53,7 @@
* Returns human readable server information for logging purpose
*/
public String remoteServerInformation() {
- return protocol + "://" + (username != null ? username : "anonymous") + "@" + host + ":" + port;
+ return protocol + "://" + (username != null ? username : "anonymous") + "@" + host + ":" + getPort();
}
public void configure(URI uri) {
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpTest.java Tue Jan 20 00:42:43 2009
@@ -24,8 +24,9 @@
*/
public class FromFileToFtpTest extends FtpServerTestSupport {
- private int port = 20011;
- private String ftpUrl = "ftp://admin@localhost:" + port + "/tmp2/camel?password=admin&consumer.initialDelay=5000";
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=5000";
+ }
public void testFromFileToFtp() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -34,16 +35,12 @@
assertMockEndpointsSatisfied();
}
- public int getPort() {
- return port;
- }
-
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("file:src/main/data?noop=true&consumer.delay=5000").to(ftpUrl);
+ from("file:src/main/data?noop=true&consumer.delay=5000").to(getFtpUrl());
- from(ftpUrl).to("mock:result");
+ from(getFtpUrl()).to("mock:result");
}
};
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDeleteFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDeleteFileTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDeleteFileTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDeleteFileTest.java Tue Jan 20 00:42:43 2009
@@ -30,11 +30,8 @@
*/
public class FromFtpDeleteFileTest extends FtpServerTestSupport {
- private int port = 20022;
- private String ftpUrl = "ftp://admin@localhost:" + port + "/deletefile?password=admin&binary=false&delete=true";
-
- public int getPort() {
- return port;
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/deletefile?password=admin&binary=false&delete=true";
}
@Override
@@ -46,7 +43,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
- Endpoint endpoint = context.getEndpoint(ftpUrl);
+ Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World this file will be deleted");
exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
@@ -65,7 +62,7 @@
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
mock.expectedBodiesReceived("Hello World this file will be deleted");
-
+
mock.assertIsSatisfied();
Thread.sleep(500);
@@ -79,7 +76,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(ftpUrl).to("mock:result");
+ from(getFtpUrl()).to("mock:result");
}
};
}
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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009
@@ -32,10 +32,16 @@
*/
public class FromFtpDirectoryToBinaryFilesTest extends FtpServerTestSupport {
- private int port = 20034;
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/incoming/?password=admin&directory=true"
+ + "&binary=true&consumer.useFixedDelay=false&setNames=true&recursive=false&consumer.delay=5000";
+ }
- private String ftpUrl = "ftp://admin@localhost:" + port + "/incoming/?password=admin&directory=true"
- + "&binary=true&consumer.useFixedDelay=false&setNames=true&recursive=false&consumer.delay=5000";
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ prepareFtpServer();
+ }
public void testFtpRoute() throws Exception {
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
@@ -59,22 +65,12 @@
assertTrue("Logo size wrong", file.length() > 10000);
}
- public int getPort() {
- return port;
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- prepareFtpServer();
- }
-
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://admin@localhost:" + port + "/incoming/?password=admin&binary=true"
- + "&consumer.delay=2000&recursive=false";
- Endpoint endpoint = context.getEndpoint(ftpUrl);
+ String ftpUrl = "ftp://admin@localhost:" + getPort() + "/incoming/?password=admin&binary=true"
+ + "&consumer.delay=2000&recursive=false";
+ Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo.jpeg"));
exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo.jpeg");
@@ -83,7 +79,7 @@
producer.process(exchange);
producer.stop();
- endpoint = context.getEndpoint(ftpUrl);
+ endpoint = context.getEndpoint(getFtpUrl());
exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo1.jpeg"));
exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo1.jpeg");
@@ -97,7 +93,7 @@
return new RouteBuilder() {
public void configure() throws Exception {
String fileUrl = "file:target/ftptest/?noop=true";
- from(ftpUrl).to(fileUrl, "mock:result");
+ from(getFtpUrl()).to(fileUrl, "mock:result");
}
};
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadNoneStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadNoneStrategyTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadNoneStrategyTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadNoneStrategyTest.java Tue Jan 20 00:42:43 2009
@@ -34,12 +34,9 @@
private static final Log LOG = LogFactory.getLog(FromFtpExclusiveReadRenameStrategyTest.class);
- private int port = 20027;
- private String ftpUrl = "ftp://admin@localhost:" + port + "/slowfile?password=admin"
- + "&readLock=none&consumer.delay=500";
-
- public int getPort() {
- return port;
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/slowfile?password=admin"
+ + "&readLock=none&consumer.delay=500";
}
@Override
@@ -53,7 +50,7 @@
@Override
public void configure() throws Exception {
from("seda:start").process(new MySlowFileProcessor());
- from(ftpUrl).to("mock:result");
+ from(getFtpUrl()).to("mock:result");
}
});
context.start();
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadRenameStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadRenameStrategyTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadRenameStrategyTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadRenameStrategyTest.java Tue Jan 20 00:42:43 2009
@@ -34,11 +34,8 @@
private static final Log LOG = LogFactory.getLog(FromFtpExclusiveReadRenameStrategyTest.class);
private static final boolean ON_WINDOWS = System.getProperty("os.name").startsWith("Windows");
- private int port = 20090;
- private String ftpUrl = "ftp://admin@localhost:" + port + "/slowfile?password=admin&readLock=rename&consumer.delay=500";
-
- public int getPort() {
- return port;
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/slowfile?password=admin&readLock=rename&consumer.delay=500";
}
@Override
@@ -56,7 +53,7 @@
@Override
public void configure() throws Exception {
from("seda:start").process(new MySlowFileProcessor());
- from(ftpUrl).to("mock:result");
+ from(getFtpUrl()).to("mock:result");
}
});
context.start();
@@ -84,7 +81,7 @@
@Override
public void configure() throws Exception {
from("seda:start").process(new MySlowFileProcessor());
- from(ftpUrl + "&readLockTimeout=1000").to("mock:result");
+ from(getFtpUrl() + "&readLockTimeout=1000").to("mock:result");
}
});
context.start();
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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009
@@ -26,11 +26,8 @@
*/
public class FromFtpFilterTest extends FtpServerTestSupport {
- private int port = 20077;
- private String ftpUrl = "ftp://admin@localhost:" + port + "/filter?password=admin&binary=false&filter=#myFilter";
-
- public int getPort() {
- return port;
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/filter?password=admin&binary=false&filter=#myFilter";
}
@Override
@@ -44,7 +41,7 @@
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(0);
- template.sendBodyAndHeader(ftpUrl, "This is a file to be filtered",
+ template.sendBodyAndHeader(getFtpUrl(), "This is a file to be filtered",
FileComponent.HEADER_FILE_NAME, "skipme.txt");
mock.setResultWaitTime(3000);
@@ -56,10 +53,10 @@
mock.expectedMessageCount(1);
mock.expectedBodiesReceived("Hello World");
- template.sendBodyAndHeader(ftpUrl, "This is a file to be filtered",
+ template.sendBodyAndHeader(getFtpUrl(), "This is a file to be filtered",
FileComponent.HEADER_FILE_NAME, "skipme.txt");
- template.sendBodyAndHeader(ftpUrl, "Hello World",
+ template.sendBodyAndHeader(getFtpUrl(), "Hello World",
FileComponent.HEADER_FILE_NAME, "hello.txt");
mock.assertIsSatisfied();
@@ -68,7 +65,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(ftpUrl).to("mock:result");
+ from(getFtpUrl()).to("mock:result");
}
};
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixTest.java Tue Jan 20 00:42:43 2009
@@ -30,12 +30,9 @@
*/
public class FromFtpMoveFilePostfixTest extends FtpServerTestSupport {
- private int port = 20031;
- private String ftpUrl = "ftp://admin@localhost:" + port + "/movefile?password=admin&binary=false"
- + "&moveNamePostfix=.old&consumer.delay=5000";
-
- public int getPort() {
- return port;
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false"
+ + "&moveNamePostfix=.old&consumer.delay=5000";
}
@Override
@@ -48,7 +45,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
- Endpoint endpoint = context.getEndpoint(ftpUrl);
+ Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World this file will be moved");
exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
@@ -82,7 +79,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(ftpUrl).to("mock:result");
+ from(getFtpUrl()).to("mock:result");
}
};
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixTest.java Tue Jan 20 00:42:43 2009
@@ -30,12 +30,9 @@
*/
public class FromFtpMoveFilePrefixTest extends FtpServerTestSupport {
- private int port = 20030;
- private String ftpUrl = "ftp://admin@localhost:" + port + "/movefile?password=admin&binary=false&consumer.delay=5000"
- + "&moveNamePrefix=done/";
-
- public int getPort() {
- return port;
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false&consumer.delay=5000"
+ + "&moveNamePrefix=done/";
}
@Override
@@ -48,7 +45,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
- Endpoint endpoint = context.getEndpoint(ftpUrl);
+ Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World this file will be moved");
exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
@@ -82,7 +79,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(ftpUrl).to("mock:result");
+ from(getFtpUrl()).to("mock:result");
}
};
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileTest.java Tue Jan 20 00:42:43 2009
@@ -30,12 +30,9 @@
*/
public class FromFtpMoveFileTest extends FtpServerTestSupport {
- private int port = 20032;
- private String ftpUrl = "ftp://admin@localhost:" + port + "/movefile?password=admin&binary=false"
- + "&moveNamePrefix=done/sub2/&moveNamePostfix=.old&consumer.delay=5000";
-
- public int getPort() {
- return port;
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false"
+ + "&moveNamePrefix=done/sub2/&moveNamePostfix=.old&consumer.delay=5000";
}
@Override
@@ -48,7 +45,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
- Endpoint endpoint = context.getEndpoint(ftpUrl);
+ Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World this file will be moved");
exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
@@ -82,7 +79,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(ftpUrl).to("mock:result");
+ from(getFtpUrl()).to("mock:result");
}
};
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoFilesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoFilesTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoFilesTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoFilesTest.java Tue Jan 20 00:42:43 2009
@@ -23,11 +23,9 @@
* Unit test to verify polling a server with no files to poll.
*/
public class FromFtpNoFilesTest extends FtpServerTestSupport {
- private int port = 20020;
- private String ftpUrl = "ftp://admin@localhost:" + port + "/slowfile?password=admin&binary=false&readLock=rename&consumer.delay=2000";
- public int getPort() {
- return port;
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/slowfile?password=admin&binary=false&readLock=rename&consumer.delay=2000";
}
public void testPoolIn3SecondsButNoFiles() throws Exception {
@@ -44,7 +42,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(ftpUrl).to("mock:result");
+ from(getFtpUrl()).to("mock:result");
}
};
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java Tue Jan 20 00:42:43 2009
@@ -30,11 +30,8 @@
*/
public class FromFtpNoopTest extends FtpServerTestSupport {
- private int port = 20066;
- private String ftpUrl = "ftp://admin@localhost:" + port + "/noop?password=admin&binary=false&noop=true";
-
- public int getPort() {
- return port;
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/noop?password=admin&binary=false&noop=true";
}
@Override
@@ -46,7 +43,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
- Endpoint endpoint = context.getEndpoint(ftpUrl);
+ Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World");
exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
@@ -60,7 +57,7 @@
MockEndpoint mock = getMockEndpoint("mock:result");
// we should not be able to poll the file more than once since its noop and idempotent
mock.expectedMessageCount(1);
-
+
mock.assertIsSatisfied();
// assert the file is still there
@@ -72,7 +69,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(ftpUrl).to("mock:result");
+ from(getFtpUrl()).to("mock:result");
}
};
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java Tue Jan 20 00:42:43 2009
@@ -27,11 +27,9 @@
* @version $Revision$
*/
public class FromFtpPassiveModeTest extends FtpServerTestSupport {
- protected int port = 2434;
- protected String ftpUrl = "ftp://admin@localhost:" + port + "/passive/?password=admin&passiveMode=true";
- public int getPort() {
- return port;
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/passive/?password=admin&passiveMode=true";
}
@Override
@@ -43,7 +41,7 @@
private void prepareFtpServer() throws Exception {
// prepares the FTP Server by creating a file on the server
- Endpoint endpoint = context.getEndpoint(ftpUrl);
+ Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World");
exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
@@ -56,7 +54,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(ftpUrl).to("mock:result");
+ from(getFtpUrl()).to("mock:result");
}
};
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPollFileOnlyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPollFileOnlyTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPollFileOnlyTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPollFileOnlyTest.java Tue Jan 20 00:42:43 2009
@@ -28,8 +28,9 @@
*/
public class FromFtpPollFileOnlyTest extends FtpServerTestSupport {
- private int port = 20028;
- private String ftpUrl = "ftp://admin@localhost:" + port + "/fileonly/report.txt?password=admin&directory=false";
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/fileonly/report.txt?password=admin&directory=false";
+ }
public void testPollFileOnly() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -38,10 +39,6 @@
mock.assertIsSatisfied();
}
- public int getPort() {
- return port;
- }
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -51,7 +48,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
- Endpoint endpoint = context.getEndpoint("ftp://admin@localhost:" + port + "/fileonly/?password=admin&binary=false");
+ Endpoint endpoint = context.getEndpoint("ftp://admin@localhost:" + getPort() + "/fileonly/?password=admin&binary=false");
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World from FTPServer");
exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "report.txt");
@@ -64,7 +61,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(ftpUrl).to("mock:result");
+ from(getFtpUrl()).to("mock:result");
}
};
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFileExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFileExpressionTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFileExpressionTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFileExpressionTest.java Tue Jan 20 00:42:43 2009
@@ -31,12 +31,9 @@
*/
public class FromFtpPreMoveFileExpressionTest extends FtpServerTestSupport {
- private int port = 20030;
- private String ftpUrl = "ftp://admin@localhost:" + port + "/movefile?password=admin&binary=false&consumer.delay=5000"
- + "&preMoveExpression=../inprogress/${file:name.noext}.bak";
-
- public int getPort() {
- return port;
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false&consumer.delay=5000"
+ + "&preMoveExpression=../inprogress/${file:name.noext}.bak";
}
@Override
@@ -49,7 +46,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
- Endpoint endpoint = context.getEndpoint(ftpUrl);
+ Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World this file will be moved");
exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
@@ -75,7 +72,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(ftpUrl).process(new Processor() {
+ from(getFtpUrl()).process(new Processor() {
public void process(Exchange exchange) throws Exception {
// assert the file is pre moved
File file = new File("./res/home/inprogress/hello.bak");
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixTest.java Tue Jan 20 00:42:43 2009
@@ -30,12 +30,9 @@
*/
public class FromFtpPreMoveFilePostfixTest extends FtpServerTestSupport {
- private int port = 20031;
- private String ftpUrl = "ftp://admin@localhost:" + port + "/movefile?password=admin&binary=false"
- + "&preMoveNamePostfix=.old";
-
- public int getPort() {
- return port;
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false"
+ + "&preMoveNamePostfix=.old";
}
@Override
@@ -48,7 +45,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
- Endpoint endpoint = context.getEndpoint(ftpUrl);
+ Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World this file will be moved");
exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
@@ -79,7 +76,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(ftpUrl).to("mock:result");
+ from(getFtpUrl()).to("mock:result");
}
};
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixTest.java Tue Jan 20 00:42:43 2009
@@ -30,12 +30,9 @@
*/
public class FromFtpPreMoveFilePrefixTest extends FtpServerTestSupport {
- private int port = 20030;
- private String ftpUrl = "ftp://admin@localhost:" + port + "/movefile?password=admin&binary=false&consumer.delay=5000"
- + "&preMoveNamePrefix=done/";
-
- public int getPort() {
- return port;
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false&consumer.delay=5000"
+ + "&preMoveNamePrefix=done/";
}
@Override
@@ -48,7 +45,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
- Endpoint endpoint = context.getEndpoint(ftpUrl);
+ Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World this file will be moved");
exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
@@ -79,7 +76,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(ftpUrl).to("mock:result");
+ from(getFtpUrl()).to("mock:result");
}
};
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRegexPatternTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRegexPatternTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRegexPatternTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRegexPatternTest.java Tue Jan 20 00:42:43 2009
@@ -25,9 +25,9 @@
*/
public class FromFtpRegexPatternTest extends FtpServerTestSupport {
- private int port = 20097;
-
- private String ftpUrl = "ftp://admin@localhost:" + port + "/regexp?password=admin®exPattern=report.*";
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/regexp?password=admin®exPattern=report.*";
+ }
public void testFtpRegexPattern() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -36,10 +36,6 @@
mock.assertIsSatisfied();
}
- public int getPort() {
- return port;
- }
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -49,17 +45,17 @@
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://admin@localhost:" + port + "/regexp/?password=admin";
- template.sendBodyAndHeader(ftpUrl, "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt");
- template.sendBodyAndHeader(ftpUrl, "Reports", FileComponent.HEADER_FILE_NAME, "report1.txt");
- template.sendBodyAndHeader(ftpUrl, "Bye World", FileComponent.HEADER_FILE_NAME, "bye.txt");
- template.sendBodyAndHeader(ftpUrl, "Reports", FileComponent.HEADER_FILE_NAME, "report2.txt");
+ String ftpUrl = "ftp://admin@localhost:" + getPort() + "/regexp/?password=admin";
+ template.sendBodyAndHeader(getFtpUrl(), "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader(getFtpUrl(), "Reports", FileComponent.HEADER_FILE_NAME, "report1.txt");
+ template.sendBodyAndHeader(getFtpUrl(), "Bye World", FileComponent.HEADER_FILE_NAME, "bye.txt");
+ template.sendBodyAndHeader(getFtpUrl(), "Reports", FileComponent.HEADER_FILE_NAME, "report2.txt");
}
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(ftpUrl).to("mock:result");
+ from(getFtpUrl()).to("mock:result");
}
};
}
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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009
@@ -26,9 +26,9 @@
*/
public class FromFtpRemoteFileFilterTest extends FtpServerTestSupport {
- private int port = 20096;
-
- private String ftpUrl = "ftp://admin@localhost:" + port + "/filefilter?password=admin&filter=#myFilter";
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/filefilter?password=admin&filter=#myFilter";
+ }
@Override
protected JndiRegistry createRegistry() throws Exception {
@@ -44,10 +44,6 @@
mock.assertIsSatisfied();
}
- public int getPort() {
- return port;
- }
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -57,17 +53,17 @@
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://admin@localhost:" + port + "/filefilter/?password=admin";
- template.sendBodyAndHeader(ftpUrl, "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt");
- template.sendBodyAndHeader(ftpUrl, "Report 1", FileComponent.HEADER_FILE_NAME, "report1.txt");
- template.sendBodyAndHeader(ftpUrl, "Bye World", FileComponent.HEADER_FILE_NAME, "bye.txt");
- template.sendBodyAndHeader(ftpUrl, "Report 2", FileComponent.HEADER_FILE_NAME, "report2.txt");
+ String ftpUrl = "ftp://admin@localhost:" + getPort() + "/filefilter/?password=admin";
+ template.sendBodyAndHeader(getFtpUrl(), "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader(getFtpUrl(), "Report 1", FileComponent.HEADER_FILE_NAME, "report1.txt");
+ template.sendBodyAndHeader(getFtpUrl(), "Bye World", FileComponent.HEADER_FILE_NAME, "bye.txt");
+ template.sendBodyAndHeader(getFtpUrl(), "Report 2", FileComponent.HEADER_FILE_NAME, "report2.txt");
}
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(ftpUrl).to("mock:result");
+ from(getFtpUrl()).to("mock:result");
}
};
}
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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009
@@ -25,12 +25,8 @@
*/
public class FromFtpRemoteFileSortByExpressionTest extends FtpServerTestSupport {
- private int port = 20094;
-
- private String ftpUrl = "ftp://admin@localhost:" + port + "/sortby?password=admin&consumer.delay=5000";
-
- public int getPort() {
- return port;
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/sortby?password=admin&consumer.delay=5000";
}
@Override
@@ -48,7 +44,7 @@
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from(ftpUrl + "&sortBy=file:name.ext").to("mock:result");
+ from(getFtpUrl() + "&sortBy=file:name.ext").to("mock:result");
}
});
context.start();
@@ -63,7 +59,7 @@
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from(ftpUrl + "&sortBy=reverse:file:name.ext").to("mock:reverse");
+ from(getFtpUrl() + "&sortBy=reverse:file:name.ext").to("mock:reverse");
}
});
context.start();
@@ -77,10 +73,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://admin@localhost:" + port + "/sortby/?password=admin";
- template.sendBodyAndHeader(ftpUrl, "Hello Paris", FileComponent.HEADER_FILE_NAME, "paris.dat");
- template.sendBodyAndHeader(ftpUrl, "Hello London", FileComponent.HEADER_FILE_NAME, "london.txt");
- template.sendBodyAndHeader(ftpUrl, "Hello Copenhagen", FileComponent.HEADER_FILE_NAME, "copenhagen.xml");
+ String ftpUrl = "ftp://admin@localhost:" + getPort() + "/sortby/?password=admin";
+ template.sendBodyAndHeader(getFtpUrl(), "Hello Paris", FileComponent.HEADER_FILE_NAME, "paris.dat");
+ template.sendBodyAndHeader(getFtpUrl(), "Hello London", FileComponent.HEADER_FILE_NAME, "london.txt");
+ template.sendBodyAndHeader(getFtpUrl(), "Hello Copenhagen", FileComponent.HEADER_FILE_NAME, "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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009
@@ -25,12 +25,8 @@
*/
public class FromFtpRemoteFileSortByIgnoreCaseExpressionTest extends FtpServerTestSupport {
- private int port = 20093;
-
- private String ftpUrl = "ftp://admin@localhost:" + port + "/sortbyignore?password=admin&consumer.delay=5000";
-
- public int getPort() {
- return port;
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/sortbyignore?password=admin&consumer.delay=5000";
}
@Override
@@ -48,7 +44,7 @@
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from(ftpUrl + "&sortBy=file:name").to("mock:result");
+ from(getFtpUrl() + "&sortBy=file:name").to("mock:result");
}
});
context.start();
@@ -63,7 +59,7 @@
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from(ftpUrl + "&sortBy=ignoreCase:file:name").to("mock:nocase");
+ from(getFtpUrl() + "&sortBy=ignoreCase:file:name").to("mock:nocase");
}
});
context.start();
@@ -78,7 +74,7 @@
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from(ftpUrl + "&sortBy=reverse:ignoreCase:file:name").to("mock:nocasereverse");
+ from(getFtpUrl() + "&sortBy=reverse:ignoreCase:file:name").to("mock:nocasereverse");
}
});
context.start();
@@ -92,10 +88,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://admin@localhost:" + port + "/sortbyignore/?password=admin";
- template.sendBodyAndHeader(ftpUrl, "Hello Paris", FileComponent.HEADER_FILE_NAME, "report-3.dat");
- template.sendBodyAndHeader(ftpUrl, "Hello London", FileComponent.HEADER_FILE_NAME, "REPORT-2.txt");
- template.sendBodyAndHeader(ftpUrl, "Hello Copenhagen", FileComponent.HEADER_FILE_NAME, "Report-1.xml");
+ String ftpUrl = "ftp://admin@localhost:" + getPort() + "/sortbyignore/?password=admin";
+ template.sendBodyAndHeader(getFtpUrl(), "Hello Paris", FileComponent.HEADER_FILE_NAME, "report-3.dat");
+ template.sendBodyAndHeader(getFtpUrl(), "Hello London", FileComponent.HEADER_FILE_NAME, "REPORT-2.txt");
+ template.sendBodyAndHeader(getFtpUrl(), "Hello Copenhagen", FileComponent.HEADER_FILE_NAME, "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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009
@@ -25,12 +25,8 @@
*/
public class FromFtpRemoteFileSortByNestedExpressionTest extends FtpServerTestSupport {
- private int port = 20092;
-
- private String ftpUrl = "ftp://admin@localhost:" + port + "/sortbynested?password=admin&consumer.delay=5000";
-
- public int getPort() {
- return port;
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/sortbynested?password=admin&consumer.delay=5000";
}
@Override
@@ -48,7 +44,7 @@
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from(ftpUrl + "&sortBy=file:name.ext;file:name").to("mock:result");
+ from(getFtpUrl() + "&sortBy=file:name.ext;file:name").to("mock:result");
}
});
context.start();
@@ -63,7 +59,7 @@
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from(ftpUrl + "&sortBy=file:name.ext;reverse:file:name").to("mock:reverse");
+ from(getFtpUrl() + "&sortBy=file:name.ext;reverse:file:name").to("mock:reverse");
}
});
context.start();
@@ -77,11 +73,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://admin@localhost:" + port + "/sortbynested/?password=admin";
- template.sendBodyAndHeader(ftpUrl, "Hello Paris", FileComponent.HEADER_FILE_NAME, "paris.txt");
- template.sendBodyAndHeader(ftpUrl, "Hello London", FileComponent.HEADER_FILE_NAME, "london.txt");
- template.sendBodyAndHeader(ftpUrl, "Hello Copenhagen", FileComponent.HEADER_FILE_NAME, "copenhagen.xml");
- template.sendBodyAndHeader(ftpUrl, "Hello Dublin", FileComponent.HEADER_FILE_NAME, "dublin.txt");
+ String ftpUrl = "ftp://admin@localhost:" + getPort() + "/sortbynested/?password=admin";
+ template.sendBodyAndHeader(getFtpUrl(), "Hello Paris", FileComponent.HEADER_FILE_NAME, "paris.txt");
+ template.sendBodyAndHeader(getFtpUrl(), "Hello London", FileComponent.HEADER_FILE_NAME, "london.txt");
+ template.sendBodyAndHeader(getFtpUrl(), "Hello Copenhagen", FileComponent.HEADER_FILE_NAME, "copenhagen.xml");
+ template.sendBodyAndHeader(getFtpUrl(), "Hello Dublin", FileComponent.HEADER_FILE_NAME, "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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009
@@ -28,9 +28,9 @@
*/
public class FromFtpRemoteFileSorterTest extends FtpServerTestSupport {
- private int port = 20095;
-
- private String ftpUrl = "ftp://admin@localhost:" + port + "/sorter?password=admin&sorter=#mySorter";
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/sorter?password=admin&sorter=#mySorter";
+ }
@Override
protected JndiRegistry createRegistry() throws Exception {
@@ -46,10 +46,6 @@
mock.assertIsSatisfied();
}
- public int getPort() {
- return port;
- }
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -59,16 +55,16 @@
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://admin@localhost:" + port + "/sorter/?password=admin";
- template.sendBodyAndHeader(ftpUrl, "Hello Paris", FileComponent.HEADER_FILE_NAME, "paris.txt");
- template.sendBodyAndHeader(ftpUrl, "Hello London", FileComponent.HEADER_FILE_NAME, "london.txt");
- template.sendBodyAndHeader(ftpUrl, "Hello Copenhagen", FileComponent.HEADER_FILE_NAME, "copenhagen.txt");
+ String ftpUrl = "ftp://admin@localhost:" + getPort() + "/sorter/?password=admin";
+ template.sendBodyAndHeader(getFtpUrl(), "Hello Paris", FileComponent.HEADER_FILE_NAME, "paris.txt");
+ template.sendBodyAndHeader(getFtpUrl(), "Hello London", FileComponent.HEADER_FILE_NAME, "london.txt");
+ template.sendBodyAndHeader(getFtpUrl(), "Hello Copenhagen", FileComponent.HEADER_FILE_NAME, "copenhagen.txt");
}
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(ftpUrl).to("mock:result");
+ from(getFtpUrl()).to("mock:result");
}
};
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java Tue Jan 20 00:42:43 2009
@@ -32,11 +32,17 @@
*/
public class FromFtpSetNamesWithMultiDirectoriesTest extends FtpServerTestSupport {
- private int port = 20016;
-
// must user "consumer." prefix on the parameters to the file component
- private String ftpUrl = "ftp://admin@localhost:" + port + "/incoming?password=admin&binary=true"
- + "&consumer.delay=2000&recursive=true&setNames=true";
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/incoming?password=admin&binary=true"
+ + "&consumer.delay=2000&recursive=true&setNames=true";
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ prepareFtpServer();
+ }
public void testFtpRoute() throws Exception {
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
@@ -63,20 +69,10 @@
Thread.sleep(1000);
}
- public int getPort() {
- return port;
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- prepareFtpServer();
- }
-
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://admin@localhost:" + port + "/incoming/data1/?password=admin&binary=true";
+ String ftpUrl = "ftp://admin@localhost:" + getPort() + "/incoming/data1/?password=admin&binary=true";
Endpoint endpoint = context.getEndpoint(ftpUrl);
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo1.jpeg"));
@@ -86,7 +82,7 @@
producer.process(exchange);
producer.stop();
- ftpUrl = "ftp://admin@localhost:" + port + "/incoming/data2/?password=admin&binary=true";
+ ftpUrl = "ftp://admin@localhost:" + getPort() + "/incoming/data2/?password=admin&binary=true";
endpoint = context.getEndpoint(ftpUrl);
exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo2.png"));
@@ -101,7 +97,7 @@
return new RouteBuilder() {
public void configure() throws Exception {
String fileUrl = "file:target/ftpsetnamestest/?noop=true";
- from(ftpUrl).to(fileUrl, "mock:result");
+ from(getFtpUrl()).to(fileUrl, "mock:result");
}
};
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileNoBodyConversionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileNoBodyConversionTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileNoBodyConversionTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileNoBodyConversionTest.java Tue Jan 20 00:42:43 2009
@@ -29,8 +29,9 @@
*/
public class FromFtpToAsciiFileNoBodyConversionTest extends FtpServerTestSupport {
- private int port = 20012;
- private String ftpUrl = "ftp://admin@localhost:" + port + "/tmp5/camel?password=admin&binary=false";
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/tmp5/camel?password=admin&binary=false";
+ }
public void testFromFtpToAsciiFileNoBodyConversion() throws Exception {
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
@@ -41,10 +42,6 @@
Thread.sleep(1000);
}
- public int getPort() {
- return port;
- }
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -54,7 +51,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
- Endpoint endpoint = context.getEndpoint(ftpUrl);
+ Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello ASCII from FTPServer");
exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "ascii.txt");
@@ -68,7 +65,7 @@
return new RouteBuilder() {
public void configure() throws Exception {
String fileUrl = "file:target/ftptest/?append=false&noop=true";
- from(ftpUrl).to(fileUrl, "mock:result");
+ from(getFtpUrl()).to(fileUrl, "mock:result");
}
};
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileTest.java Tue Jan 20 00:42:43 2009
@@ -30,8 +30,9 @@
*/
public class FromFtpToAsciiFileTest extends FtpServerTestSupport {
- private int port = 20013;
- private String ftpUrl = "ftp://admin@localhost:" + port + "/tmp3/camel?password=admin&binary=false";
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/tmp3/camel?password=admin&binary=false";
+ }
public void testFtpRoute() throws Exception {
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
@@ -51,10 +52,6 @@
Thread.sleep(1000);
}
- public int getPort() {
- return port;
- }
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -64,7 +61,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
- Endpoint endpoint = context.getEndpoint(ftpUrl);
+ Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World from FTPServer");
exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
@@ -78,7 +75,7 @@
return new RouteBuilder() {
public void configure() throws Exception {
String fileUrl = "file:target/ftptest/?append=false&noop=true";
- from(ftpUrl).setHeader(FileComponent.HEADER_FILE_NAME, constant("deleteme.txt")).
+ from(getFtpUrl()).setHeader(FileComponent.HEADER_FILE_NAME, constant("deleteme.txt")).
convertBodyTo(String.class).to(fileUrl).to("mock:result");
}
};
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFileTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFileTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFileTest.java Tue Jan 20 00:42:43 2009
@@ -31,10 +31,18 @@
*/
public class FromFtpToBinaryFileTest extends FtpServerTestSupport {
- private int port = 20014;
// must user "consumer." prefix on the parameters to the file component
- private String ftpUrl = "ftp://admin@localhost:" + port + "/tmp4/camel?password=admin&binary=true"
- + "&consumer.delay=5000&recursive=false";
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/tmp4/camel?password=admin&binary=true"
+ + "&consumer.delay=5000&recursive=false";
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ deleteDirectory("./res/home");
+ prepareFtpServer();
+ }
public void testFtpRoute() throws Exception {
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
@@ -56,21 +64,10 @@
Thread.sleep(1000);
}
- public int getPort() {
- return port;
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- deleteDirectory("./res/home");
- prepareFtpServer();
- }
-
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
- Endpoint endpoint = context.getEndpoint(ftpUrl);
+ Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo.jpeg"));
exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo.jpeg");
@@ -84,8 +81,8 @@
return new RouteBuilder() {
public void configure() throws Exception {
String fileUrl = "file:target/ftptest/?noop=true&append=false";
- from(ftpUrl).setHeader(FileComponent.HEADER_FILE_NAME, constant("deleteme.jpg"))
- .to(fileUrl, "mock:result");
+ from(getFtpUrl()).setHeader(FileComponent.HEADER_FILE_NAME, constant("deleteme.jpg"))
+ .to(fileUrl, "mock:result");
}
};
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java Tue Jan 20 00:42:43 2009
@@ -31,10 +31,17 @@
*/
public class FromFtpToBinaryFilesTest extends FtpServerTestSupport {
- private int port = 20015;
// must user "consumer." prefix on the parameters to the file component
- private String ftpUrl = "ftp://admin@localhost:" + port + "/incoming?password=admin&binary=true"
- + "&consumer.delay=2000&recursive=true";
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/incoming?password=admin&binary=true"
+ + "&consumer.delay=2000&recursive=true";
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ prepareFtpServer();
+ }
public void testFtpRoute() throws Exception {
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
@@ -58,21 +65,11 @@
assertTrue("Logo size wrong", file.length() > 10000);
}
- public int getPort() {
- return port;
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- prepareFtpServer();
- }
-
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://admin@localhost:" + port + "/incoming?password=admin&binary=true"
- + "&consumer.delay=2000&recursive=false";
+ String ftpUrl = "ftp://admin@localhost:" + getPort() + "/incoming?password=admin&binary=true"
+ + "&consumer.delay=2000&recursive=false";
Endpoint endpoint = context.getEndpoint(ftpUrl);
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo.jpeg"));
@@ -82,8 +79,8 @@
producer.process(exchange);
producer.stop();
- ftpUrl = "ftp://admin@localhost:" + port + "/incoming/a?password=admin&binary=true"
- + "&consumer.delay=2000&recursive=false";
+ ftpUrl = "ftp://admin@localhost:" + getPort() + "/incoming/a?password=admin&binary=true"
+ + "&consumer.delay=2000&recursive=false";
endpoint = context.getEndpoint(ftpUrl);
exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo1.jpeg"));
@@ -98,7 +95,7 @@
return new RouteBuilder() {
public void configure() throws Exception {
String fileUrl = "file:target/ftptest/?noop=true";
- from(ftpUrl).to(fileUrl, "mock:result");
+ from(getFtpUrl()).to(fileUrl, "mock:result");
}
};
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToFileNoFileNameHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToFileNoFileNameHeaderTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToFileNoFileNameHeaderTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToFileNoFileNameHeaderTest.java Tue Jan 20 00:42:43 2009
@@ -31,8 +31,15 @@
*/
public class FromFtpToFileNoFileNameHeaderTest extends FtpServerTestSupport {
- private int port = 20017;
- private String ftpUrl = "ftp://admin@localhost:" + port + "/tmp3/camel?password=admin&binary=false";
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/tmp3/camel?password=admin&binary=false";
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ prepareFtpServer();
+ }
public void testCorrectFilename() throws Exception {
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
@@ -52,20 +59,10 @@
Thread.sleep(1000);
}
- public int getPort() {
- return port;
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- prepareFtpServer();
- }
-
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
- Endpoint endpoint = context.getEndpoint(ftpUrl);
+ Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World from FTPServer");
exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
@@ -81,7 +78,7 @@
String fileUrl = "file:target/ftptest/?append=false&noop=true";
// we do not set any filename in the header property so the filename should be the one
// from the FTP server we downloaded
- from(ftpUrl).convertBodyTo(String.class).to(fileUrl).to("mock:result");
+ from(getFtpUrl()).convertBodyTo(String.class).to(fileUrl).to("mock:result");
}
};
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToMockTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToMockTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToMockTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToMockTest.java Tue Jan 20 00:42:43 2009
@@ -25,14 +25,16 @@
public class FromFtpToMockTest extends FtpServerTestSupport {
protected MockEndpoint resultEndpoint;
protected String expectedBody = "Hello there!";
- protected int port = 2001;
- protected String ftpUrl = "ftp://admin@localhost:" + port + "/tmp/camel?password=admin&recursive=true";
+
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/tmp/camel?password=admin&recursive=true";
+ }
public void testFtpRoute() throws Exception {
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
resultEndpoint.expectedBodiesReceived(expectedBody);
- template.sendBodyAndHeader(ftpUrl, expectedBody, "cheese", 123);
+ template.sendBodyAndHeader(getFtpUrl(), expectedBody, "cheese", 123);
resultEndpoint.assertIsSatisfied();
}
@@ -40,13 +42,9 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(ftpUrl).to("mock:result");
+ from(getFtpUrl()).to("mock:result");
}
};
}
- public int getPort() {
- return port;
- }
-
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromQueueThenConsumeFtpToMockTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromQueueThenConsumeFtpToMockTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromQueueThenConsumeFtpToMockTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromQueueThenConsumeFtpToMockTest.java Tue Jan 20 00:42:43 2009
@@ -30,19 +30,18 @@
*/
public class FromQueueThenConsumeFtpToMockTest extends FtpServerTestSupport {
- private int port = 20034;
- private String storeUrl = "ftp://admin@localhost:" + port + "/getme?password=admin&binary=false";
-
// START SNIPPET: e1
// we use directory=false to indicate we only want to consume a single file
// we use delay=5000 to use 5 sec delay between pools to avoid polling a second time before we stop the consumer
// this is because we only want to run a single poll and get the file
// file=getme/ is the path to the folder where the file is
- private String getUrl = "ftp://admin@localhost:" + port + "?password=admin&binary=false&directory=false&consumer.delay=5000&file=getme/";
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "?password=admin&binary=false&directory=false&consumer.delay=5000&file=getme/";
+ }
// END SNIPPET: e1
- public int getPort() {
- return port;
+ private String getStoreUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/getme?password=admin&binary=false";
}
@Override
@@ -55,7 +54,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 once
- Endpoint endpoint = context.getEndpoint(storeUrl);
+ Endpoint endpoint = context.getEndpoint(getStoreUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Bye World");
exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
@@ -84,7 +83,7 @@
String filename = exchange.getIn().getHeader("myfile", String.class);
// construct the total url for the ftp consumer
- String url = getUrl + filename;
+ String url = getFtpUrl() + filename;
// create a ftp endpoint
Endpoint ftp = context.getEndpoint(url);
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerBodyAsStringTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerBodyAsStringTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerBodyAsStringTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerBodyAsStringTest.java Tue Jan 20 00:42:43 2009
@@ -29,11 +29,8 @@
*/
public class FtpConsumerBodyAsStringTest extends FtpServerTestSupport {
- private int port = 20012;
- private String ftpUrl = "ftp://admin@localhost:" + port + "/tmp4/camel?password=admin&consumer.delay=5000";
-
- public int getPort() {
- return port;
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/tmp4/camel?password=admin&consumer.delay=5000";
}
@Override
@@ -45,7 +42,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
- Endpoint endpoint = context.getEndpoint(ftpUrl);
+ Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World");
exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
@@ -66,7 +63,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(ftpUrl).process(new Processor() {
+ from(getFtpUrl()).process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
assertNotNull(body);
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDeleteNoWritePermissionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDeleteNoWritePermissionTest.java?rev=735968&r1=735967&r2=735968&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDeleteNoWritePermissionTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDeleteNoWritePermissionTest.java Tue Jan 20 00:42:43 2009
@@ -25,13 +25,19 @@
*/
public class FtpConsumerDeleteNoWritePermissionTest extends FtpServerTestSupport {
- private int port = 20087;
+ private String getFtpUrl() {
+ return "ftp://dummy@localhost:" + getPort() + "/deletenoperm?password=foo"
+ + "&delete=true&consumer.delay=5000";
+ }
- private String ftpUrl = "ftp://dummy@localhost:" + port + "/deletenoperm?password=foo"
- + "&delete=true&consumer.delay=5000";
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ prepareFtpServer();
+ }
- public void testExludePreAndPostfixes() throws Exception {
- PollingConsumer consumer = context.getEndpoint(ftpUrl).createPollingConsumer();
+ public void testConsumerDeleteNoWritePermission() throws Exception {
+ PollingConsumer consumer = context.getEndpoint(getFtpUrl()).createPollingConsumer();
consumer.start();
Exchange out = consumer.receive(3000);
assertNotNull("Should get the file", out);
@@ -45,20 +51,10 @@
}
}
- public int getPort() {
- return port;
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- prepareFtpServer();
- }
-
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://admin@localhost:" + port + "/deletenoperm/?password=admin";
+ String ftpUrl = "ftp://admin@localhost:" + getPort() + "/deletenoperm/?password=admin";
template.sendBodyAndHeader(ftpUrl, "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt");
}
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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009
@@ -25,19 +25,9 @@
*/
public class FtpConsumerDirectoriesNotMatchedTest extends FtpServerTestSupport {
- private int port = 20055;
-
- private String ftpUrl = "ftp://admin@localhost:" + port + "/dirnotmatched/?password=admin"
- + "&recursive=true®exPattern=.*txt$";
-
- public void testSkipDirectories() throws Exception {
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMessageCount(3);
- mock.assertIsSatisfied();
- }
-
- public int getPort() {
- return port;
+ private String getFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "/dirnotmatched/?password=admin"
+ + "&recursive=true®exPattern=.*txt$";
}
@Override
@@ -46,26 +36,32 @@
prepareFtpServer();
}
+ public void testSkipDirectories() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(3);
+ mock.assertIsSatisfied();
+ }
+
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://admin@localhost:" + port + "/dirnotmatched";
- template.sendBodyAndHeader(ftpUrl + "/?password=admin", "This is a dot file",
+ String ftpUrl = "ftp://admin@localhost:" + getPort() + "/dirnotmatched";
+ template.sendBodyAndHeader(getFtpUrl() + "/?password=admin", "This is a dot file",
FileComponent.HEADER_FILE_NAME, ".skipme");
- template.sendBodyAndHeader(ftpUrl + "/?password=admin", "This is a web file",
+ template.sendBodyAndHeader(getFtpUrl() + "/?password=admin", "This is a web file",
FileComponent.HEADER_FILE_NAME, "index.html");
- template.sendBodyAndHeader(ftpUrl + "/?password=admin", "This is a readme file",
+ template.sendBodyAndHeader(getFtpUrl() + "/?password=admin", "This is a readme file",
FileComponent.HEADER_FILE_NAME, "readme.txt");
- template.sendBodyAndHeader(ftpUrl + "/2007/?password=admin", "2007 report",
+ template.sendBodyAndHeader(getFtpUrl() + "/2007/?password=admin", "2007 report",
FileComponent.HEADER_FILE_NAME, "report2007.txt");
- template.sendBodyAndHeader(ftpUrl + "/2008/?password=admin", "2008 report",
+ template.sendBodyAndHeader(getFtpUrl() + "/2008/?password=admin", "2008 report",
FileComponent.HEADER_FILE_NAME, "report2008.txt");
}
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(ftpUrl).to("mock:result");
+ from(getFtpUrl()).to("mock:result");
}
};
}