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=889125&r1=889124&r2=889125&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 Thu Dec 10 07:40:45 2009 @@ -41,16 +41,6 @@ return jndi; } - - @Override - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - public void configure() throws Exception { - from(getFtpUrl()).to("mock:result"); - } - }; - } - @Test public void testIdempotent() throws Exception { // consume the file the first time @@ -77,6 +67,15 @@ assertTrue("MyIdempotentRepository should have been invoked", invoked); } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + public void configure() throws Exception { + from(getFtpUrl()).to("mock:result"); + } + }; + } public class MyIdempotentRepository implements IdempotentRepository<String> { @@ -100,5 +99,4 @@ return true; } } - } \ No newline at end of file
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=889125&r1=889124&r2=889125&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 Thu Dec 10 07:40:45 2009 @@ -31,22 +31,6 @@ + "/idempotent?password=admin&binary=false&idempotent=true&delete=true&delay=1000"; } - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - deleteDirectory("target/idempotent"); - } - - @Override - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - public void configure() throws Exception { - from(getFtpUrl()).to("mock:result"); - } - }; - } - @Test public void testIdempotent() throws Exception { // consume the file the first time @@ -72,4 +56,12 @@ assertMockEndpointsSatisfied(); } + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + public void configure() throws Exception { + from(getFtpUrl()).to("mock:result"); + } + }; + } } \ No newline at end of file Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIncludeNameTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIncludeNameTest.java?rev=889125&r1=889124&r2=889125&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIncludeNameTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIncludeNameTest.java Thu Dec 10 07:40:45 2009 @@ -62,5 +62,4 @@ } }; } - } \ No newline at end of file Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryAsAbsolutePathTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryAsAbsolutePathTest.java?rev=889125&r1=889124&r2=889125&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryAsAbsolutePathTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryAsAbsolutePathTest.java Thu Dec 10 07:40:45 2009 @@ -50,19 +50,6 @@ 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 - Endpoint endpoint = context.getEndpoint(getFtpUrl()); - Exchange exchange = endpoint.createExchange(); - exchange.getIn().setBody("Hello World"); - exchange.getIn().setHeader(Exchange.FILE_NAME, "hello.txt"); - Producer producer = endpoint.createProducer(); - producer.start(); - producer.process(exchange); - producer.stop(); - } - @Test public void testLocalWorkDirectory() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); @@ -84,6 +71,19 @@ assertEquals("Hello World", IOConverter.toString(out, null)); } + 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(getFtpUrl()); + Exchange exchange = endpoint.createExchange(); + exchange.getIn().setBody("Hello World"); + exchange.getIn().setHeader(Exchange.FILE_NAME, "hello.txt"); + Producer producer = endpoint.createProducer(); + producer.start(); + producer.process(exchange); + producer.stop(); + } + protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() throws Exception { @@ -99,5 +99,4 @@ } }; } - } \ No newline at end of file Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMaxMessagesPerPollTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMaxMessagesPerPollTest.java?rev=889125&r1=889124&r2=889125&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMaxMessagesPerPollTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMaxMessagesPerPollTest.java Thu Dec 10 07:40:45 2009 @@ -35,16 +35,9 @@ @Before public void setUp() throws Exception { super.setUp(); - deleteDirectory(FTP_ROOT_DIR + "poll"); prepareFtpServer(); } - private void prepareFtpServer() throws Exception { - sendFile(getFtpUrl(), "Bye World", "bye.txt"); - sendFile(getFtpUrl(), "Hello World", "hello.txt"); - sendFile(getFtpUrl(), "Godday World", "godday.txt"); - } - @Test public void testMaxMessagesPerPoll() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); @@ -60,6 +53,12 @@ assertMockEndpointsSatisfied(); } + + private void prepareFtpServer() throws Exception { + sendFile(getFtpUrl(), "Bye World", "bye.txt"); + sendFile(getFtpUrl(), "Hello World", "hello.txt"); + sendFile(getFtpUrl(), "Godday World", "godday.txt"); + } protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { @@ -68,5 +67,4 @@ } }; } - } \ No newline at end of file Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMoveExpressionTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMoveExpressionTest.java?rev=889125&r1=889124&r2=889125&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMoveExpressionTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMoveExpressionTest.java Thu Dec 10 07:40:45 2009 @@ -39,7 +39,6 @@ @Before public void setUp() throws Exception { super.setUp(); - deleteDirectory("res/home/filelanguage"); deleteDirectory("target/filelanguage"); } @@ -49,7 +48,7 @@ jndi.bind("myguidgenerator", new MyGuidGenerator()); return jndi; } - + @Test public void testMoveUsingExpression() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); @@ -83,5 +82,4 @@ return "123"; } } - -} +} \ No newline at end of file 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=889125&r1=889124&r2=889125&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 Thu Dec 10 07:40:45 2009 @@ -36,16 +36,9 @@ @Before public void setUp() throws Exception { super.setUp(); - deleteDirectory(FTP_ROOT_DIR + "multidir"); prepareFtpServer(); } - private void prepareFtpServer() throws Exception { - sendFile(getFtpUrl(), "Bye World", "bye.txt"); - sendFile(getFtpUrl(), "Hello World", "sub/hello.txt"); - sendFile(getFtpUrl(), "Godday World", "sub/sub2/godday.txt"); - } - @Test public void testMultiDir() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); @@ -74,6 +67,12 @@ assertDirectoryEquals("sub/sub2/godday.txt", file.getRelativeFilePath()); assertEquals("godday.txt", file.getFileName()); } + + private void prepareFtpServer() throws Exception { + sendFile(getFtpUrl(), "Bye World", "bye.txt"); + sendFile(getFtpUrl(), "Hello World", "sub/hello.txt"); + sendFile(getFtpUrl(), "Godday World", "sub/sub2/godday.txt"); + } protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { 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=889125&r1=889124&r2=889125&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 Thu Dec 10 07:40:45 2009 @@ -61,5 +61,4 @@ } }; } - -} +} \ No newline at end of file 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=889125&r1=889124&r2=889125&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 Thu Dec 10 07:40:45 2009 @@ -74,5 +74,4 @@ } }; } - -} +} \ No newline at end of file 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=889125&r1=889124&r2=889125&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 Thu Dec 10 07:40:45 2009 @@ -38,15 +38,9 @@ @Before public void setUp() throws Exception { super.setUp(); - deleteDirectory(FTP_ROOT_DIR); - createDirectory(FTP_ROOT_DIR); prepareFtpServer(); } - private void prepareFtpServer() throws Exception { - sendFile(getFtpUrl(), "Hello World", "hello.txt"); - } - @Test public void testWithNoFileInOption() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); @@ -61,6 +55,10 @@ assertEquals("hello.txt", file.getRelativeFilePath()); assertEquals("hello.txt", file.getFileName()); } + + private void prepareFtpServer() throws Exception { + sendFile(getFtpUrl(), "Hello World", "hello.txt"); + } protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpIllegalOptionsTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpIllegalOptionsTest.java?rev=889125&r1=889124&r2=889125&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpIllegalOptionsTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpIllegalOptionsTest.java Thu Dec 10 07:40:45 2009 @@ -45,4 +45,4 @@ // ok } } -} +} \ No newline at end of file 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=889125&r1=889124&r2=889125&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 Thu Dec 10 07:40:45 2009 @@ -22,7 +22,6 @@ import org.apache.camel.Exchange; import org.apache.camel.Producer; import org.apache.camel.component.file.GenericFileOperationFailedException; -import org.junit.Before; import org.junit.Test; /** @@ -30,13 +29,6 @@ */ public class FtpLoginTest extends FtpServerTestSupport { - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - deleteDirectory(FTP_ROOT_DIR + "login"); - } - @Test public void testBadLogin() throws Exception { try { @@ -53,6 +45,7 @@ assertFalse("The file should NOT exists", file.exists()); } + @Test public void testGoodLogin() throws Exception { uploadFile("scott", "tiger"); @@ -73,5 +66,4 @@ producer.process(exchange); producer.stop(); } - -} +} \ No newline at end of file Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProdcerTempFileExistIssueTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProdcerTempFileExistIssueTest.java?rev=889125&r1=889124&r2=889125&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProdcerTempFileExistIssueTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProdcerTempFileExistIssueTest.java Thu Dec 10 07:40:45 2009 @@ -47,8 +47,6 @@ @Test public void testWriteUsingTempPrefixButFileExist() throws Exception { - deleteDirectory(FTP_ROOT_DIR + "tempprefix"); - template.sendBodyAndHeader(getFtpUrl(), "Hello World", Exchange.FILE_NAME, "hello.txt"); Thread.sleep(500); @@ -64,8 +62,6 @@ @Test public void testWriteUsingTempPrefixButBothFileExist() throws Exception { - deleteDirectory(FTP_ROOT_DIR + "tempprefix"); - template.sendBodyAndHeader(getFtpUrl(), "Hello World", Exchange.FILE_NAME, "hello.txt"); template.sendBodyAndHeader(getFtpUrl(), "Hello World", Exchange.FILE_NAME, "foohello.txt"); @@ -82,8 +78,6 @@ @Test public void testWriteUsingTempPrefixButFileExistOverride() throws Exception { - deleteDirectory(FTP_ROOT_DIR + "tempprefix"); - template.sendBodyAndHeader(getFtpUrl(), "Hello World", Exchange.FILE_NAME, "hello.txt"); Thread.sleep(500); @@ -99,8 +93,6 @@ @Test public void testWriteUsingTempPrefixButFileExistIgnore() throws Exception { - deleteDirectory(FTP_ROOT_DIR + "tempprefix"); - template.sendBodyAndHeader(getFtpUrl(), "Hello World", Exchange.FILE_NAME, "hello.txt"); Thread.sleep(500); @@ -116,8 +108,6 @@ @Test public void testWriteUsingTempPrefixButFileExistFail() throws Exception { - deleteDirectory(FTP_ROOT_DIR + "tempprefix"); - template.sendBodyAndHeader(getFtpUrl(), "Hello World", Exchange.FILE_NAME, "hello.txt"); Thread.sleep(500); @@ -135,5 +125,4 @@ // should not write new file as we should ignore assertEquals("Hello World", context.getTypeConverter().convertTo(String.class, file)); } - -} +} \ No newline at end of file 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=889125&r1=889124&r2=889125&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 Thu Dec 10 07:40:45 2009 @@ -32,14 +32,11 @@ @Test public void testProduceAndBuildFullRemotFolderTest() throws Exception { - deleteDirectory(FTP_ROOT_DIR + ""); - sendFile(getFtpUrl(), "Hello World", "claus.txt"); File file = new File(FTP_ROOT_DIR + "upload/user/claus/claus.txt"); file = file.getAbsoluteFile(); assertTrue("The uploaded file should exists", file.exists()); - assertEquals("Hello World", IOConverter.toString(file)); + assertEquals("Hello World", IOConverter.toString(file, null)); } - -} +} \ No newline at end of file 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=889125&r1=889124&r2=889125&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 Thu Dec 10 07:40:45 2009 @@ -32,15 +32,11 @@ @Test public void testProduceAndBuildPartOfRemotFolderTest() throws Exception { - deleteDirectory(FTP_ROOT_DIR + ""); - createDirectory(FTP_ROOT_DIR + "upload/user/superman"); - sendFile(getFtpUrl(), "Bye World", "claus.txt"); File file = new File(FTP_ROOT_DIR + "upload/user/claus/claus.txt"); file = file.getAbsoluteFile(); assertTrue("The uploaded file should exists", file.exists()); - assertEquals("Bye World", IOConverter.toString(file)); + assertEquals("Bye World", IOConverter.toString(file, null)); } - -} +} \ No newline at end of file Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerConcurrentTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerConcurrentTest.java?rev=889125&r1=889124&r2=889125&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerConcurrentTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerConcurrentTest.java Thu Dec 10 07:40:45 2009 @@ -45,8 +45,6 @@ } private void doSendMessages(int files, int poolSize) throws Exception { - deleteDirectory("res/home/concurrent"); - getMockEndpoint("mock:result").expectedMessageCount(files); ExecutorService executor = Executors.newFixedThreadPool(poolSize); @@ -74,4 +72,4 @@ } }; } -} +} \ No newline at end of file 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=889125&r1=889124&r2=889125&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 Thu Dec 10 07:40:45 2009 @@ -36,15 +36,9 @@ } @Override - public boolean isUseRouteBuilder() { - return false; - } - - @Override @Before public void setUp() throws Exception { super.setUp(); - deleteDirectory(FTP_ROOT_DIR + "filelanguage"); deleteDirectory("target/filelanguage"); } @@ -54,6 +48,11 @@ jndi.bind("myguidgenerator", new MyGuidGenerator()); return jndi; } + + @Override + public boolean isUseRouteBuilder() { + return false; + } @Test public void testProduceBeanByExpression() throws Exception { @@ -125,5 +124,4 @@ return "123"; } } - } \ No newline at end of file Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistAppendNoFileBeforeTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistAppendNoFileBeforeTest.java?rev=889125&r1=889124&r2=889125&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistAppendNoFileBeforeTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistAppendNoFileBeforeTest.java Thu Dec 10 07:40:45 2009 @@ -35,7 +35,6 @@ @Before public void setUp() throws Exception { super.setUp(); - deleteDirectory(FTP_ROOT_DIR + "exist"); deleteDirectory("target/exist"); } @@ -59,5 +58,4 @@ } }; } - } \ No newline at end of file Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistAppendTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistAppendTest.java?rev=889125&r1=889124&r2=889125&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistAppendTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistAppendTest.java Thu Dec 10 07:40:45 2009 @@ -36,7 +36,6 @@ @Before public void setUp() throws Exception { super.setUp(); - deleteDirectory(FTP_ROOT_DIR + "exist"); deleteDirectory("target/exist"); template.sendBodyAndHeader(getFtpUrl(), "Hello World\n", Exchange.FILE_NAME, "hello.txt"); @@ -65,5 +64,4 @@ } }; } - } \ No newline at end of file Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistFailTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistFailTest.java?rev=889125&r1=889124&r2=889125&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistFailTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistFailTest.java Thu Dec 10 07:40:45 2009 @@ -36,7 +36,6 @@ @Before public void setUp() throws Exception { super.setUp(); - deleteDirectory(FTP_ROOT_DIR + "exist"); deleteDirectory("target/exist"); template.sendBodyAndHeader(getFtpUrl(), "Hello World", Exchange.FILE_NAME, "hello.txt"); @@ -67,5 +66,4 @@ } }; } - } \ No newline at end of file Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistIgnoreTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistIgnoreTest.java?rev=889125&r1=889124&r2=889125&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistIgnoreTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistIgnoreTest.java Thu Dec 10 07:40:45 2009 @@ -35,7 +35,6 @@ @Before public void setUp() throws Exception { super.setUp(); - deleteDirectory(FTP_ROOT_DIR + "exist"); deleteDirectory("target/exist"); template.sendBodyAndHeader(getFtpUrl(), "Hello World", Exchange.FILE_NAME, "hello.txt"); @@ -61,5 +60,4 @@ } }; } - } \ No newline at end of file Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideNoFileBeforeTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideNoFileBeforeTest.java?rev=889125&r1=889124&r2=889125&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideNoFileBeforeTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideNoFileBeforeTest.java Thu Dec 10 07:40:45 2009 @@ -35,7 +35,6 @@ @Before public void setUp() throws Exception { super.setUp(); - deleteDirectory(FTP_ROOT_DIR + "exist"); deleteDirectory("target/exist"); } @@ -59,5 +58,4 @@ } }; } - } \ No newline at end of file Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideTest.java?rev=889125&r1=889124&r2=889125&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideTest.java Thu Dec 10 07:40:45 2009 @@ -35,7 +35,6 @@ @Before public void setUp() throws Exception { super.setUp(); - deleteDirectory(FTP_ROOT_DIR + "exist"); deleteDirectory("target/exist"); template.sendBodyAndHeader(getFtpUrl(), "Hello World", Exchange.FILE_NAME, "hello.txt"); @@ -61,5 +60,4 @@ } }; } - -} +} \ No newline at end of file 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=889125&r1=889124&r2=889125&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 Thu Dec 10 07:40:45 2009 @@ -37,14 +37,11 @@ @Test public void testProduceTempPrefixTest() throws Exception { - deleteDirectory(FTP_ROOT_DIR + ""); - sendFile(getFtpUrl(), "Hello World", "claus.txt"); File file = new File(FTP_ROOT_DIR + "upload/user/claus/claus.txt"); file = file.getAbsoluteFile(); assertTrue("The uploaded file should exists", file.exists()); - assertEquals("Hello World", IOConverter.toString(file)); + assertEquals("Hello World", IOConverter.toString(file, null)); } - } \ No newline at end of file Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptServerStoppedTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptServerStoppedTest.java?rev=889125&r1=889124&r2=889125&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptServerStoppedTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptServerStoppedTest.java Thu Dec 10 07:40:45 2009 @@ -30,12 +30,6 @@ return "ftp://ad...@localhost:"; + getPort() + "/reconnect?password=admin&maximumReconnectAttempts=2&reconnectDelay=500&delete=true"; } - @Override - public void setUp() throws Exception { - deleteDirectory("./res/home/reconnect"); - super.setUp(); - } - @Test public void testFromFileToFtp() throws Exception { // suspect serve so we cannot connect @@ -68,5 +62,4 @@ } }; } - -} +} \ No newline at end of file Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptUnknownHostTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptUnknownHostTest.java?rev=889125&r1=889124&r2=889125&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptUnknownHostTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptUnknownHostTest.java Thu Dec 10 07:40:45 2009 @@ -47,5 +47,4 @@ } }; } - } \ No newline at end of file Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RecipientListErrorHandlingIssueTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RecipientListErrorHandlingIssueTest.java?rev=889125&r1=889124&r2=889125&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RecipientListErrorHandlingIssueTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RecipientListErrorHandlingIssueTest.java Thu Dec 10 07:40:45 2009 @@ -105,5 +105,4 @@ assertMockEndpointsSatisfied(); } - -} +} \ No newline at end of file Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/ToFtpTempFileTargetFileExistTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/ToFtpTempFileTargetFileExistTest.java?rev=889125&r1=889124&r2=889125&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/ToFtpTempFileTargetFileExistTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/ToFtpTempFileTargetFileExistTest.java Thu Dec 10 07:40:45 2009 @@ -36,11 +36,22 @@ @Override @Before public void setUp() throws Exception { - deleteDirectory(FTP_ROOT_DIR + "/tempfile"); super.setUp(); prepareFtpServer(); } + @Test + public void testSendFileTargetFileExist() throws Exception { + MockEndpoint mock = getMockEndpoint("mock:result"); + mock.expectedMessageCount(1); + mock.expectedBodiesReceived("Hello Again World"); + mock.expectedFileExists(FTP_ROOT_DIR + "/tempfile/foo/bar/message.txt", "Hello Again World"); + + template.sendBody("direct:start", "Hello Again World"); + + mock.assertIsSatisfied(); + } + private void prepareFtpServer() throws Exception { // prepares the FTP Server by creating a file on the server Endpoint endpoint = context.getEndpoint(getFtpUrl()); @@ -58,18 +69,6 @@ assertTrue("The file should exists", file.exists()); } - @Test - public void testSendFileTargetFileExist() throws Exception { - MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedMessageCount(1); - mock.expectedBodiesReceived("Hello Again World"); - mock.expectedFileExists(FTP_ROOT_DIR + "/tempfile/foo/bar/message.txt", "Hello Again World"); - - template.sendBody("direct:start", "Hello Again World"); - - mock.assertIsSatisfied(); - } - protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() throws Exception { @@ -77,5 +76,4 @@ } }; } - } \ No newline at end of file
