svn commit: r982518 - /camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileIdempotentReadSameFileAgainTest.java

[davsclaus]

Author: davsclaus
Date: Thu Aug  5 09:42:32 2010
New Revision: 982518

URL: http://svn.apache.org/viewvc?rev=982518&view=rev
Log:
Fixed test on other boxes

Modified:
    
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileIdempotentReadSameFileAgainTest.java

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileIdempotentReadSameFileAgainTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileIdempotentReadSameFileAgainTest.java?rev=982518&r1=982517&r2=982518&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileIdempotentReadSameFileAgainTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileIdempotentReadSameFileAgainTest.java
 Thu Aug  5 09:42:32 2010
@@ -27,7 +27,7 @@ import org.apache.camel.component.mock.M
 public class FileIdempotentReadSameFileAgainTest extends ContextTestSupport {
 
     private String uri = 
"file://target/inbox?idempotent=false&move=../done&moveFailed=../error"
-        + 
"&preMove=working/${date:now:yyyyMMddHHmmssSSS}-${file:name}&readLock=rename";
+        + 
"&preMove=working/${date:now:yyyyMMddHHmmssSSS}-${file:name}&readLock=none";
 
     @Override
     protected void setUp() throws Exception {
@@ -37,15 +37,16 @@ public class FileIdempotentReadSameFileA
 
     public void testConsumeSameFileAgain() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedBodiesReceived("Hello World", "Foo", "Bye World");
+        // some file systems may read files in different order 
+        mock.expectedBodiesReceivedInAnyOrder("Hello World", "Foo");
 
         template.sendBodyAndHeader("file://target/inbox", "Hello World", 
Exchange.FILE_NAME, "foo.txt");
-
-        Thread.sleep(1000);
-
         template.sendBodyAndHeader("file://target/inbox", "Foo", 
Exchange.FILE_NAME, "bar.txt");
 
-        Thread.sleep(1000);
+        assertMockEndpointsSatisfied();
+
+        mock.reset();
+        mock.expectedBodiesReceived("Bye World");
 
         template.sendBodyAndHeader("file://target/inbox", "Bye World", 
Exchange.FILE_NAME, "foo.txt");