svn commit: r781245 - in /camel/trunk/components/camel-ftp/src: main/java/org/apache/camel/component/file/remote/SftpOperations.java test/java/org/apache/camel/component/file/remote/FtpProducerFileExistAppendTest.java

[ningjiang]

Author: ningjiang
Date: Wed Jun  3 03:17:16 2009
New Revision: 781245

URL: http://svn.apache.org/viewvc?rev=781245&view=rev
Log:
Fixed the unit test error of FtpProducerFileExistAppendTest on windows, and a 
simple CS error

Modified:
    
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
    
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistAppendTest.java

Modified: 
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java?rev=781245&r1=781244&r2=781245&view=diff
==============================================================================
--- 
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
 (original)
+++ 
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
 Wed Jun  3 03:17:16 2009
@@ -16,13 +16,6 @@
  */
 package org.apache.camel.component.file.remote;
 
-import com.jcraft.jsch.ChannelSftp;
-import com.jcraft.jsch.JSch;
-import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.Session;
-import com.jcraft.jsch.SftpException;
-import com.jcraft.jsch.UserInfo;
-
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -33,6 +26,13 @@
 import java.util.List;
 import java.util.Vector;
 
+import com.jcraft.jsch.ChannelSftp;
+import com.jcraft.jsch.JSch;
+import com.jcraft.jsch.JSchException;
+import com.jcraft.jsch.Session;
+import com.jcraft.jsch.SftpException;
+import com.jcraft.jsch.UserInfo;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.InvalidPayloadException;
 import org.apache.camel.component.file.GenericFile;

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=781245&r1=781244&r2=781245&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
 Wed Jun  3 03:17:16 2009
@@ -24,6 +24,7 @@
  * @version $Revision$
  */
 public class FtpProducerFileExistAppendTest extends FtpServerTestSupport {
+    private static final boolean ON_WINDOWS = 
System.getProperty("os.name").startsWith("Windows");
 
     private String getFtpUrl() {
         return "ftp://ad...@localhost:"; + getPort() + 
"/exist?password=admin&delay=2000&noop=true&fileExist=Append";
@@ -40,9 +41,12 @@
 
     public void testAppend() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedBodiesReceived("Hello World\nBye World");
-        mock.expectedFileExists(FTP_ROOT_DIR + "exist/hello.txt", "Hello 
World\nBye World");
-
+        String expectBody = "Hello World\nBye World";
+        if (ON_WINDOWS) {
+            expectBody = "Hello World\r\nBye World";
+        }
+        mock.expectedBodiesReceived(expectBody);
+        mock.expectedFileExists(FTP_ROOT_DIR + "exist/hello.txt", expectBody); 
      
         template.sendBodyAndHeader(getFtpUrl(), "Bye World", 
Exchange.FILE_NAME, "hello.txt");
 
         assertMockEndpointsSatisfied();