You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2011/11/26 00:07:22 UTC
svn commit: r1206371 [2/2] - in /camel/trunk/components/camel-ftp: ./
src/test/java/org/apache/camel/component/file/remote/
src/test/java/org/apache/camel/component/file/remote/sftp/
src/test/resources/
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRootFileExistFailTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRootFileExistFailTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRootFileExistFailTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRootFileExistFailTest.java Fri Nov 25 23:06:44 2011
@@ -50,7 +50,7 @@ public class FtpProducerRootFileExistFai
}
// root file should still exist
- assertFileExists(FTP_ROOT_DIR + "hello.txt");
+ assertFileExists(FTP_ROOT_DIR + "/hello.txt");
}
@Override
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerSiteCommandTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerSiteCommandTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerSiteCommandTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerSiteCommandTest.java Fri Nov 25 23:06:44 2011
@@ -36,7 +36,7 @@ public class FtpProducerSiteCommandTest
public void testSiteCommand() throws Exception {
sendFile(getFtpUrl(), "Hello World", "hello.txt");
- File file = new File(FTP_ROOT_DIR + "site/hello.txt");
+ File file = new File(FTP_ROOT_DIR + "/site/hello.txt");
file = file.getAbsoluteFile();
assertTrue("The uploaded file should exists", file.exists());
assertEquals("Hello World", IOConverter.toString(file, null));
Copied: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempFileExistIssueTest.java (from r1206116, 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/FtpProducerTempFileExistIssueTest.java?p2=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempFileExistIssueTest.java&p1=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProdcerTempFileExistIssueTest.java&r1=1206116&r2=1206371&rev=1206371&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/FtpProducerTempFileExistIssueTest.java Fri Nov 25 23:06:44 2011
@@ -26,7 +26,7 @@ import org.junit.Test;
/**
* @version
*/
-public class FtpProdcerTempFileExistIssueTest extends FtpServerTestSupport {
+public class FtpProducerTempFileExistIssueTest extends FtpServerTestSupport {
private String getFtpUrl() {
return "ftp://admin@localhost:" + getPort() + "/tempprefix/?password=admin";
@@ -56,7 +56,7 @@ public class FtpProdcerTempFileExistIssu
Thread.sleep(500);
- File file = new File(FTP_ROOT_DIR + "tempprefix/hello.txt").getAbsoluteFile();
+ File file = new File(FTP_ROOT_DIR + "/tempprefix/hello.txt").getAbsoluteFile();
assertEquals(true, file.exists());
assertEquals("Bye World", context.getTypeConverter().convertTo(String.class, file));
}
@@ -72,7 +72,7 @@ public class FtpProdcerTempFileExistIssu
Thread.sleep(500);
- File file = new File(FTP_ROOT_DIR + "tempprefix/hello.txt").getAbsoluteFile();
+ File file = new File(FTP_ROOT_DIR + "/tempprefix/hello.txt").getAbsoluteFile();
assertEquals(true, file.exists());
assertEquals("Bye World", context.getTypeConverter().convertTo(String.class, file));
}
@@ -87,7 +87,7 @@ public class FtpProdcerTempFileExistIssu
Thread.sleep(500);
- File file = new File(FTP_ROOT_DIR + "tempprefix/hello.txt").getAbsoluteFile();
+ File file = new File(FTP_ROOT_DIR + "/tempprefix/hello.txt").getAbsoluteFile();
assertEquals(true, file.exists());
assertEquals("Bye World", context.getTypeConverter().convertTo(String.class, file));
}
@@ -102,7 +102,7 @@ public class FtpProdcerTempFileExistIssu
Thread.sleep(500);
- File file = new File(FTP_ROOT_DIR + "tempprefix/hello.txt").getAbsoluteFile();
+ File file = new File(FTP_ROOT_DIR + "/tempprefix/hello.txt").getAbsoluteFile();
// should not write new file as we should ignore
assertEquals("Hello World", context.getTypeConverter().convertTo(String.class, file));
}
@@ -123,7 +123,7 @@ public class FtpProdcerTempFileExistIssu
Thread.sleep(500);
- File file = new File(FTP_ROOT_DIR + "tempprefix/hello.txt").getAbsoluteFile();
+ File file = new File(FTP_ROOT_DIR + "/tempprefix/hello.txt").getAbsoluteFile();
// should not write new file as we should ignore
assertEquals("Hello World", context.getTypeConverter().convertTo(String.class, 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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -39,7 +39,7 @@ public class FtpProducerTempPrefixTest e
public void testProduceTempPrefixTest() throws Exception {
sendFile(getFtpUrl(), "Hello World", "claus.txt");
- File file = new File(FTP_ROOT_DIR + "upload/user/claus/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, null));
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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -36,7 +36,7 @@ public class FtpReconnectAttemptServerSt
ftpServer.suspend();
// put a file in the folder (do not use ftp as we then will connect)
- template.sendBodyAndHeader("file://./res/home/reconnect", "Hello World", Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader("file:" + FTP_ROOT_DIR + "/reconnect", "Hello World", Exchange.FILE_NAME, "hello.txt");
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(0);
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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -37,7 +37,7 @@ import org.junit.Before;
*/
public abstract class FtpServerTestSupport extends BaseServerTestSupport {
- protected static final String FTP_ROOT_DIR = "./res/home/";
+ protected static final String FTP_ROOT_DIR = "./target/res/home";
protected static final File USERS_FILE = new File("./src/test/resources/users.properties");
protected static final String DEFAULT_LISTENER = "default";
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java Fri Nov 25 23:06:44 2011
@@ -38,7 +38,7 @@ import org.junit.Before;
*/
public class SftpServerTestSupport extends BaseServerTestSupport {
- protected static final String FTP_ROOT_DIR = "res/home";
+ protected static final String FTP_ROOT_DIR = "target/res/home";
protected SshServer sshd;
protected boolean canTest;
@@ -60,8 +60,7 @@ public class SftpServerTestSupport exten
}
if (!canTest) {
String name = System.getProperty("java.vendor");
- System.out.println("SunX509 is not avail on this jdk ["
- + name + "] Testing is skipped!");
+ System.out.println("SunX509 is not avail on this jdk [" + name + "] Testing is skipped!");
return;
}
canTest = false;
@@ -113,5 +112,4 @@ public class SftpServerTestSupport exten
protected boolean canTest() {
return canTest;
}
-
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteNotStepwiseTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteNotStepwiseTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteNotStepwiseTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteNotStepwiseTest.java Fri Nov 25 23:06:44 2011
@@ -30,9 +30,7 @@ public class SftpSimpleConsumeAbsoluteNo
return new RouteBuilder() {
@Override
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&stepwise=false")
+ from("sftp://localhost:" + getPort() + "/tmp/mytemp?username=admin&password=admin&delay=10s&disconnect=true&stepwise=false")
.routeId("foo").noAutoStartup()
.to("mock:result");
}
Modified: 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/SftpSimpleConsumeAbsoluteTest.java?rev=1206371&r1=1206370&r2=1206371&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/SftpSimpleConsumeAbsoluteTest.java Fri Nov 25 23:06:44 2011
@@ -54,9 +54,7 @@ public class SftpSimpleConsumeAbsoluteTe
return new RouteBuilder() {
@Override
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() + "/tmp/mytemp?username=admin&password=admin&delay=10s&disconnect=true")
.routeId("foo").noAutoStartup()
.to("mock:result");
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeNotStepwiseTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeNotStepwiseTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeNotStepwiseTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeNotStepwiseTest.java Fri Nov 25 23:06:44 2011
@@ -30,7 +30,7 @@ public class SftpSimpleConsumeNotStepwis
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10s&disconnect=true&stepwise=false")
+ from("sftp://localhost:" + getPort() + "/?username=admin&password=admin&delay=10s&disconnect=true&stepwise=false")
.routeId("foo").noAutoStartup()
.to("mock:result");
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveNotStepwiseTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveNotStepwiseTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveNotStepwiseTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveNotStepwiseTest.java Fri Nov 25 23:06:44 2011
@@ -30,7 +30,7 @@ public class SftpSimpleConsumeRecursiveN
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&stepwise=false")
+ from("sftp://localhost:" + getPort() + "/?username=admin&password=admin&delay=10s&disconnect=true&recursive=true&stepwise=false")
.routeId("foo").noAutoStartup()
.to("log:result", "mock:result");
}
Modified: 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/SftpSimpleConsumeRecursiveTest.java?rev=1206371&r1=1206370&r2=1206371&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/SftpSimpleConsumeRecursiveTest.java Fri Nov 25 23:06:44 2011
@@ -53,7 +53,7 @@ public class SftpSimpleConsumeRecursiveT
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() + "/?username=admin&password=admin&delay=10s&disconnect=true&recursive=true")
.routeId("foo").noAutoStartup()
.to("log:result", "mock:result");
}
Modified: 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/SftpSimpleConsumeTest.java?rev=1206371&r1=1206370&r2=1206371&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/SftpSimpleConsumeTest.java Fri Nov 25 23:06:44 2011
@@ -53,7 +53,7 @@ public class SftpSimpleConsumeTest exten
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() + "/?username=admin&password=admin&delay=10s&disconnect=true")
.routeId("foo").noAutoStartup()
.to("mock:result");
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceNotStepwiseTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceNotStepwiseTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceNotStepwiseTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceNotStepwiseTest.java Fri Nov 25 23:06:44 2011
@@ -39,7 +39,7 @@ public class SftpSimpleProduceNotStepwis
return;
}
- template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&stepwise=false", "Hello World", Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/?username=admin&password=admin&stepwise=false", "Hello World", Exchange.FILE_NAME, "hello.txt");
File file = new File(FTP_ROOT_DIR + "/hello.txt").getAbsoluteFile();
assertTrue("File should exist: " + file, file.exists());
@@ -52,7 +52,7 @@ public class SftpSimpleProduceNotStepwis
return;
}
- template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "/mysub?username=admin&password=admin&stepwise=false", "Bye World", Exchange.FILE_NAME, "bye.txt");
+ template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/mysub?username=admin&password=admin&stepwise=false", "Bye World", Exchange.FILE_NAME, "bye.txt");
File file = new File(FTP_ROOT_DIR + "/mysub/bye.txt").getAbsoluteFile();
assertTrue("File should exist: " + file, file.exists());
@@ -65,12 +65,11 @@ public class SftpSimpleProduceNotStepwis
return;
}
- template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "/mysub/myother?username=admin&password=admin&stepwise=false",
+ template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/mysub/myother?username=admin&password=admin&stepwise=false",
"Farewell World", Exchange.FILE_NAME, "farewell.txt");
File file = new File(FTP_ROOT_DIR + "/mysub/myother/farewell.txt").getAbsoluteFile();
assertTrue("File should exist: " + file, file.exists());
assertEquals("Farewell World", context.getTypeConverter().convertTo(String.class, file));
}
-
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceTest.java Fri Nov 25 23:06:44 2011
@@ -39,7 +39,7 @@ public class SftpSimpleProduceTest exten
return;
}
- template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin", "Hello World", Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/?username=admin&password=admin", "Hello World", Exchange.FILE_NAME, "hello.txt");
File file = new File(FTP_ROOT_DIR + "/hello.txt").getAbsoluteFile();
assertTrue("File should exist: " + file, file.exists());
@@ -52,7 +52,7 @@ public class SftpSimpleProduceTest exten
return;
}
- template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "/mysub?username=admin&password=admin", "Bye World", Exchange.FILE_NAME, "bye.txt");
+ template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/mysub?username=admin&password=admin", "Bye World", Exchange.FILE_NAME, "bye.txt");
File file = new File(FTP_ROOT_DIR + "/mysub/bye.txt").getAbsoluteFile();
assertTrue("File should exist: " + file, file.exists());
@@ -65,11 +65,10 @@ public class SftpSimpleProduceTest exten
return;
}
- template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "/mysub/myother?username=admin&password=admin", "Farewell World", Exchange.FILE_NAME, "farewell.txt");
+ template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/mysub/myother?username=admin&password=admin", "Farewell World", Exchange.FILE_NAME, "farewell.txt");
File file = new File(FTP_ROOT_DIR + "/mysub/myother/farewell.txt").getAbsoluteFile();
assertTrue("File should exist: " + file, file.exists());
assertEquals("Farewell World", context.getTypeConverter().convertTo(String.class, file));
}
-
}
Modified: camel/trunk/components/camel-ftp/src/test/resources/users.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/resources/users.properties?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/resources/users.properties (original)
+++ camel/trunk/components/camel-ftp/src/test/resources/users.properties Fri Nov 25 23:06:44 2011
@@ -1,15 +1,15 @@
ftpserver.user.admin
ftpserver.user.admin.userpassword=admin
-ftpserver.user.admin.homedirectory=./res/home
+ftpserver.user.admin.homedirectory=./target/res/home
ftpserver.user.admin.writepermission=true
ftpserver.user.scott
ftpserver.user.scott.userpassword=tiger
-ftpserver.user.scott.homedirectory=./res/home
+ftpserver.user.scott.homedirectory=./target/res/home
ftpserver.user.scott.writepermission=true
ftpserver.user.dummy
ftpserver.user.dummy.userpassword=foo
-ftpserver.user.dummy.homedirectory=./res/home
+ftpserver.user.dummy.homedirectory=./target/res/home
ftpserver.user.dummy.writepermission=false
ftpserver.user.anonymous
-ftpserver.user.anonymous.homedirectory=./res/home
+ftpserver.user.anonymous.homedirectory=./target/res/home
ftpserver.user.anonymous.writepermission=false