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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009 @@ -25,10 +25,16 @@ */ public class FtpConsumerExcludeNameTest extends FtpServerTestSupport { - private int port = 20095; + private String getFtpUrl() { + return "ftp://ad...@localhost:"; + getPort() + "/excludename?password=admin" + + "&excludedNamePrefix=secret&excludedNamePostfix=xml"; + } - private String ftpUrl = "ftp://ad...@localhost:"; + port + "/excludename?password=admin" - + "&excludedNamePrefix=secret&excludedNamePostfix=xml"; + @Override + protected void setUp() throws Exception { + super.setUp(); + prepareFtpServer(); + } public void testExludePreAndPostfixes() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); @@ -37,30 +43,20 @@ mock.assertIsSatisfied(); } - 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://ad...@localhost:"; + port + "/excludename/?password=admin"; - template.sendBodyAndHeader(ftpUrl, "Hello World", FileComponent.HEADER_FILE_NAME, "hello.xml"); - template.sendBodyAndHeader(ftpUrl, "Reports", FileComponent.HEADER_FILE_NAME, "report1.txt"); - template.sendBodyAndHeader(ftpUrl, "Bye World", FileComponent.HEADER_FILE_NAME, "secret.txt"); - template.sendBodyAndHeader(ftpUrl, "Reports", FileComponent.HEADER_FILE_NAME, "report2.txt"); + String ftpUrl = "ftp://ad...@localhost:"; + getPort() + "/excludename/?password=admin"; + template.sendBodyAndHeader(getFtpUrl(), "Hello World", FileComponent.HEADER_FILE_NAME, "hello.xml"); + template.sendBodyAndHeader(getFtpUrl(), "Reports", FileComponent.HEADER_FILE_NAME, "report1.txt"); + template.sendBodyAndHeader(getFtpUrl(), "Bye World", FileComponent.HEADER_FILE_NAME, "secret.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/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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009 @@ -30,14 +30,10 @@ */ public class FtpConsumerExpressionTest extends FtpServerTestSupport { - private int port = 20063; - - private String ftpUrl = "ftp://ad...@localhost:"; + port + "/filelanguage?password=admin&consumer.delay=5000"; - - public int getPort() { - return port; + private String getFtpUrl() { + return "ftp://ad...@localhost:"; + getPort() + "/filelanguage?password=admin&consumer.delay=5000"; } - + @Override protected void setUp() throws Exception { super.setUp(); @@ -57,7 +53,7 @@ MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Reports"); - template.sendBodyAndHeader(ftpUrl, "Reports", FileComponent.HEADER_FILE_NAME, "report2.txt"); + template.sendBodyAndHeader(getFtpUrl(), "Reports", FileComponent.HEADER_FILE_NAME, "report2.txt"); assertMockEndpointsSatisfied(); @@ -74,8 +70,8 @@ protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() throws Exception { - from(ftpUrl + "&expression=backup/${date:now:yyyyMMdd}/${bean:myguidgenerator}" - + "-${file:name.noext}.bak").to("mock:result"); + from(getFtpUrl() + "&expression=backup/${date:now:yyyyMMdd}/${bean:myguidgenerator}" + + "-${file:name.noext}.bak").to("mock:result"); } }; } 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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009 @@ -29,12 +29,9 @@ private static boolean invoked; - private int port = 20078; - private String ftpUrl = "ftp://ad...@localhost:"; + port - + "/idempotent?password=admin&binary=false&idempotent=true&idempotentRepository=#myRepo&delete=true"; - - public int getPort() { - return port; + private String getFtpUrl() { + return "ftp://ad...@localhost:"; + getPort() + + "/idempotent?password=admin&binary=false&idempotent=true&idempotentRepository=#myRepo&delete=true"; } @Override @@ -49,7 +46,7 @@ protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() throws Exception { - from(ftpUrl).to("mock:result"); + from(getFtpUrl()).to("mock:result"); } }; } @@ -60,7 +57,7 @@ mock.expectedBodiesReceived("Hello World"); mock.expectedMessageCount(1); - template.sendBodyAndHeader(ftpUrl, "Hello World", FileComponent.HEADER_FILE_NAME, "report.txt"); + template.sendBodyAndHeader(getFtpUrl(), "Hello World", FileComponent.HEADER_FILE_NAME, "report.txt"); assertMockEndpointsSatisfied(); @@ -71,7 +68,7 @@ mock.expectedMessageCount(0); // move file back - template.sendBodyAndHeader(ftpUrl, "Hello World", FileComponent.HEADER_FILE_NAME, "report.txt"); + template.sendBodyAndHeader(getFtpUrl(), "Hello World", FileComponent.HEADER_FILE_NAME, "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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009 @@ -25,12 +25,9 @@ */ public class FtpConsumerIdempotentTest extends FtpServerTestSupport { - private int port = 20077; - private String ftpUrl = "ftp://ad...@localhost:"; + port - + "/idempotent?password=admin&binary=false&idempotent=true&delete=true"; - - public int getPort() { - return port; + private String getFtpUrl() { + return "ftp://ad...@localhost:"; + getPort() + + "/idempotent?password=admin&binary=false&idempotent=true&delete=true"; } @Override @@ -43,7 +40,7 @@ protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() throws Exception { - from(ftpUrl).to("mock:result"); + from(getFtpUrl()).to("mock:result"); } }; } @@ -54,7 +51,7 @@ mock.expectedBodiesReceived("Hello World"); mock.expectedMessageCount(1); - template.sendBodyAndHeader(ftpUrl, "Hello World", FileComponent.HEADER_FILE_NAME, "report.txt"); + template.sendBodyAndHeader(getFtpUrl(), "Hello World", FileComponent.HEADER_FILE_NAME, "report.txt"); assertMockEndpointsSatisfied(); @@ -65,7 +62,7 @@ mock.expectedMessageCount(0); // move file back - template.sendBodyAndHeader(ftpUrl, "Hello World", FileComponent.HEADER_FILE_NAME, "report.txt"); + template.sendBodyAndHeader(getFtpUrl(), "Hello World", FileComponent.HEADER_FILE_NAME, "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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009 @@ -25,11 +25,8 @@ */ public class FtpConsumerMultipleDirectoriesTest extends FtpServerTestSupport { - private int port = 20044; - private String ftpUrl = "ftp://ad...@localhost:"; + port + "/multidir/?password=admin&recursive=true&consumer.delay=5000&sortBy=file:path"; - - public int getPort() { - return port; + private String getFtpUrl() { + return "ftp://ad...@localhost:"; + getPort() + "/multidir/?password=admin&recursive=true&consumer.delay=5000&sortBy=file:path"; } @Override @@ -40,9 +37,9 @@ } private void prepareFtpServer() throws Exception { - template.sendBodyAndHeader(ftpUrl, "Bye World", FileComponent.HEADER_FILE_NAME, "bye.txt"); - template.sendBodyAndHeader(ftpUrl, "Hello World", FileComponent.HEADER_FILE_NAME, "sub/hello.txt"); - template.sendBodyAndHeader(ftpUrl, "Godday World", FileComponent.HEADER_FILE_NAME, "sub/sub2/godday.txt"); + template.sendBodyAndHeader(getFtpUrl(), "Bye World", FileComponent.HEADER_FILE_NAME, "bye.txt"); + template.sendBodyAndHeader(getFtpUrl(), "Hello World", FileComponent.HEADER_FILE_NAME, "sub/hello.txt"); + template.sendBodyAndHeader(getFtpUrl(), "Godday World", FileComponent.HEADER_FILE_NAME, "sub/sub2/godday.txt"); } public void testMultiDir() throws Exception { @@ -73,7 +70,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/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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009 @@ -25,9 +25,15 @@ */ public class FtpConsumerSkipDotFilesTest extends FtpServerTestSupport { - private int port = 20096; + private String getFtpUrl() { + return "ftp://ad...@localhost:"; + getPort() + "/dotfiles?password=admin"; + } - private String ftpUrl = "ftp://ad...@localhost:"; + port + "/dotfiles?password=admin"; + @Override + protected void setUp() throws Exception { + super.setUp(); + prepareFtpServer(); + } public void testSkipDotFiles() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); @@ -36,30 +42,20 @@ mock.assertIsSatisfied(); } - 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://ad...@localhost:"; + port + "/dotfiles/?password=admin"; - template.sendBodyAndHeader(ftpUrl, "Hello World", FileComponent.HEADER_FILE_NAME, ".skipme"); - template.sendBodyAndHeader(ftpUrl, "Reports", FileComponent.HEADER_FILE_NAME, "report1.txt"); - template.sendBodyAndHeader(ftpUrl, "Bye World", FileComponent.HEADER_FILE_NAME, ".camel"); - template.sendBodyAndHeader(ftpUrl, "Reports", FileComponent.HEADER_FILE_NAME, "report2.txt"); + String ftpUrl = "ftp://ad...@localhost:"; + getPort() + "/dotfiles/?password=admin"; + template.sendBodyAndHeader(getFtpUrl(), "Hello World", FileComponent.HEADER_FILE_NAME, ".skipme"); + template.sendBodyAndHeader(getFtpUrl(), "Reports", FileComponent.HEADER_FILE_NAME, "report1.txt"); + template.sendBodyAndHeader(getFtpUrl(), "Bye World", FileComponent.HEADER_FILE_NAME, ".camel"); + 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/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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009 @@ -23,13 +23,19 @@ import org.apache.commons.net.ftp.FTPClientConfig; /** - * Unit test for ftpClientConfig option. + * Unit test for ftpClientConfig option. */ public class FtpConsumerUsingFTPClientConfigTest extends FtpServerTestSupport { - private int port = 20066; + private String getFtpUrl() { + return "ftp://ad...@localhost:"; + getPort() + "/clientconfig?password=admin&ftpClientConfig=#myConfig"; + } - private String ftpUrl = "ftp://ad...@localhost:"; + port + "/clientconfig?password=admin&ftpClientConfig=#myConfig"; + @Override + protected void setUp() throws Exception { + super.setUp(); + prepareFtpServer(); + } @Override protected JndiRegistry createRegistry() throws Exception { @@ -52,26 +58,16 @@ assertMockEndpointsSatisfied(); } - 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 - template.sendBodyAndHeader(ftpUrl, "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt"); + template.sendBodyAndHeader(getFtpUrl(), "Hello World", FileComponent.HEADER_FILE_NAME, "hello.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/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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009 @@ -27,11 +27,8 @@ */ public class FtpConsumerWithNoFileOptionTest extends FtpServerTestSupport { - private int port = 20045; - private String ftpUrl = "ftp://ad...@localhost:"; + port + "?password=admin&consumer.delay=5000"; - - public int getPort() { - return port; + private String getFtpUrl() { + return "ftp://ad...@localhost:"; + getPort() + "?password=admin&consumer.delay=5000"; } @Override @@ -43,7 +40,7 @@ } private void prepareFtpServer() throws Exception { - template.sendBodyAndHeader(ftpUrl, "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt"); + template.sendBodyAndHeader(getFtpUrl(), "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt"); } public void testWithNoFileInOption() throws Exception { @@ -62,7 +59,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/FtpLoginTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpLoginTest.java?rev=735968&r1=735967&r2=735968&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpLoginTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpLoginTest.java Tue Jan 20 00:42:43 2009 @@ -27,11 +27,8 @@ */ public class FtpLoginTest extends FtpServerTestSupport { - private int port = 20077; - private String ftpUrl = "ftp://du...@localhost:"; + port; - - public int getPort() { - return port; + private String getFtpUrl() { + return "ftp://du...@localhost:"; + getPort(); } @Override @@ -76,12 +73,12 @@ config.setPassword(password); config.setDirectory(true); config.setHost("localhost"); - config.setPort(port); + config.setPort(getPort()); config.setProtocol("ftp"); config.setFile("login"); FtpRemoteFileOperations remoteFileOperations = new FtpRemoteFileOperations(); - RemoteFileEndpoint endpoint = new RemoteFileEndpoint(ftpUrl, component, remoteFileOperations, config); + RemoteFileEndpoint endpoint = new RemoteFileEndpoint(getFtpUrl(), component, remoteFileOperations, config); Exchange exchange = endpoint.createExchange(); exchange.getIn().setBody("Hello World from FTPServer"); 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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009 @@ -26,17 +26,14 @@ */ public class FtpProducerBuildDirectoryTest extends FtpServerTestSupport { - private int port = 20089; - private String ftpUrl = "ftp://ad...@localhost:"; + port + "/upload/user/claus?binary=false&password=admin"; - - public int getPort() { - return port; + private String getFtpUrl() { + return "ftp://ad...@localhost:"; + getPort() + "/upload/user/claus?binary=false&password=admin"; } public void testProduceAndBuildFullRemotFolderTest() throws Exception { deleteDirectory("./res/home/"); - template.sendBodyAndHeader(ftpUrl, "Hello World", FileComponent.HEADER_FILE_NAME, "claus.txt"); + template.sendBodyAndHeader(getFtpUrl(), "Hello World", FileComponent.HEADER_FILE_NAME, "claus.txt"); File file = new File("./res/home/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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009 @@ -26,18 +26,15 @@ */ public class FtpProducerBuildPartOfDirectoryTest extends FtpServerTestSupport { - private int port = 20021; - private String ftpUrl = "ftp://ad...@localhost:"; + port + "/upload/user/claus?binary=false&password=admin"; - - public int getPort() { - return port; + private String getFtpUrl() { + return "ftp://ad...@localhost:"; + getPort() + "/upload/user/claus?binary=false&password=admin"; } public void testProduceAndBuildPartOfRemotFolderTest() throws Exception { deleteDirectory("./res/home/"); createDirectory("./res/home/upload/user/superman"); - template.sendBodyAndHeader(ftpUrl, "Bye World", FileComponent.HEADER_FILE_NAME, "claus.txt"); + template.sendBodyAndHeader(getFtpUrl(), "Bye World", FileComponent.HEADER_FILE_NAME, "claus.txt"); File file = new File("./res/home/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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009 @@ -30,12 +30,8 @@ */ public class FtpProducerExpressionTest extends FtpServerTestSupport { - private int port = 20062; - - private String ftpUrl = "ftp://ad...@localhost:"; + port + "/filelanguage?password=admin"; - - public int getPort() { - return port; + private String getFtpUrl() { + return "ftp://ad...@localhost:"; + getPort() + "/filelanguage?password=admin"; } @Override @@ -53,21 +49,21 @@ } public void testProduceBeanByExpression() throws Exception { - template.sendBody(ftpUrl + "&expression=${bean:myguidgenerator}.bak", "Hello World"); + template.sendBody(getFtpUrl() + "&expression=${bean:myguidgenerator}.bak", "Hello World"); Thread.sleep(500); assertFileExists("res/home/filelanguage/123.bak"); } public void testProduceBeanByHeader() throws Exception { - template.sendBodyAndHeader(ftpUrl, "Hello World", FileComponent.HEADER_FILE_NAME, "${bean:myguidgenerator}.bak"); + template.sendBodyAndHeader(getFtpUrl(), "Hello World", FileComponent.HEADER_FILE_NAME, "${bean:myguidgenerator}.bak"); Thread.sleep(500); assertFileExists("res/home/filelanguage/123.bak"); } public void testProducerDateByHeader() throws Exception { - template.sendBodyAndHeader(ftpUrl, "Hello World", FileComponent.HEADER_FILE_NAME, "myfile-${date:now:yyyyMMdd}.txt"); + template.sendBodyAndHeader(getFtpUrl(), "Hello World", FileComponent.HEADER_FILE_NAME, "myfile-${date:now:yyyyMMdd}.txt"); Thread.sleep(500); String date = new SimpleDateFormat("yyyyMMdd").format(new Date()); @@ -75,7 +71,7 @@ } public void testProducerDateByExpression() throws Exception { - template.sendBody(ftpUrl + "&expression=myfile-${date:now:yyyyMMdd}.txt", "Hello World"); + template.sendBody(getFtpUrl() + "&expression=myfile-${date:now:yyyyMMdd}.txt", "Hello World"); Thread.sleep(500); String date = new SimpleDateFormat("yyyyMMdd").format(new Date()); @@ -84,7 +80,7 @@ public void testProducerComplexByExpression() throws Exception { String expression = "../filelanguageinbox/myfile-${bean:myguidgenerator.guid}-${date:now:yyyyMMdd}.txt"; - template.sendBody(ftpUrl + "&expression=" + expression, "Hello World"); + template.sendBody(getFtpUrl() + "&expression=" + expression, "Hello World"); Thread.sleep(500); String date = new SimpleDateFormat("yyyyMMdd").format(new Date()); @@ -92,7 +88,7 @@ } public void testProducerSimpleWithHeaderByExpression() throws Exception { - template.sendBodyAndHeader(ftpUrl + "&expression=myfile-${in.header.foo}.txt", + template.sendBodyAndHeader(getFtpUrl() + "&expression=myfile-${in.header.foo}.txt", "Hello World", "foo", "abc"); Thread.sleep(500); @@ -104,7 +100,7 @@ cal.set(1974, Calendar.APRIL, 20); Date date = cal.getTime(); - template.sendBodyAndHeader(ftpUrl + "&expression=mybirthday-${date:in.header.birthday:yyyyMMdd}.txt", + template.sendBodyAndHeader(getFtpUrl() + "&expression=mybirthday-${date:in.header.birthday:yyyyMMdd}.txt", "Hello World", "birthday", date); Thread.sleep(500); 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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009 @@ -27,15 +27,12 @@ */ public class FtpProducerTempPrefixTest extends FtpServerTestSupport { - private int port = 20077; - private String ftpUrl = "ftp://ad...@localhost:"; + port + "/upload/user/claus?binary=false&password=admin&tempPrefix=.uploading"; - - public int getPort() { - return port; + private String getFtpUrl() { + return "ftp://ad...@localhost:"; + getPort() + "/upload/user/claus?binary=false&password=admin&tempPrefix=.uploading"; } public void testCreateTempFileName() throws Exception { - Endpoint endpoint = context.getEndpoint(ftpUrl); + Endpoint endpoint = context.getEndpoint(getFtpUrl()); RemoteFileProducer producer = (RemoteFileProducer) endpoint.createProducer(); String fileName = "somepath/someuser/claus.txt"; @@ -44,7 +41,7 @@ } public void testNoPathCreateTempFileName() throws Exception { - Endpoint endpoint = context.getEndpoint(ftpUrl); + Endpoint endpoint = context.getEndpoint(getFtpUrl()); RemoteFileProducer producer = (RemoteFileProducer) endpoint.createProducer(); String fileName = "claus.txt"; @@ -55,7 +52,7 @@ public void testProduceTempPrefixTest() throws Exception { deleteDirectory("./res/home/"); - template.sendBodyAndHeader(ftpUrl, "Hello World", FileComponent.HEADER_FILE_NAME, "claus.txt"); + template.sendBodyAndHeader(getFtpUrl(), "Hello World", FileComponent.HEADER_FILE_NAME, "claus.txt"); File file = new File("./res/home/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=735968&r1=735967&r2=735968&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 Tue Jan 20 00:42:43 2009 @@ -17,8 +17,11 @@ package org.apache.camel.component.file.remote; import java.io.File; +import java.io.FileOutputStream; +import java.util.Random; import org.apache.camel.ContextTestSupport; +import org.apache.camel.converter.IOConverter; import org.apache.ftpserver.FtpServer; import org.apache.ftpserver.usermanager.ClearTextPasswordEncryptor; import org.apache.ftpserver.usermanager.PropertiesUserManager; @@ -28,10 +31,14 @@ */ public abstract class FtpServerTestSupport extends ContextTestSupport { protected FtpServer ftpServer; + private int port; - public abstract int getPort(); + public int getPort() { + return port; + } protected void setUp() throws Exception { + initPort(); super.setUp(); initFtpServer(); ftpServer.start(); @@ -41,6 +48,7 @@ super.tearDown(); ftpServer.stop(); ftpServer = null; + port = 0; } protected void initFtpServer() throws Exception { @@ -54,6 +62,30 @@ uman.configure(); ftpServer.setUserManager(uman); - ftpServer.getListener("default").setPort(getPort()); + if (port < 21000) { + throw new IllegalArgumentException("Port number is not initialized in an expected range: " + getPort()); + } + ftpServer.getListener("default").setPort(port); + } + + protected void initPort() throws Exception { + File file = new File("./target/ftpport.txt"); + file = file.getAbsoluteFile(); + + if (!file.exists()) { + // start from somewhere in the 21xxx range + port = 21000 + new Random().nextInt(900); + } else { + // read port number from file + String s = IOConverter.toString(file); + port = Integer.parseInt(s); + // use next number + port++; + } + + // save to file, do not append + FileOutputStream fos = new FileOutputStream(file, false); + fos.write(("" + getPort()).getBytes()); + fos.close(); } }
