You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/05/12 06:39:35 UTC
svn commit: r943370 - in /camel/trunk: camel-core/src/test/java/org/apache/camel/component/file/FileConsumerRelativeFileNameTest.java components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerRelativeFileNameTest.java

Author: davsclaus
Date: Wed May 12 04:39:35 2010
New Revision: 943370

URL: http://svn.apache.org/viewvc?rev=943370&view=rev
Log:
Fixed tests when run on Windows due different path separator.

Modified:
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerRelativeFileNameTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerRelativeFileNameTest.java

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerRelativeFileNameTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerRelativeFileNameTest.java?rev=943370&r1=943369&r2=943370&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerRelativeFileNameTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerRelativeFileNameTest.java Wed May 12 04:39:35 2010
@@ -42,11 +42,12 @@ public class FileConsumerRelativeFileNam
         mock.expectedMessageCount(2);
         // should have file name header set
         mock.allMessages().header(Exchange.FILE_NAME).isNotNull();
-        // and expect name to contain target/filename-consumer-XXX.txt
-        mock.message(0).header(Exchange.FILE_NAME).isEqualTo("target/filename-consumer-bye.txt");
-        mock.message(1).header(Exchange.FILE_NAME).isEqualTo("target/filename-consumer-hello.txt");
 
         assertMockEndpointsSatisfied();
+
+        // and expect name to contain target/filename-consumer-XXX.txt
+        assertDirectoryEquals("target/filename-consumer-bye.txt", mock.getReceivedExchanges().get(0).getIn().getHeader(Exchange.FILE_NAME, String.class));
+        assertDirectoryEquals("target/filename-consumer-hello.txt", mock.getReceivedExchanges().get(1).getIn().getHeader(Exchange.FILE_NAME, String.class));
     }
 
     @Override

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerRelativeFileNameTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerRelativeFileNameTest.java?rev=943370&r1=943369&r2=943370&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerRelativeFileNameTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerRelativeFileNameTest.java Wed May 12 04:39:35 2010
@@ -50,14 +50,15 @@ public class FtpConsumerRelativeFileName
         mock.expectedMessageCount(2);
         // should have file name header set
         mock.allMessages().header(Exchange.FILE_NAME).isNotNull();
-        // and expect name to contain target/filename-consumer-XXX.txt
-        mock.message(0).header(Exchange.FILE_NAME).isEqualTo("target/filename-consumer-bye.txt");
-        mock.message(1).header(Exchange.FILE_NAME).isEqualTo("target/filename-consumer-hello.txt");
 
         assertMockEndpointsSatisfied();
 
         // give time for ftp consumer to disconnect
         Thread.sleep(2000);
+
+        // and expect name to contain target/filename-consumer-XXX.txt
+        assertDirectoryEquals("target/filename-consumer-bye.txt", mock.getReceivedExchanges().get(0).getIn().getHeader(Exchange.FILE_NAME, String.class));
+        assertDirectoryEquals("target/filename-consumer-hello.txt", mock.getReceivedExchanges().get(1).getIn().getHeader(Exchange.FILE_NAME, String.class));
     }
 
 }
\ No newline at end of file