Copied: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixNotStepwiseTest.java (from r1032231, 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/FromFtpPreMoveFilePostfixNotStepwiseTest.java?p2=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixNotStepwiseTest.java&p1=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixTest.java&r1=1032231&r2=1032261&rev=1032261&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/FromFtpPreMoveFilePostfixNotStepwiseTest.java Sun Nov 7 11:53:58 2010 @@ -16,70 +16,14 @@ */ package org.apache.camel.component.file.remote; -import java.io.File; - -import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; -import org.apache.camel.Producer; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Before; -import org.junit.Test; - /** * Unit test to test preMoveNamePostfix option. */ -public class FromFtpPreMoveFilePostfixTest extends FtpServerTestSupport { +public class FromFtpPreMoveFilePostfixNotStepwiseTest extends FromFtpPreMoveFilePostfixTest { - private String getFtpUrl() { + protected String getFtpUrl() { return "ftp://ad...@localhost:"; + getPort() + "/movefile?password=admin&binary=false" - + "&preMove=${file:name}.old"; - } - - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - prepareFtpServer(); + + "&preMove=${file:name}.old&stepwise=false"; } - @Test - public void testPollFileAndShouldBeMoved() throws Exception { - MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedMessageCount(1); - //mock.expectedBodiesReceived("Hello World this file will be moved"); - - mock.assertIsSatisfied(); - - // assert the file is moved - File file = new File(FTP_ROOT_DIR + "movefile/hello.txt.old"); - file = file.getAbsoluteFile(); - assertTrue("The file should have been moved", file.exists()); - } - - 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(getFtpUrl()); - Exchange exchange = endpoint.createExchange(); - exchange.getIn().setBody("Hello World this file will be moved"); - exchange.getIn().setHeader(Exchange.FILE_NAME, "hello.txt"); - Producer producer = endpoint.createProducer(); - producer.start(); - producer.process(exchange); - producer.stop(); - - // assert file is created - File file = new File(FTP_ROOT_DIR + "movefile/hello.txt"); - file = file.getAbsoluteFile(); - assertTrue("The file should exists", file.exists()); - } - - 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/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=1032261&r1=1032260&r2=1032261&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 Sun Nov 7 11:53:58 2010 @@ -31,7 +31,7 @@ import org.junit.Test; */ public class FromFtpPreMoveFilePostfixTest extends FtpServerTestSupport { - private String getFtpUrl() { + protected String getFtpUrl() { return "ftp://ad...@localhost:"; + getPort() + "/movefile?password=admin&binary=false" + "&preMove=${file:name}.old"; } Copied: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixNotStepwiseTest.java (from r1032231, 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/FromFtpPreMoveFilePrefixNotStepwiseTest.java?p2=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixNotStepwiseTest.java&p1=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixTest.java&r1=1032231&r2=1032261&rev=1032261&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/FromFtpPreMoveFilePrefixNotStepwiseTest.java Sun Nov 7 11:53:58 2010 @@ -16,70 +16,14 @@ */ package org.apache.camel.component.file.remote; -import java.io.File; - -import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; -import org.apache.camel.Producer; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Before; -import org.junit.Test; - /** * Unit test to test preMoveNamePrefix option. */ -public class FromFtpPreMoveFilePrefixTest extends FtpServerTestSupport { +public class FromFtpPreMoveFilePrefixNotStepwiseTest extends FromFtpPreMoveFilePrefixTest { - private String getFtpUrl() { + protected String getFtpUrl() { return "ftp://ad...@localhost:"; + getPort() + "/movefile?password=admin&binary=false&consumer.delay=5000" - + "&preMove=done/${file:name}"; - } - - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - prepareFtpServer(); + + "&preMove=done/${file:name}&stepwise=false"; } - @Test - public void testPollFileAndShouldBeMoved() throws Exception { - MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedMessageCount(1); - mock.expectedBodiesReceived("Hello World this file will be moved"); - - mock.assertIsSatisfied(); - - // assert the file is moved - File file = new File(FTP_ROOT_DIR + "movefile/done/hello.txt"); - file = file.getAbsoluteFile(); - assertTrue("The file should have been moved", file.exists()); - } - - 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(getFtpUrl()); - Exchange exchange = endpoint.createExchange(); - exchange.getIn().setBody("Hello World this file will be moved"); - exchange.getIn().setHeader(Exchange.FILE_NAME, "hello.txt"); - Producer producer = endpoint.createProducer(); - producer.start(); - producer.process(exchange); - producer.stop(); - - // assert file is created - File file = new File(FTP_ROOT_DIR + "movefile/hello.txt"); - file = file.getAbsoluteFile(); - assertTrue("The file should exists", file.exists()); - } - - 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/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=1032261&r1=1032260&r2=1032261&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 Sun Nov 7 11:53:58 2010 @@ -31,7 +31,7 @@ import org.junit.Test; */ public class FromFtpPreMoveFilePrefixTest extends FtpServerTestSupport { - private String getFtpUrl() { + protected String getFtpUrl() { return "ftp://ad...@localhost:"; + getPort() + "/movefile?password=admin&binary=false&consumer.delay=5000" + "&preMove=done/${file:name}"; } Copied: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveNoopNotStepwiseTest.java (from r1032231, camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveNoopTest.java) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveNoopNotStepwiseTest.java?p2=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveNoopNotStepwiseTest.java&p1=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveNoopTest.java&r1=1032231&r2=1032261&rev=1032261&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveNoopTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveNoopNotStepwiseTest.java Sun Nov 7 11:53:58 2010 @@ -16,73 +16,13 @@ */ package org.apache.camel.component.file.remote; -import java.io.File; - -import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; -import org.apache.camel.Processor; -import org.apache.camel.Producer; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Before; -import org.junit.Test; - /** * Unit test to test preMove with noop option. */ -public class FromFtpPreMoveNoopTest extends FtpServerTestSupport { - - private String getFtpUrl() { - return "ftp://ad...@localhost:"; + getPort() + "/movefile?password=admin&preMove=work&noop=true"; - } - - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - prepareFtpServer(); - } - - @Test - public void testPreMoveNoop() throws Exception { - MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedMessageCount(1); - mock.expectedBodiesReceived("Hello World this file will be moved"); - - mock.assertIsSatisfied(); +public class FromFtpPreMoveNoopNotStepwiseTest extends FromFtpPreMoveNoopTest { - // and file should be kept there - Thread.sleep(1000); - File file = new File(FTP_ROOT_DIR + "movefile/work/hello.txt"); - file = file.getAbsoluteFile(); - assertTrue("The file should exists", file.exists()); + protected String getFtpUrl() { + return "ftp://ad...@localhost:"; + getPort() + "/movefile?password=admin&preMove=work&noop=true&stepwise=false"; } - 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(getFtpUrl()); - Exchange exchange = endpoint.createExchange(); - exchange.getIn().setBody("Hello World this file will be moved"); - 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 { - from(getFtpUrl()).process(new Processor() { - public void process(Exchange exchange) throws Exception { - // assert the file is pre moved - File file = new File(FTP_ROOT_DIR + "movefile/work/hello.txt"); - file = file.getAbsoluteFile(); - assertTrue("The file should have been moved", file.exists()); - } - }).to("mock:result"); - } - }; - } } \ No newline at end of file Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveNoopTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveNoopTest.java?rev=1032261&r1=1032260&r2=1032261&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveNoopTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveNoopTest.java Sun Nov 7 11:53:58 2010 @@ -32,7 +32,7 @@ import org.junit.Test; */ public class FromFtpPreMoveNoopTest extends FtpServerTestSupport { - private String getFtpUrl() { + protected String getFtpUrl() { return "ftp://ad...@localhost:"; + getPort() + "/movefile?password=admin&preMove=work&noop=true"; } Copied: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNoopNotStepwiseTest.java (from r1032231, camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNoopTest.java) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNoopNotStepwiseTest.java?p2=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNoopNotStepwiseTest.java&p1=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNoopTest.java&r1=1032231&r2=1032261&rev=1032261&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNoopTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNoopNotStepwiseTest.java Sun Nov 7 11:53:58 2010 @@ -16,60 +16,14 @@ */ package org.apache.camel.component.file.remote; -import org.apache.camel.Exchange; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; - /** * @version $Revision$ */ -public class FromFtpRecursiveNoopTest extends FtpServerTestSupport { +public class FromFtpRecursiveNoopNotStepwiseTest extends FromFtpRecursiveNoopTest { - private String getFtpUrl() { + protected String getFtpUrl() { return "ftp://ad...@localhost:"; + getPort() + "/noop?password=admin&binary=false&initialDelay=3000" - + "&recursive=true&noop=true"; - } - - @Override - public void setUp() throws Exception { - super.setUp(); - - template.sendBodyAndHeader(getFtpUrl(), "a", Exchange.FILE_NAME, "a.txt"); - template.sendBodyAndHeader(getFtpUrl(), "b", Exchange.FILE_NAME, "b.txt"); - template.sendBodyAndHeader(getFtpUrl(), "a2", Exchange.FILE_NAME, "foo/a.txt"); - template.sendBodyAndHeader(getFtpUrl(), "c", Exchange.FILE_NAME, "bar/c.txt"); - template.sendBodyAndHeader(getFtpUrl(), "b2", Exchange.FILE_NAME, "bar/b.txt"); + + "&recursive=true&noop=true&stepwise=false"; } - @Test - public void testRecursiveNoop() throws Exception { - MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedBodiesReceivedInAnyOrder("a", "b", "a2", "c", "b2"); - - assertMockEndpointsSatisfied(); - - // reset mock and send in a new file to be picked up only - mock.reset(); - mock.expectedBodiesReceived("c2"); - - template.sendBodyAndHeader(getFtpUrl(), "c2", Exchange.FILE_NAME, "c.txt"); - - assertMockEndpointsSatisfied(); - } - - @Override - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - @Override - public void configure() throws Exception { - from(getFtpUrl()) - .convertBodyTo(String.class) - .to("log:ftp") - .to("mock:result"); - } - }; - } - - -} +} \ No newline at end of file Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNoopTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNoopTest.java?rev=1032261&r1=1032260&r2=1032261&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNoopTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNoopTest.java Sun Nov 7 11:53:58 2010 @@ -26,7 +26,7 @@ import org.junit.Test; */ public class FromFtpRecursiveNoopTest extends FtpServerTestSupport { - private String getFtpUrl() { + protected String getFtpUrl() { return "ftp://ad...@localhost:"; + getPort() + "/noop?password=admin&binary=false&initialDelay=3000" + "&recursive=true&noop=true"; } @@ -71,5 +71,4 @@ public class FromFtpRecursiveNoopTest ex }; } - } Copied: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteNotStepwiseTest.java (from r1032231, camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteTest.java) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteNotStepwiseTest.java?p2=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteNotStepwiseTest.java&p1=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteTest.java&r1=1032231&r2=1032261&rev=1032261&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteNotStepwiseTest.java Sun Nov 7 11:53:58 2010 @@ -16,51 +16,14 @@ */ package org.apache.camel.component.file.remote; -import org.apache.camel.Exchange; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Before; -import org.junit.Test; - /** * @version $Revision$ */ -public class FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteTest extends FtpServerTestSupport { +public class FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteNotStepwiseTest extends FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteTest { - private String getFtpUrl() { + protected String getFtpUrl() { return "ftp://ad...@localhost:"; + getPort() + "?password=admin&recursive=true&binary=false" - + "&move=/.done&initialDelay=2500&delay=5000"; - } - - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - prepareFtpServer(); - } - - @Test - public void testPollFileAndShouldBeMoved() throws Exception { - MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedBodiesReceivedInAnyOrder("Hello", "Bye", "Goodday"); - mock.expectedFileExists(FTP_ROOT_DIR + ".done/hello.txt"); - mock.expectedFileExists(FTP_ROOT_DIR + ".done/bye.txt"); - mock.expectedFileExists(FTP_ROOT_DIR + ".done/goodday.txt"); - - mock.assertIsSatisfied(); + + "&move=/.done&initialDelay=2500&delay=5000&stepwise=false"; } - private void prepareFtpServer() throws Exception { - template.sendBodyAndHeader(getFtpUrl(), "Hello", Exchange.FILE_NAME, "hello.txt"); - template.sendBodyAndHeader(getFtpUrl(), "Bye", Exchange.FILE_NAME, "sub/bye.txt"); - template.sendBodyAndHeader(getFtpUrl(), "Goodday", Exchange.FILE_NAME, "sub/sub2/goodday.txt"); - } - - 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/FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteTest.java?rev=1032261&r1=1032260&r2=1032261&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteTest.java Sun Nov 7 11:53:58 2010 @@ -27,7 +27,7 @@ import org.junit.Test; */ public class FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteTest extends FtpServerTestSupport { - private String getFtpUrl() { + protected String getFtpUrl() { return "ftp://ad...@localhost:"; + getPort() + "?password=admin&recursive=true&binary=false" + "&move=/.done&initialDelay=2500&delay=5000"; } Copied: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToRelativeNotStepwiseTest.java (from r1032231, camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToRelativeTest.java) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToRelativeNotStepwiseTest.java?p2=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToRelativeNotStepwiseTest.java&p1=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToRelativeTest.java&r1=1032231&r2=1032261&rev=1032261&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToRelativeTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToRelativeNotStepwiseTest.java Sun Nov 7 11:53:58 2010 @@ -16,51 +16,14 @@ */ package org.apache.camel.component.file.remote; -import org.apache.camel.Exchange; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Before; -import org.junit.Test; - /** * @version $Revision$ */ -public class FromFtpSimpleNoEndpointPathRelativeMoveToRelativeTest extends FtpServerTestSupport { +public class FromFtpSimpleNoEndpointPathRelativeMoveToRelativeNotStepwiseTest extends FromFtpSimpleNoEndpointPathRelativeMoveToRelativeTest { - private String getFtpUrl() { + protected String getFtpUrl() { return "ftp://ad...@localhost:"; + getPort() + "?password=admin&recursive=true&binary=false" - + "&move=.done&initialDelay=2500&delay=5000"; - } - - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - prepareFtpServer(); - } - - @Test - public void testPollFileAndShouldBeMoved() throws Exception { - MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedBodiesReceivedInAnyOrder("Hello", "Bye", "Goodday"); - mock.expectedFileExists(FTP_ROOT_DIR + ".done/hello.txt"); - mock.expectedFileExists(FTP_ROOT_DIR + "sub/.done/bye.txt"); - mock.expectedFileExists(FTP_ROOT_DIR + "sub/sub2/.done/goodday.txt"); - - mock.assertIsSatisfied(); + + "&move=.done&initialDelay=2500&delay=5000&stepwise=false"; } - private void prepareFtpServer() throws Exception { - template.sendBodyAndHeader(getFtpUrl(), "Hello", Exchange.FILE_NAME, "hello.txt"); - template.sendBodyAndHeader(getFtpUrl(), "Bye", Exchange.FILE_NAME, "sub/bye.txt"); - template.sendBodyAndHeader(getFtpUrl(), "Goodday", Exchange.FILE_NAME, "sub/sub2/goodday.txt"); - } - - 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/FromFtpSimpleNoEndpointPathRelativeMoveToRelativeTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToRelativeTest.java?rev=1032261&r1=1032260&r2=1032261&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToRelativeTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToRelativeTest.java Sun Nov 7 11:53:58 2010 @@ -27,7 +27,7 @@ import org.junit.Test; */ public class FromFtpSimpleNoEndpointPathRelativeMoveToRelativeTest extends FtpServerTestSupport { - private String getFtpUrl() { + protected String getFtpUrl() { return "ftp://ad...@localhost:"; + getPort() + "?password=admin&recursive=true&binary=false" + "&move=.done&initialDelay=2500&delay=5000"; } Copied: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToAbsoluteNotStepwiseTest.java (from r1032231, camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToAbsoluteTest.java) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToAbsoluteNotStepwiseTest.java?p2=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToAbsoluteNotStepwiseTest.java&p1=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToAbsoluteTest.java&r1=1032231&r2=1032261&rev=1032261&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToAbsoluteTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToAbsoluteNotStepwiseTest.java Sun Nov 7 11:53:58 2010 @@ -16,51 +16,14 @@ */ package org.apache.camel.component.file.remote; -import org.apache.camel.Exchange; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Before; -import org.junit.Test; - /** * @version $Revision$ */ -public class FromFtpSimpleRelativeMoveToAbsoluteTest extends FtpServerTestSupport { +public class FromFtpSimpleRelativeMoveToAbsoluteNotStepwiseTest extends FromFtpSimpleRelativeMoveToAbsoluteTest { - private String getFtpUrl() { + protected String getFtpUrl() { return "ftp://ad...@localhost:"; + getPort() + "/movefile?password=admin&recursive=true&binary=false" - + "&move=/movefile/.done&initialDelay=2500&delay=5000"; - } - - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - prepareFtpServer(); - } - - @Test - public void testPollFileAndShouldBeMoved() throws Exception { - MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedBodiesReceivedInAnyOrder("Hello", "Bye", "Goodday"); - mock.expectedFileExists(FTP_ROOT_DIR + "movefile/.done/hello.txt"); - mock.expectedFileExists(FTP_ROOT_DIR + "movefile/.done/bye.txt"); - mock.expectedFileExists(FTP_ROOT_DIR + "movefile/.done/goodday.txt"); - - mock.assertIsSatisfied(); - } - - private void prepareFtpServer() throws Exception { - template.sendBodyAndHeader(getFtpUrl(), "Hello", Exchange.FILE_NAME, "hello.txt"); - template.sendBodyAndHeader(getFtpUrl(), "Bye", Exchange.FILE_NAME, "sub/bye.txt"); - template.sendBodyAndHeader(getFtpUrl(), "Goodday", Exchange.FILE_NAME, "sub/sub2/goodday.txt"); + + "&move=/movefile/.done&initialDelay=2500&delay=5000&stepwise=false"; } - 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/FromFtpSimpleRelativeMoveToAbsoluteTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToAbsoluteTest.java?rev=1032261&r1=1032260&r2=1032261&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToAbsoluteTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToAbsoluteTest.java Sun Nov 7 11:53:58 2010 @@ -27,7 +27,7 @@ import org.junit.Test; */ public class FromFtpSimpleRelativeMoveToAbsoluteTest extends FtpServerTestSupport { - private String getFtpUrl() { + protected String getFtpUrl() { return "ftp://ad...@localhost:"; + getPort() + "/movefile?password=admin&recursive=true&binary=false" + "&move=/movefile/.done&initialDelay=2500&delay=5000"; } Copied: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToRelativeNotStepwiseTest.java (from r1032231, camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToRelativeTest.java) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToRelativeNotStepwiseTest.java?p2=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToRelativeNotStepwiseTest.java&p1=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToRelativeTest.java&r1=1032231&r2=1032261&rev=1032261&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToRelativeTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToRelativeNotStepwiseTest.java Sun Nov 7 11:53:58 2010 @@ -16,51 +16,14 @@ */ package org.apache.camel.component.file.remote; -import org.apache.camel.Exchange; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Before; -import org.junit.Test; - /** * @version $Revision$ */ -public class FromFtpSimpleRelativeMoveToRelativeTest extends FtpServerTestSupport { +public class FromFtpSimpleRelativeMoveToRelativeNotStepwiseTest extends FromFtpSimpleRelativeMoveToRelativeTest { - private String getFtpUrl() { + protected String getFtpUrl() { return "ftp://ad...@localhost:"; + getPort() + "/movefile?password=admin&recursive=true&binary=false" - + "&move=.done&initialDelay=2500&delay=5000"; - } - - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - prepareFtpServer(); - } - - @Test - public void testPollFileAndShouldBeMoved() throws Exception { - MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedBodiesReceivedInAnyOrder("Hello", "Bye", "Goodday"); - mock.expectedFileExists(FTP_ROOT_DIR + "movefile/.done/hello.txt"); - mock.expectedFileExists(FTP_ROOT_DIR + "movefile/sub/.done/bye.txt"); - mock.expectedFileExists(FTP_ROOT_DIR + "movefile/sub/sub2/.done/goodday.txt"); - - mock.assertIsSatisfied(); + + "&move=.done&initialDelay=2500&delay=5000&stepwise=false"; } - private void prepareFtpServer() throws Exception { - template.sendBodyAndHeader(getFtpUrl(), "Hello", Exchange.FILE_NAME, "hello.txt"); - template.sendBodyAndHeader(getFtpUrl(), "Bye", Exchange.FILE_NAME, "sub/bye.txt"); - template.sendBodyAndHeader(getFtpUrl(), "Goodday", Exchange.FILE_NAME, "sub/sub2/goodday.txt"); - } - - 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/FromFtpSimpleRelativeMoveToRelativeTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToRelativeTest.java?rev=1032261&r1=1032260&r2=1032261&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToRelativeTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToRelativeTest.java Sun Nov 7 11:53:58 2010 @@ -27,7 +27,7 @@ import org.junit.Test; */ public class FromFtpSimpleRelativeMoveToRelativeTest extends FtpServerTestSupport { - private String getFtpUrl() { + protected String getFtpUrl() { return "ftp://ad...@localhost:"; + getPort() + "/movefile?password=admin&recursive=true&binary=false" + "&move=.done&initialDelay=2500&delay=5000"; } Copied: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelManualTest.java (from r1032231, camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelManualTest.java) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelManualTest.java?p2=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelManualTest.java&p1=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelManualTest.java&r1=1032231&r2=1032261&rev=1032261&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelManualTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelManualTest.java Sun Nov 7 11:53:58 2010 @@ -22,7 +22,7 @@ import org.junit.Ignore; import org.junit.Test; @Ignore("Run this test manually") -public class FtpConsumerCamelManualTest extends CamelTestSupport { +public class FtpConsumerNotStepwiseCamelManualTest extends CamelTestSupport { @Override public void setUp() throws Exception { @@ -41,7 +41,7 @@ public class FtpConsumerCamelManualTest return new RouteBuilder() { @Override public void configure() throws Exception { - from("ftp:localhost/one/two?username=camel&password=camel&noop=true") + from("ftp:localhost/one/two?username=camel&password=camel&noop=true&stepwise=false") .to("file:target/ftptest") .to("mock:result"); } Copied: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveManualTest.java (from r1032231, camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveManualTest.java) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveManualTest.java?p2=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveManualTest.java&p1=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveManualTest.java&r1=1032231&r2=1032261&rev=1032261&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveManualTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveManualTest.java Sun Nov 7 11:53:58 2010 @@ -22,7 +22,7 @@ import org.junit.Ignore; import org.junit.Test; @Ignore("Run this test manually") -public class FtpConsumerCamelRecursiveManualTest extends CamelTestSupport { +public class FtpConsumerNotStepwiseCamelRecursiveManualTest extends CamelTestSupport { @Override public void setUp() throws Exception { @@ -41,7 +41,7 @@ public class FtpConsumerCamelRecursiveMa return new RouteBuilder() { @Override public void configure() throws Exception { - from("ftp:localhost/one/two?username=camel&password=camel&recursive=true&noop=true") + from("ftp:localhost/one/two?username=camel&password=camel&recursive=true&noop=true&stepwise=false") .to("file:target/ftptest") .to("mock:result"); } Copied: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveToAbsoluteManualTest.java (from r1032231, camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveToAbsoluteManualTest.java) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveToAbsoluteManualTest.java?p2=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveToAbsoluteManualTest.java&p1=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveToAbsoluteManualTest.java&r1=1032231&r2=1032261&rev=1032261&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveToAbsoluteManualTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveToAbsoluteManualTest.java Sun Nov 7 11:53:58 2010 @@ -22,7 +22,7 @@ import org.junit.Ignore; import org.junit.Test; @Ignore("Run this test manually") -public class FtpConsumerCamelRecursiveToAbsoluteManualTest extends CamelTestSupport { +public class FtpConsumerNotStepwiseCamelRecursiveToAbsoluteManualTest extends CamelTestSupport { @Override public void setUp() throws Exception { @@ -41,7 +41,7 @@ public class FtpConsumerCamelRecursiveTo return new RouteBuilder() { @Override public void configure() throws Exception { - from("ftp:localhost/one/two?username=camel&password=camel&recursive=true&noop=true") + from("ftp:localhost/one/two?username=camel&password=camel&recursive=true&noop=true&stepwise=false") .to("file:E:/temp/sample/file2ftp") .to("mock:result"); } Copied: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteNotStepwiseTest.java (from r1032231, camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteTest.java) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteNotStepwiseTest.java?p2=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteNotStepwiseTest.java&p1=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteTest.java&r1=1032231&r2=1032261&rev=1032261&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteNotStepwiseTest.java Sun Nov 7 11:53:58 2010 @@ -16,38 +16,14 @@ */ package org.apache.camel.component.file.remote.sftp; -import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; import org.junit.Ignore; -import org.junit.Test; /** * @version $Revision$ */ @Ignore("Disabled due CI servers fails on full build running with these tests") -public class SftpSimpleConsumeAbsoluteTest extends SftpServerTestSupport { - - @Test - public void testSftpSimpleConsumeAbsolute() throws Exception { - if (!canTest()) { - return; - } - - String expected = "Hello World"; - - // FTP Server does not support absolute path, so lets simulate it - String path = FTP_ROOT_DIR + "/tmp/mytemp"; - template.sendBodyAndHeader("file:" + path, expected, Exchange.FILE_NAME, "hello.txt"); - - MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedMessageCount(1); - mock.expectedHeaderReceived(Exchange.FILE_NAME, "hello.txt"); - - context.startRoute("foo"); - - assertMockEndpointsSatisfied(); - } +public class SftpSimpleConsumeAbsoluteNotStepwiseTest extends SftpSimpleConsumeAbsoluteTest { @Override protected RouteBuilder createRouteBuilder() throws Exception { @@ -56,10 +32,10 @@ public class SftpSimpleConsumeAbsoluteTe public void configure() throws Exception { // notice we use an absolute starting path: /res/home/tmp/mytemp // - we must remember to use // slash because of the url separator - from("sftp://localhost:"; + getPort() + "//" + FTP_ROOT_DIR + "/tmp/mytemp?username=admin&password=admin&delay=10s&disconnect=true") + from("sftp://localhost:"; + getPort() + "//" + FTP_ROOT_DIR + "/tmp/mytemp?username=admin&password=admin&delay=10s&disconnect=true&stepwise=false") .routeId("foo").noAutoStartup() .to("mock:result"); } }; } -} +} \ No newline at end of file Copied: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeNotStepwiseTest.java (from r1032231, camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeTest.java) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeNotStepwiseTest.java?p2=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeNotStepwiseTest.java&p1=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeTest.java&r1=1032231&r2=1032261&rev=1032261&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeNotStepwiseTest.java Sun Nov 7 11:53:58 2010 @@ -16,47 +16,24 @@ */ package org.apache.camel.component.file.remote.sftp; -import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; import org.junit.Ignore; -import org.junit.Test; /** * @version $Revision$ */ @Ignore("Disabled due CI servers fails on full build running with these tests") -public class SftpSimpleConsumeTest extends SftpServerTestSupport { - - @Test - public void testSftpSimpleConsume() throws Exception { - if (!canTest()) { - return; - } - - String expected = "Hello World"; - - // create file using regular file - template.sendBodyAndHeader("file://" + FTP_ROOT_DIR, expected, Exchange.FILE_NAME, "hello.txt"); - - MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedMessageCount(1); - mock.expectedHeaderReceived(Exchange.FILE_NAME, "hello.txt"); - - context.startRoute("foo"); - - assertMockEndpointsSatisfied(); - } +public class SftpSimpleConsumeNotStepwiseTest extends SftpSimpleConsumeTest { @Override protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { @Override public void configure() throws Exception { - from("sftp://localhost:"; + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10s&disconnect=true") + from("sftp://localhost:"; + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10s&disconnect=true&stepwise=false") .routeId("foo").noAutoStartup() .to("mock:result"); } }; } -} +} \ No newline at end of file Copied: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveNotStepwiseTest.java (from r1032231, camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveTest.java) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveNotStepwiseTest.java?p2=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveNotStepwiseTest.java&p1=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveTest.java&r1=1032231&r2=1032261&rev=1032261&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveNotStepwiseTest.java Sun Nov 7 11:53:58 2010 @@ -16,47 +16,24 @@ */ package org.apache.camel.component.file.remote.sftp; -import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; import org.junit.Ignore; -import org.junit.Test; /** * @version $Revision$ */ @Ignore("Disabled due CI servers fails on full build running with these tests") -public class SftpSimpleConsumeRecursiveTest extends SftpServerTestSupport { - - @Test - public void testSftpSimpleConsumeRecursive() throws Exception { - if (!canTest()) { - return; - } - - // create files using regular file - template.sendBodyAndHeader("file://" + FTP_ROOT_DIR, "A", Exchange.FILE_NAME, "a.txt"); - template.sendBodyAndHeader("file://" + FTP_ROOT_DIR + "/foo", "B", Exchange.FILE_NAME, "b.txt"); - template.sendBodyAndHeader("file://" + FTP_ROOT_DIR + "/bar", "C", Exchange.FILE_NAME, "c.txt"); - template.sendBodyAndHeader("file://" + FTP_ROOT_DIR + "/bar/cake", "D", Exchange.FILE_NAME, "d.txt"); - - MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedMessageCount(4); - - context.startRoute("foo"); - - assertMockEndpointsSatisfied(); - } +public class SftpSimpleConsumeRecursiveNotStepwiseTest extends SftpSimpleConsumeRecursiveTest { @Override protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { @Override public void configure() throws Exception { - from("sftp://localhost:"; + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10s&disconnect=true&recursive=true") + from("sftp://localhost:"; + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10s&disconnect=true&recursive=true&stepwise=false") .routeId("foo").noAutoStartup() .to("log:result", "mock:result"); } }; } -} +} \ No newline at end of file
