camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject svn commit: r1206371 [1/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/
Date Fri, 25 Nov 2011 23:07:22 GMT
Author: hadrian
Date: Fri Nov 25 23:06:44 2011
New Revision: 1206371

URL: http://svn.apache.org/viewvc?rev=1206371&view=rev
Log:
Update tests to only produce output in the target directory

Added:
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempFileExistIssueTest.java
      - copied, changed from r1206116, camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProdcerTempFileExistIssueTest.java
Removed:
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProdcerTempFileExistIssueTest.java
Modified:
    camel/trunk/components/camel-ftp/pom.xml
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpTempFileNameTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpDefaultRootRenameStrategyTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpAsyncProcessTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDeleteFileTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDoNotDeleteFileIfProcessFailsTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadNoneStrategyTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileAbsoluteFolderRecursiveTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileRecursiveTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoEndpointPathRelativeMoveToAbsoluteTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveDeleteTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFileExpressionTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveNoopTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNoopTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToRelativeTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToAbsoluteTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToRelativeTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpThirdPoolOkTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpAnonymousTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBrowsableEndpointTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedReadLockTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedReadLockTimeoutTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAsyncStressTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMoveExpressionTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerTemplateTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpLoginTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollingConsumerTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerBuildDirectoryTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerBuildPartOfDirectoryTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerConcurrentTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDoneFileNameTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistAppendNoFileBeforeTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistAppendTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistFailTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistIgnoreTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideNoFileBeforeTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideTwoUploadTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathNoStepwiseTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorAutoNoStepwiseTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorUnixNoStepwiseTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorWindowsNoStepwiseTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerMultipleSiteCommandTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRecipientListTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRootFileExistFailTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerSiteCommandTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempPrefixTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptServerStoppedTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteNotStepwiseTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeNotStepwiseTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveNotStepwiseTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceNotStepwiseTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceTest.java
    camel/trunk/components/camel-ftp/src/test/resources/users.properties

Modified: camel/trunk/components/camel-ftp/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/pom.xml?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/pom.xml (original)
+++ camel/trunk/components/camel-ftp/pom.xml Fri Nov 25 23:06:44 2011
@@ -128,19 +128,4 @@
           </systemPropertyVariables>
         </configuration>
       </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>${basedir}/res</directory>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpTempFileNameTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpTempFileNameTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpTempFileNameTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpTempFileNameTest.java Fri Nov 25 23:06:44 2011
@@ -36,7 +36,7 @@ public class FileToFtpTempFileNameTest e
 
         assertTrue(notify.matchesMockWaitTime());
 
-        File file = new File(FTP_ROOT_DIR + "out/sub/hello.txt");
+        File file = new File(FTP_ROOT_DIR + "/out/sub/hello.txt");
         assertTrue("File should exists " + file, file.exists());
     }
 
@@ -47,7 +47,7 @@ public class FileToFtpTempFileNameTest e
             public void configure() throws Exception {
                 from("file://target/in?recursive=true")
                     .to("ftp://admin:admin@localhost:" + getPort()
-                        + "//out/?fileName=${file:name}&tempFileName=${file:onlyname}.part&stepwise=false");
+                        + "/out/?fileName=${file:name}&tempFileName=${file:onlyname}.part&stepwise=false");
             }
         };
     }

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpDefaultRootRenameStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpDefaultRootRenameStrategyTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpDefaultRootRenameStrategyTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpDefaultRootRenameStrategyTest.java Fri Nov 25 23:06:44 2011
@@ -54,7 +54,7 @@ public class FromFileToFtpDefaultRootRen
 
     @Test
     public void testFromFileToFtp() throws Exception {
-        File expectedOnFtpServer = new File(FTP_ROOT_DIR + "logo.jpeg");
+        File expectedOnFtpServer = new File(FTP_ROOT_DIR + "/logo.jpeg");
         // the poller won't start for 1.5 seconds, so we check to make sure the file
         // is there first check 1 - is the file there (default root location)
         assertTrue(expectedOnFtpServer.exists());

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpAsyncProcessTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpAsyncProcessTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpAsyncProcessTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpAsyncProcessTest.java Fri Nov 25 23:06:44 2011
@@ -37,8 +37,8 @@ public class FromFtpAsyncProcessTest ext
 
     @Test
     public void testFtpAsyncProcess() throws Exception {
-        template.sendBodyAndHeader("file:res/home/async", "Hello World", Exchange.FILE_NAME, "hello.txt");
-        template.sendBodyAndHeader("file:res/home/async", "Bye World", Exchange.FILE_NAME, "bye.txt");
+        template.sendBodyAndHeader("file:" + FTP_ROOT_DIR + "/async", "Hello World", Exchange.FILE_NAME, "hello.txt");
+        template.sendBodyAndHeader("file:" + FTP_ROOT_DIR + "/async", "Bye World", Exchange.FILE_NAME, "bye.txt");
 
         getMockEndpoint("mock:result").expectedMessageCount(2);
         getMockEndpoint("mock:result").expectedHeaderReceived("foo", 123);
@@ -53,10 +53,10 @@ public class FromFtpAsyncProcessTest ext
         // give time for files to be deleted on ftp server
         Thread.sleep(1000);
 
-        File hello = new File("res/home/async/hello.txt");
+        File hello = new File(FTP_ROOT_DIR + "/async/hello.txt");
         assertFalse("File should not exist " + hello, hello.exists());
 
-        File bye = new File("res/home/async/bye.txt");
+        File bye = new File(FTP_ROOT_DIR + "/async/bye.txt");
         assertFalse("File should not exist " + bye, bye.exists());
     }
 
@@ -98,6 +98,4 @@ public class FromFtpAsyncProcessTest ext
             // noop
         }
     }
-
-
 }

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDeleteFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDeleteFileTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDeleteFileTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDeleteFileTest.java Fri Nov 25 23:06:44 2011
@@ -53,7 +53,7 @@ public class FromFtpDeleteFileTest exten
         Thread.sleep(500);
 
         // assert the file is deleted
-        File file = new File(FTP_ROOT_DIR + "deletefile/hello.txt");
+        File file = new File(FTP_ROOT_DIR + "/deletefile/hello.txt");
         file = file.getAbsoluteFile();
         assertFalse("The file should have been deleted", file.exists());
     }
@@ -71,7 +71,7 @@ public class FromFtpDeleteFileTest exten
         producer.stop();
 
         // assert file is created
-        File file = new File(FTP_ROOT_DIR + "deletefile/hello.txt");
+        File file = new File(FTP_ROOT_DIR + "/deletefile/hello.txt");
         file = file.getAbsoluteFile();
         assertTrue("The file should exists", file.exists());
     }

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDoNotDeleteFileIfProcessFailsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDoNotDeleteFileIfProcessFailsTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDoNotDeleteFileIfProcessFailsTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDoNotDeleteFileIfProcessFailsTest.java Fri Nov 25 23:06:44 2011
@@ -55,7 +55,7 @@ public class FromFtpDoNotDeleteFileIfPro
         Thread.sleep(200);
 
         // assert the file is deleted
-        File file = new File("./res/home/deletefile/hello.txt");
+        File file = new File(FTP_ROOT_DIR + "/deletefile/hello.txt");
         file = file.getAbsoluteFile();
         assertTrue("The file should NOT have been deleted", file.exists());
     }
@@ -73,7 +73,7 @@ public class FromFtpDoNotDeleteFileIfPro
         producer.stop();
 
         // assert file is created
-        File file = new File("./res/home/deletefile/hello.txt");
+        File file = new File(FTP_ROOT_DIR + "/deletefile/hello.txt");
         file = file.getAbsoluteFile();
         assertTrue("The file should exists", file.exists());
     }

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadNoneStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadNoneStrategyTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadNoneStrategyTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadNoneStrategyTest.java Fri Nov 25 23:06:44 2011
@@ -62,7 +62,7 @@ public class FromFtpExclusiveReadNoneStr
         context.start();
 
         deleteDirectory(FTP_ROOT_DIR);
-        createDirectory(FTP_ROOT_DIR + "slowfile");
+        createDirectory(FTP_ROOT_DIR + "/slowfile");
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(1);
 
@@ -82,7 +82,7 @@ public class FromFtpExclusiveReadNoneStr
 
         public void process(Exchange exchange) throws Exception {
             LOG.info("Creating a slow file ...");
-            File file = new File(FTP_ROOT_DIR + "slowfile/hello.txt");
+            File file = new File(FTP_ROOT_DIR + "/slowfile/hello.txt");
             FileOutputStream fos = new FileOutputStream(file);
             FileLock lock = fos.getChannel().lock();
             fos.write("Hello World".getBytes());

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileAbsoluteFolderRecursiveTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileAbsoluteFolderRecursiveTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileAbsoluteFolderRecursiveTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileAbsoluteFolderRecursiveTest.java Fri Nov 25 23:06:44 2011
@@ -43,9 +43,9 @@ public class FromFtpMoveFileAbsoluteFold
     public void testPollFileAndShouldBeMoved() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedBodiesReceivedInAnyOrder("Hello", "Bye", "Goodday");
-        mock.expectedFileExists(FTP_ROOT_DIR + ".done/hello.txt.old");
-        mock.expectedFileExists(FTP_ROOT_DIR + ".done/bye/bye.txt.old");
-        mock.expectedFileExists(FTP_ROOT_DIR + ".done/goodday/goodday.txt.old");
+        mock.expectedFileExists(FTP_ROOT_DIR + "/.done/hello.txt.old");
+        mock.expectedFileExists(FTP_ROOT_DIR + "/.done/bye/bye.txt.old");
+        mock.expectedFileExists(FTP_ROOT_DIR + "/.done/goodday/goodday.txt.old");
 
         mock.assertIsSatisfied();
     }

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixTest.java Fri Nov 25 23:06:44 2011
@@ -48,7 +48,7 @@ public class FromFtpMoveFilePostfixTest 
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(1);
         mock.expectedBodiesReceived("Hello World this file will be moved");
-        mock.expectedFileExists(FTP_ROOT_DIR + "movefile/hello.txt.old");
+        mock.expectedFileExists(FTP_ROOT_DIR + "/movefile/hello.txt.old");
 
         mock.assertIsSatisfied();
     }
@@ -66,7 +66,7 @@ public class FromFtpMoveFilePostfixTest 
         producer.stop();
 
         // assert file is created
-        File file = new File(FTP_ROOT_DIR + "movefile/hello.txt");
+        File file = new File(FTP_ROOT_DIR + "/movefile/hello.txt");
         file = file.getAbsoluteFile();
         assertTrue("The file should exists", file.exists());
     }

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixTest.java Fri Nov 25 23:06:44 2011
@@ -48,7 +48,7 @@ public class FromFtpMoveFilePrefixTest e
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(1);
         mock.expectedBodiesReceived("Hello World this file will be moved");
-        mock.expectedFileExists(FTP_ROOT_DIR + "movefile/done/hello.txt");
+        mock.expectedFileExists(FTP_ROOT_DIR + "/movefile/done/hello.txt");
 
         mock.assertIsSatisfied();
     }
@@ -66,7 +66,7 @@ public class FromFtpMoveFilePrefixTest e
         producer.stop();
 
         // assert file is created
-        File file = new File(FTP_ROOT_DIR + "movefile/hello.txt");
+        File file = new File(FTP_ROOT_DIR + "/movefile/hello.txt");
         file = file.getAbsoluteFile();
         assertTrue("The file should exists", file.exists());
     }

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileRecursiveTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileRecursiveTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileRecursiveTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileRecursiveTest.java Fri Nov 25 23:06:44 2011
@@ -43,9 +43,9 @@ public class FromFtpMoveFileRecursiveTes
     public void testPollFileAndShouldBeMoved() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedBodiesReceivedInAnyOrder("Hello", "Bye", "Goodday");
-        mock.expectedFileExists(FTP_ROOT_DIR + "movefile/.done/hello.txt.old");
-        mock.expectedFileExists(FTP_ROOT_DIR + "movefile/.done/bye/bye.txt.old");
-        mock.expectedFileExists(FTP_ROOT_DIR + "movefile/.done/goodday/goodday.txt.old");
+        mock.expectedFileExists(FTP_ROOT_DIR + "/movefile/.done/hello.txt.old");
+        mock.expectedFileExists(FTP_ROOT_DIR + "/movefile/.done/bye/bye.txt.old");
+        mock.expectedFileExists(FTP_ROOT_DIR + "/movefile/.done/goodday/goodday.txt.old");
 
         mock.assertIsSatisfied();
     }

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileTest.java Fri Nov 25 23:06:44 2011
@@ -48,7 +48,7 @@ public class FromFtpMoveFileTest extends
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(1);
         mock.expectedBodiesReceived("Hello World this file will be moved");
-        mock.expectedFileExists(FTP_ROOT_DIR + "movefile/done/sub2/hello.txt.old");
+        mock.expectedFileExists(FTP_ROOT_DIR + "/movefile/done/sub2/hello.txt.old");
 
         mock.assertIsSatisfied();
     }
@@ -66,7 +66,7 @@ public class FromFtpMoveFileTest extends
         producer.stop();
 
         // assert file is created
-        File file = new File(FTP_ROOT_DIR + "movefile/hello.txt");
+        File file = new File(FTP_ROOT_DIR + "/movefile/hello.txt");
         file = file.getAbsoluteFile();        
         assertTrue("The file should exists", file.exists());
     }

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java Fri Nov 25 23:06:44 2011
@@ -43,9 +43,9 @@ public class FromFtpMoveFileToHiddenFold
     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 + "bye/.done/bye.txt");
-        mock.expectedFileExists(FTP_ROOT_DIR + "goodday/.done/goodday.txt");
+        mock.expectedFileExists(FTP_ROOT_DIR + "/.done/hello.txt");
+        mock.expectedFileExists(FTP_ROOT_DIR + "/bye/.done/bye.txt");
+        mock.expectedFileExists(FTP_ROOT_DIR + "/goodday/.done/goodday.txt");
 
         mock.assertIsSatisfied();
     }

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoEndpointPathRelativeMoveToAbsoluteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoEndpointPathRelativeMoveToAbsoluteTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoEndpointPathRelativeMoveToAbsoluteTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoEndpointPathRelativeMoveToAbsoluteTest.java Fri Nov 25 23:06:44 2011
@@ -43,9 +43,9 @@ public class FromFtpNoEndpointPathRelati
     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/sub/bye.txt");
-        mock.expectedFileExists(FTP_ROOT_DIR + ".done/sub/sub2/goodday.txt");
+        mock.expectedFileExists(FTP_ROOT_DIR + "/.done/hello.txt");
+        mock.expectedFileExists(FTP_ROOT_DIR + "/.done/sub/bye.txt");
+        mock.expectedFileExists(FTP_ROOT_DIR + "/.done/sub/sub2/goodday.txt");
 
         mock.assertIsSatisfied();
     }

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java Fri Nov 25 23:06:44 2011
@@ -51,7 +51,7 @@ public class FromFtpNoopTest extends Ftp
         mock.assertIsSatisfied();
 
         // assert the file is still there
-        File file = new File(FTP_ROOT_DIR + "noop/hello.txt");
+        File file = new File(FTP_ROOT_DIR + "/noop/hello.txt");
         file = file.getAbsoluteFile();
         assertTrue("The file should exists", file.exists());
     }

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveDeleteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveDeleteTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveDeleteTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveDeleteTest.java Fri Nov 25 23:06:44 2011
@@ -53,7 +53,7 @@ public class FromFtpPreMoveDeleteTest ex
 
         // and file should be deleted
         Thread.sleep(1000);
-        File file = new File(FTP_ROOT_DIR + "movefile/work/hello.txt");
+        File file = new File(FTP_ROOT_DIR + "/movefile/work/hello.txt");
         file = file.getAbsoluteFile();
         assertFalse("The file should have been deleted", file.exists());
     }
@@ -77,7 +77,7 @@ public class FromFtpPreMoveDeleteTest ex
                 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 = new File(FTP_ROOT_DIR + "/movefile/work/hello.txt");
                         file = file.getAbsoluteFile();
                         assertTrue("The file should have been moved", file.exists());
                     }

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFileExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFileExpressionTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFileExpressionTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFileExpressionTest.java Fri Nov 25 23:06:44 2011
@@ -66,7 +66,7 @@ public class FromFtpPreMoveFileExpressio
         producer.stop();
 
         // assert file is created
-        File file = new File(FTP_ROOT_DIR + "movefile/hello.txt");
+        File file = new File(FTP_ROOT_DIR + "/movefile/hello.txt");
         file = file.getAbsoluteFile();
         assertTrue("The file should exists", file.exists());
     }
@@ -77,7 +77,7 @@ public class FromFtpPreMoveFileExpressio
                 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 + "inprogress/hello.bak");
+                        File file = new File(FTP_ROOT_DIR + "/inprogress/hello.bak");
                         file = file.getAbsoluteFile();
                         assertTrue("The file should have been moved", file.exists());
                     }

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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -52,7 +52,7 @@ public class FromFtpPreMoveFilePostfixTe
         mock.assertIsSatisfied();
 
         // assert the file is moved
-        File file = new File(FTP_ROOT_DIR + "movefile/hello.txt.old");
+        File file = new File(FTP_ROOT_DIR + "/movefile/hello.txt.old");
         file = file.getAbsoluteFile();
         assertTrue("The file should have been moved", file.exists());
     }
@@ -70,7 +70,7 @@ public class FromFtpPreMoveFilePostfixTe
         producer.stop();
 
         // assert file is created
-        File file = new File(FTP_ROOT_DIR + "movefile/hello.txt");
+        File file = new File(FTP_ROOT_DIR + "/movefile/hello.txt");
         file = file.getAbsoluteFile();
         assertTrue("The file should exists", file.exists());
     }

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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -52,7 +52,7 @@ public class FromFtpPreMoveFilePrefixTes
         mock.assertIsSatisfied();
 
         // assert the file is moved
-        File file = new File(FTP_ROOT_DIR + "movefile/done/hello.txt");
+        File file = new File(FTP_ROOT_DIR + "/movefile/done/hello.txt");
         file = file.getAbsoluteFile();
         assertTrue("The file should have been moved", file.exists());
     }
@@ -70,7 +70,7 @@ public class FromFtpPreMoveFilePrefixTes
         producer.stop();
 
         // assert file is created
-        File file = new File(FTP_ROOT_DIR + "movefile/hello.txt");
+        File file = new File(FTP_ROOT_DIR + "/movefile/hello.txt");
         file = file.getAbsoluteFile();
         assertTrue("The file should exists", file.exists());
     }

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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -53,7 +53,7 @@ public class FromFtpPreMoveNoopTest exte
 
         // and file should be kept there
         Thread.sleep(1000);
-        File file = new File(FTP_ROOT_DIR + "movefile/work/hello.txt");
+        File file = new File(FTP_ROOT_DIR + "/movefile/work/hello.txt");
         file = file.getAbsoluteFile();
         assertTrue("The file should exists", file.exists());
     }
@@ -77,7 +77,7 @@ public class FromFtpPreMoveNoopTest exte
                 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 = new File(FTP_ROOT_DIR + "/movefile/work/hello.txt");
                         file = file.getAbsoluteFile();
                         assertTrue("The file should have been moved", file.exists());
                     }

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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -70,5 +70,4 @@ public class FromFtpRecursiveNoopTest ex
             }
         };
     }
-
 }

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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -43,9 +43,9 @@ public class FromFtpSimpleNoEndpointPath
     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.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();
     }

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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -43,9 +43,9 @@ public class FromFtpSimpleNoEndpointPath
     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.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();
     }

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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -43,9 +43,9 @@ public class FromFtpSimpleRelativeMoveTo
     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.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();
     }

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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -43,9 +43,9 @@ public class FromFtpSimpleRelativeMoveTo
     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.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();
     }

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpThirdPoolOkTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpThirdPoolOkTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpThirdPoolOkTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpThirdPoolOkTest.java Fri Nov 25 23:06:44 2011
@@ -59,7 +59,7 @@ public class FromFtpThirdPoolOkTest exte
         assertEquals(3, counter);
 
         // assert the file is deleted
-        File file = new File("./res/home/thirdpool/hello.txt");
+        File file = new File(FTP_ROOT_DIR + "/thirdpool/hello.txt");
         file = file.getAbsoluteFile();
         assertFalse("The file should have been deleted", file.exists());
     }
@@ -76,7 +76,7 @@ public class FromFtpThirdPoolOkTest exte
                         counter++;
                         if (counter < 3) {
                             // file should exists
-                            File file = new File("./res/home/thirdpool/hello.txt");
+                            File file = new File(FTP_ROOT_DIR + "/thirdpool/hello.txt");
                             file = file.getAbsoluteFile();
                             assertTrue("The file should NOT have been deleted", file.exists());
                             throw new IllegalArgumentException("Forced by unittest");

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpAnonymousTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpAnonymousTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpAnonymousTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpAnonymousTest.java Fri Nov 25 23:06:44 2011
@@ -26,12 +26,12 @@ import org.junit.Test;
  */
 public class FtpAnonymousTest extends FtpServerTestSupport {
 
-    private String getFtpUrl() {
-        return "ftp://localhost:" + getPort();
-    }
-
-    private String getAdminFtpUrl() {
-        return "ftp://admin@localhost:" + getPort() + "?password=admin";
+    private String getFtpUrl(String user, String password) {
+        StringBuilder url = new StringBuilder("ftp://");
+        url.append(user == null ? "" : user + "@");
+        url.append("localhost:" + getPort() + "/");
+        url.append(password == null ? "" : "?password=" + password);
+        return url.toString();
     }
 
     @Override
@@ -50,13 +50,13 @@ public class FtpAnonymousTest extends Ft
     }
 
     private void prepareFtpServer() throws Exception {
-        sendFile(getAdminFtpUrl(), "Hello World", "hello.xml");
+        sendFile(getFtpUrl("admin", "admin"), "Hello World", "hello.xml");
     }
 
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from(getFtpUrl()).to("mock:result");
+                from(getFtpUrl(null, null)).to("mock:result");
             }
         };
     }

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBrowsableEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBrowsableEndpointTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBrowsableEndpointTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBrowsableEndpointTest.java Fri Nov 25 23:06:44 2011
@@ -41,7 +41,7 @@ public class FtpBrowsableEndpointTest ex
     @Test
     public void testBrowsableNoFiles() throws Exception {
         // make sure starting directory exists
-        createDirectory(FTP_ROOT_DIR + "browse");
+        createDirectory(FTP_ROOT_DIR + "/browse");
 
         BrowsableEndpoint browse = context.getEndpoint(getFtpUrl(), BrowsableEndpoint.class);
         assertNotNull(browse);
@@ -72,7 +72,7 @@ public class FtpBrowsableEndpointTest ex
         assertEquals(0, repo.getCacheSize());
 
         // and the file is still there
-        File file = new File(FTP_ROOT_DIR + "browse/a.txt");
+        File file = new File(FTP_ROOT_DIR + "/browse/a.txt");
         assertTrue("File should exist " + file, file.exists());
     }
 
@@ -99,9 +99,9 @@ public class FtpBrowsableEndpointTest ex
         assertEquals(0, repo.getCacheSize());
 
         // and the files is still there
-        File fileA = new File(FTP_ROOT_DIR + "browse/a.txt");
+        File fileA = new File(FTP_ROOT_DIR + "/browse/a.txt");
         assertTrue("File should exist " + fileA, fileA.exists());
-        File fileB = new File(FTP_ROOT_DIR + "browse/b.txt");
+        File fileB = new File(FTP_ROOT_DIR + "/browse/b.txt");
         assertTrue("File should exist " + fileB, fileB.exists());
     }
 
@@ -130,12 +130,11 @@ public class FtpBrowsableEndpointTest ex
         assertEquals(0, repo.getCacheSize());
 
         // and the files is still there
-        File fileA = new File(FTP_ROOT_DIR + "browse/a.txt");
+        File fileA = new File(FTP_ROOT_DIR + "/browse/a.txt");
         assertTrue("File should exist " + fileA, fileA.exists());
-        File fileB = new File(FTP_ROOT_DIR + "browse/foo/b.txt");
+        File fileB = new File(FTP_ROOT_DIR + "/browse/foo/b.txt");
         assertTrue("File should exist " + fileB, fileB.exists());
-        File fileC = new File(FTP_ROOT_DIR + "browse/bar/c.txt");
+        File fileC = new File(FTP_ROOT_DIR + "/browse/bar/c.txt");
         assertTrue("File should exist " + fileC, fileC.exists());
     }
-
 }
\ No newline at end of file

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedReadLockTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedReadLockTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedReadLockTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedReadLockTest.java Fri Nov 25 23:06:44 2011
@@ -58,7 +58,7 @@ public class FtpChangedReadLockTest exte
         LOG.debug("Writing slow file...");
 
         createDirectory(FTP_ROOT_DIR + "/changed");
-        FileOutputStream fos = new FileOutputStream(FTP_ROOT_DIR + "changed/slowfile.dat", true);
+        FileOutputStream fos = new FileOutputStream(FTP_ROOT_DIR + "/changed/slowfile.dat", true);
         for (int i = 0; i < 20; i++) {
             fos.write(("Line " + i + LS).getBytes());
             LOG.debug("Writing line " + i);

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedReadLockTimeoutTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedReadLockTimeoutTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedReadLockTimeoutTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedReadLockTimeoutTest.java Fri Nov 25 23:06:44 2011
@@ -25,5 +25,4 @@ public class FtpChangedReadLockTimeoutTe
         // will timeout, but the scheduler will pickup the file later
         return super.getFtpUrl() + "&readLockTimeout=2500";
     }
-
 }

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAsyncStressTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAsyncStressTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAsyncStressTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAsyncStressTest.java Fri Nov 25 23:06:44 2011
@@ -41,7 +41,7 @@ public class FtpConsumerAsyncStressTest 
     public void setUp() throws Exception {
         super.setUp();
         for (int i = 0; i < files; i++) {
-            template.sendBodyAndHeader("file://" + FTP_ROOT_DIR + "filestress", "Hello World", Exchange.FILE_NAME, i + ".txt");
+            template.sendBodyAndHeader("file://" + FTP_ROOT_DIR + "/filestress", "Hello World", Exchange.FILE_NAME, i + ".txt");
         }
     }
 

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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -62,7 +62,7 @@ public class FtpConsumerMoveExpressionTe
         Thread.sleep(1000);
 
         String now = new SimpleDateFormat("yyyyMMdd").format(new Date());
-        File file = new File(FTP_ROOT_DIR + "filelanguage/backup/" + now + "/123-report2.bak");
+        File file = new File(FTP_ROOT_DIR + "/filelanguage/backup/" + now + "/123-report2.bak");
         file = file.getAbsoluteFile();
         assertTrue("File should have been renamed", file.exists());
     }

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerTemplateTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerTemplateTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerTemplateTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerTemplateTest.java Fri Nov 25 23:06:44 2011
@@ -65,7 +65,7 @@ public class FtpConsumerTemplateTest ext
 
         // file should still exists
         Thread.sleep(500);
-        File file = new File(FTP_ROOT_DIR + "template/hello.txt");
+        File file = new File(FTP_ROOT_DIR + "/template/hello.txt");
         file = file.getAbsoluteFile();
         assertTrue("The file should exist: " + file, file.exists());
     }
@@ -97,7 +97,7 @@ public class FtpConsumerTemplateTest ext
 
         // file should still exists
         Thread.sleep(500);
-        File file = new File(FTP_ROOT_DIR + "template/hello.txt");
+        File file = new File(FTP_ROOT_DIR + "/template/hello.txt");
         file = file.getAbsoluteFile();
         assertTrue("The file should exist: " + file, file.exists());
     }
@@ -113,7 +113,7 @@ public class FtpConsumerTemplateTest ext
         producer.stop();
 
         // assert file is created
-        File file = new File(FTP_ROOT_DIR + "template/hello.txt");
+        File file = new File(FTP_ROOT_DIR + "/template/hello.txt");
         file = file.getAbsoluteFile();
         assertTrue("The file should exist: " + file, file.exists());
     }

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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -40,7 +40,7 @@ public class FtpLoginTest extends FtpSer
         }
 
         // assert file NOT created
-        File file = new File(FTP_ROOT_DIR + "login/report.txt");
+        File file = new File(FTP_ROOT_DIR + "/login/report.txt");
         file = file.getAbsoluteFile();
         assertFalse("The file should NOT exists", file.exists());
     }
@@ -50,7 +50,7 @@ public class FtpLoginTest extends FtpSer
         uploadFile("scott", "tiger");
 
         // assert file created
-        File file = new File(FTP_ROOT_DIR + "login/report.txt");
+        File file = new File(FTP_ROOT_DIR + "/login/report.txt");
         file = file.getAbsoluteFile();
         assertTrue("The file should exists", file.exists());
     }

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollingConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollingConsumerTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollingConsumerTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollingConsumerTest.java Fri Nov 25 23:06:44 2011
@@ -55,7 +55,7 @@ public class FtpPollingConsumerTest exte
         // sleep a bit to ensure polling consumer would not have picked up that file
         Thread.sleep(1000);
 
-        File file = new File(FTP_ROOT_DIR + "polling/bye.txt").getAbsoluteFile();
+        File file = new File(FTP_ROOT_DIR + "/polling/bye.txt").getAbsoluteFile();
         assertTrue("File should exist " + file, file.exists());
 
         consumer.stop();

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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -34,7 +34,7 @@ public class FtpProducerBuildDirectoryTe
     public void testProduceAndBuildFullRemotFolderTest() 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/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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -34,7 +34,7 @@ public class FtpProducerBuildPartOfDirec
     public void testProduceAndBuildPartOfRemotFolderTest() throws Exception {
         sendFile(getFtpUrl(), "Bye 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("Bye World", IOConverter.toString(file, null));

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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -49,7 +49,7 @@ public class FtpProducerConcurrentTest e
 
         ExecutorService executor = Executors.newFixedThreadPool(poolSize);
         for (int i = 0; i < files; i++) {
-            getMockEndpoint("mock:result").expectedFileExists("res/home/concurrent/" + i + ".txt");
+            getMockEndpoint("mock:result").expectedFileExists(FTP_ROOT_DIR + "/concurrent/" + i + ".txt");
 
             final int index = i;
             executor.submit(new Callable<Object>() {

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDoneFileNameTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDoneFileNameTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDoneFileNameTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDoneFileNameTest.java Fri Nov 25 23:06:44 2011
@@ -36,10 +36,10 @@ public class FtpProducerDoneFileNameTest
     public void testProducerConstantDoneFileName() throws Exception {
         template.sendBodyAndHeader(getFtpUrl() + "&doneFileName=done", "Hello World", Exchange.FILE_NAME, "hello.txt");
 
-        File file = new File(FTP_ROOT_DIR + "done/hello.txt").getAbsoluteFile();
+        File file = new File(FTP_ROOT_DIR + "/done/hello.txt").getAbsoluteFile();
         assertEquals("File should exists", true, file.exists());
 
-        File done = new File(FTP_ROOT_DIR + "done/done").getAbsoluteFile();
+        File done = new File(FTP_ROOT_DIR + "/done/done").getAbsoluteFile();
         assertEquals("Done file should exists", true, done.exists());
     }
 
@@ -47,10 +47,10 @@ public class FtpProducerDoneFileNameTest
     public void testProducerPrefixDoneFileName() throws Exception {
         template.sendBodyAndHeader(getFtpUrl() + "&doneFileName=done-${file:name}", "Hello World", Exchange.FILE_NAME, "hello.txt");
 
-        File file = new File(FTP_ROOT_DIR + "done/hello.txt").getAbsoluteFile();
+        File file = new File(FTP_ROOT_DIR + "/done/hello.txt").getAbsoluteFile();
         assertEquals("File should exists", true, file.exists());
 
-        File done = new File(FTP_ROOT_DIR + "done/done-hello.txt").getAbsoluteFile();
+        File done = new File(FTP_ROOT_DIR + "/done/done-hello.txt").getAbsoluteFile();
         assertEquals("Done file should exists", true, done.exists());
     }
 
@@ -58,10 +58,10 @@ public class FtpProducerDoneFileNameTest
     public void testProducerExtDoneFileName() throws Exception {
         template.sendBodyAndHeader(getFtpUrl() + "&doneFileName=${file:name}.done", "Hello World", Exchange.FILE_NAME, "hello.txt");
 
-        File file = new File(FTP_ROOT_DIR + "done/hello.txt").getAbsoluteFile();
+        File file = new File(FTP_ROOT_DIR + "/done/hello.txt").getAbsoluteFile();
         assertEquals("File should exists", true, file.exists());
 
-        File done = new File(FTP_ROOT_DIR + "done/hello.txt.done").getAbsoluteFile();
+        File done = new File(FTP_ROOT_DIR + "/done/hello.txt.done").getAbsoluteFile();
         assertEquals("Done file should exists", true, done.exists());
     }
 
@@ -69,10 +69,10 @@ public class FtpProducerDoneFileNameTest
     public void testProducerReplaceExtDoneFileName() throws Exception {
         template.sendBodyAndHeader(getFtpUrl() + "&doneFileName=${file:name.noext}.done", "Hello World", Exchange.FILE_NAME, "hello.txt");
 
-        File file = new File(FTP_ROOT_DIR + "done/hello.txt").getAbsoluteFile();
+        File file = new File(FTP_ROOT_DIR + "/done/hello.txt").getAbsoluteFile();
         assertEquals("File should exists", true, file.exists());
 
-        File done = new File(FTP_ROOT_DIR + "done/hello.done").getAbsoluteFile();
+        File done = new File(FTP_ROOT_DIR + "/done/hello.done").getAbsoluteFile();
         assertEquals("Done file should exists", true, done.exists());
     }
 

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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -57,14 +57,14 @@ public class FtpProducerExpressionTest e
     public void testProduceBeanByExpression() throws Exception {
         template.sendBody(getFtpUrl() + "&fileName=${bean:myguidgenerator}.bak", "Hello World");
 
-        assertFileExists(FTP_ROOT_DIR + "filelanguage/123.bak");
+        assertFileExists(FTP_ROOT_DIR + "/filelanguage/123.bak");
     }
 
     @Test
     public void testProduceBeanByHeader() throws Exception {
         sendFile(getFtpUrl(), "Hello World", "${bean:myguidgenerator}.bak");
 
-        assertFileExists(FTP_ROOT_DIR + "filelanguage/123.bak");
+        assertFileExists(FTP_ROOT_DIR + "/filelanguage/123.bak");
     }
 
     @Test
@@ -72,7 +72,7 @@ public class FtpProducerExpressionTest e
         sendFile(getFtpUrl(), "Hello World", "myfile-${date:now:yyyyMMdd}.txt");
 
         String date = new SimpleDateFormat("yyyyMMdd").format(new Date());
-        assertFileExists(FTP_ROOT_DIR + "filelanguage/myfile-" + date + ".txt");
+        assertFileExists(FTP_ROOT_DIR + "/filelanguage/myfile-" + date + ".txt");
     }
 
     @Test
@@ -80,7 +80,7 @@ public class FtpProducerExpressionTest e
         template.sendBody(getFtpUrl() + "&fileName=myfile-${date:now:yyyyMMdd}.txt", "Hello World");
 
         String date = new SimpleDateFormat("yyyyMMdd").format(new Date());
-        assertFileExists(FTP_ROOT_DIR + "filelanguage/myfile-" + date + ".txt");
+        assertFileExists(FTP_ROOT_DIR + "/filelanguage/myfile-" + date + ".txt");
     }
 
     @Test
@@ -92,7 +92,7 @@ public class FtpProducerExpressionTest e
         template.sendBody(url + "&fileName=" + expression, "Hello World");
 
         String date = new SimpleDateFormat("yyyyMMdd").format(new Date());
-        assertFileExists(FTP_ROOT_DIR + "filelanguage/filelanguageinbox/myfile-123-" + date + ".txt");
+        assertFileExists(FTP_ROOT_DIR + "/filelanguage/filelanguageinbox/myfile-123-" + date + ".txt");
     }
 
     @Test
@@ -100,7 +100,7 @@ public class FtpProducerExpressionTest e
         template.sendBodyAndHeader(getFtpUrl() + "&fileName=myfile-${in.header.foo}.txt",
                 "Hello World", "foo", "abc");
 
-        assertFileExists(FTP_ROOT_DIR + "filelanguage/myfile-abc.txt");
+        assertFileExists(FTP_ROOT_DIR + "/filelanguage/myfile-abc.txt");
     }
 
     @Test
@@ -112,7 +112,7 @@ public class FtpProducerExpressionTest e
         template.sendBodyAndHeader(getFtpUrl() + "&fileName=mybirthday-${date:in.header.birthday:yyyyMMdd}.txt",
                 "Hello World", "birthday", date);
 
-        assertFileExists(FTP_ROOT_DIR + "filelanguage/mybirthday-19740420.txt");
+        assertFileExists(FTP_ROOT_DIR + "/filelanguage/mybirthday-19740420.txt");
     }
 
     public class MyGuidGenerator {

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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -42,7 +42,7 @@ public class FtpProducerFileExistAppendN
     public void testAppend() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedBodiesReceived("Bye World");
-        mock.expectedFileExists(FTP_ROOT_DIR + "exist/hello.txt", "Bye World");
+        mock.expectedFileExists(FTP_ROOT_DIR + "/exist/hello.txt", "Bye World");
 
         template.sendBodyAndHeader(getFtpUrl(), "Bye World", Exchange.FILE_NAME, "hello.txt");
 

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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -49,7 +49,7 @@ public class FtpProducerFileExistAppendT
             expectBody = "Hello World\r\nBye World";
         }
         mock.expectedBodiesReceived(expectBody);
-        mock.expectedFileExists(FTP_ROOT_DIR + "exist/hello.txt", expectBody);       
+        mock.expectedFileExists(FTP_ROOT_DIR + "/exist/hello.txt", expectBody);       
         template.sendBodyAndHeader(getFtpUrl(), "Bye World", Exchange.FILE_NAME, "hello.txt");
 
         assertMockEndpointsSatisfied();

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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -46,7 +46,7 @@ public class FtpProducerFileExistFailTes
     public void testFail() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedBodiesReceived("Hello World");
-        mock.expectedFileExists(FTP_ROOT_DIR + "exist/hello.txt", "Hello World");
+        mock.expectedFileExists(FTP_ROOT_DIR + "/exist/hello.txt", "Hello World");
 
         try {
             template.sendBodyAndHeader(getFtpUrl(), "Bye World", Exchange.FILE_NAME, "hello.txt");

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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -44,7 +44,7 @@ public class FtpProducerFileExistIgnoreT
     public void testIgnore() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedBodiesReceived("Hello World");
-        mock.expectedFileExists(FTP_ROOT_DIR + "exist/hello.txt", "Hello World");
+        mock.expectedFileExists(FTP_ROOT_DIR + "/exist/hello.txt", "Hello World");
 
         template.sendBodyAndHeader(getFtpUrl(), "Bye World", Exchange.FILE_NAME, "hello.txt");
 

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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -42,7 +42,7 @@ public class FtpProducerFileExistOverrid
     public void testOverride() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedBodiesReceived("Bye World");
-        mock.expectedFileExists(FTP_ROOT_DIR + "exist/hello.txt", "Bye World");
+        mock.expectedFileExists(FTP_ROOT_DIR + "/exist/hello.txt", "Bye World");
 
         template.sendBodyAndHeader(getFtpUrl(), "Bye World", Exchange.FILE_NAME, "hello.txt");
 

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=1206371&r1=1206370&r2=1206371&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 Fri Nov 25 23:06:44 2011
@@ -42,7 +42,7 @@ public class FtpProducerFileExistOverrid
     public void testOverride() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedBodiesReceived("Bye World");
-        mock.expectedFileExists(FTP_ROOT_DIR + "exist/hello.txt", "Bye World");
+        mock.expectedFileExists(FTP_ROOT_DIR + "/exist/hello.txt", "Bye World");
 
         template.sendBodyAndHeader(getFtpUrl(), "Bye World", Exchange.FILE_NAME, "hello.txt");
 

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideTwoUploadTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideTwoUploadTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideTwoUploadTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideTwoUploadTest.java Fri Nov 25 23:06:44 2011
@@ -35,7 +35,7 @@ public class FtpProducerFileExistOverrid
         template.sendBodyAndHeader(getFtpUrl(), "Hello World", Exchange.FILE_NAME, "hello.txt");
 
         // the 1st file should be stored
-        File file = new File(FTP_ROOT_DIR + "exist/hello.txt").getAbsoluteFile();
+        File file = new File(FTP_ROOT_DIR + "/exist/hello.txt").getAbsoluteFile();
         assertTrue(file.exists());
 
         String body = context.getTypeConverter().convertTo(String.class, file);
@@ -47,7 +47,7 @@ public class FtpProducerFileExistOverrid
         template.sendBodyAndHeader(getFtpUrl(), "Bye World", Exchange.FILE_NAME, "hello.txt");
 
         // the 2nd file should also exists as we stored with override
-        file = new File(FTP_ROOT_DIR + "exist/hello.txt").getAbsoluteFile();
+        file = new File(FTP_ROOT_DIR + "/exist/hello.txt").getAbsoluteFile();
         assertTrue(file.exists());
 
         body = context.getTypeConverter().convertTo(String.class, file);

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathNoStepwiseTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathNoStepwiseTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathNoStepwiseTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathNoStepwiseTest.java Fri Nov 25 23:06:44 2011
@@ -31,7 +31,7 @@ public class FtpProducerFileWithPathNoSt
     public void testProducerFileWithPathNoStepwise() throws Exception {
         sendFile(getFtpUrl(), "Hello World", "hello/claus.txt");
 
-        File file = new File(FTP_ROOT_DIR + "upload/hello/claus.txt");
+        File file = new File(FTP_ROOT_DIR + "/upload/hello/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/FtpProducerFileWithPathPathSeparatorAutoNoStepwiseTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorAutoNoStepwiseTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorAutoNoStepwiseTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorAutoNoStepwiseTest.java Fri Nov 25 23:06:44 2011
@@ -39,12 +39,11 @@ public class FtpProducerFileWithPathPath
         });
         assertNotNull(out);
 
-        File file = new File(FTP_ROOT_DIR + "upload/hello/claus.txt");
+        File file = new File(FTP_ROOT_DIR + "/upload/hello/claus.txt");
         file = file.getAbsoluteFile();
         assertTrue("The uploaded file should exists", file.exists());
         assertEquals("Hello World", IOConverter.toString(file, null));
 
         assertEquals("upload/hello/claus.txt", out.getIn().getHeader(Exchange.FILE_NAME_PRODUCED));
     }
-
 }
\ No newline at end of file

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorUnixNoStepwiseTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorUnixNoStepwiseTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorUnixNoStepwiseTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorUnixNoStepwiseTest.java Fri Nov 25 23:06:44 2011
@@ -39,7 +39,7 @@ public class FtpProducerFileWithPathPath
         });
         assertNotNull(out);
 
-        File file = new File(FTP_ROOT_DIR + "upload/hello/claus.txt");
+        File file = new File(FTP_ROOT_DIR + "/upload/hello/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/FtpProducerFileWithPathPathSeparatorWindowsNoStepwiseTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorWindowsNoStepwiseTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorWindowsNoStepwiseTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorWindowsNoStepwiseTest.java Fri Nov 25 23:06:44 2011
@@ -39,7 +39,7 @@ public class FtpProducerFileWithPathPath
         });
         assertNotNull(out);
 
-        File file = new File(FTP_ROOT_DIR + "upload/hello/claus.txt");
+        File file = new File(FTP_ROOT_DIR + "/upload/hello/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/FtpProducerFileWithPathTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathTest.java Fri Nov 25 23:06:44 2011
@@ -31,7 +31,7 @@ public class FtpProducerFileWithPathTest
     public void testProducerFileWithPath() throws Exception {
         sendFile(getFtpUrl(), "Hello World", "hello/claus.txt");
 
-        File file = new File(FTP_ROOT_DIR + "upload/hello/claus.txt");
+        File file = new File(FTP_ROOT_DIR + "/upload/hello/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/FtpProducerMultipleSiteCommandTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerMultipleSiteCommandTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerMultipleSiteCommandTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerMultipleSiteCommandTest.java Fri Nov 25 23:06:44 2011
@@ -44,7 +44,7 @@ public class FtpProducerMultipleSiteComm
     public void testSiteCommands() 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));

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRecipientListTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRecipientListTest.java?rev=1206371&r1=1206370&r2=1206371&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRecipientListTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRecipientListTest.java Fri Nov 25 23:06:44 2011
@@ -33,13 +33,13 @@ public class FtpProducerRecipientListTes
         template.sendBodyAndHeader("direct:start", "Bye World", "foo", getFtpUrl() + "&fileName=bye.txt");
         template.sendBodyAndHeader("direct:start", "Hi World", "foo", getFtpUrl() + "&fileName=hi.txt");
 
-        File file1 = new File(FTP_ROOT_DIR + "list/hello.txt").getAbsoluteFile();
+        File file1 = new File(FTP_ROOT_DIR + "/list/hello.txt").getAbsoluteFile();
         assertTrue("File should exists " + file1, file1.exists());
 
-        File file2 = new File(FTP_ROOT_DIR + "list/bye.txt").getAbsoluteFile();
+        File file2 = new File(FTP_ROOT_DIR + "/list/bye.txt").getAbsoluteFile();
         assertTrue("File should exists " + file2, file1.exists());
 
-        File file3 = new File(FTP_ROOT_DIR + "list/hi.txt").getAbsoluteFile();
+        File file3 = new File(FTP_ROOT_DIR + "/list/hi.txt").getAbsoluteFile();
         assertTrue("File should exists " + file3, file1.exists());
     }
 



Mime
View raw message