svn commit: r1172748 - in /camel/branches/camel-2.8.x: ./ camel-core/src/test/java/org/apache/camel/component/file/strategy/ components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/

[dkulp]

Author: dkulp
Date: Mon Sep 19 19:01:02 2011
New Revision: 1172748

URL: http://svn.apache.org/viewvc?rev=1172748&view=rev
Log:
Merged revisions 1148762 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1148762 | davsclaus | 2011-07-20 09:36:03 -0400 (Wed, 20 Jul 2011) | 1 line
  
  Fixed ftp tests fails on windows. Made test more resilient on what os it runs 
due line terminators diffs
........

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockTest.java
    
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategyTest.java
    
camel/branches/camel-2.8.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedReadLockTest.java

Propchange: camel/branches/camel-2.8.x/
            ('svn:mergeinfo' removed)

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockTest.java?rev=1172748&r1=1172747&r2=1172748&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockTest.java
 (original)
+++ 
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockTest.java
 Mon Sep 19 19:01:02 2011
@@ -48,7 +48,8 @@ public class FileChangedReadLockTest ext
         String[] lines = content.split("\n");
         assertEquals("There should be 20 lines in the file", 20, lines.length);
         for (int i = 0; i < 20; i++) {
-            assertEquals("Line " + i, lines[i]);
+            // there may be windows line terminators
+            assertTrue(lines[i].startsWith("Line " + i));
         }
     }
 

Modified: 
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategyTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategyTest.java?rev=1172748&r1=1172747&r2=1172748&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategyTest.java
 (original)
+++ 
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategyTest.java
 Mon Sep 19 19:01:02 2011
@@ -59,7 +59,8 @@ public class MarkerFileExclusiveReadLock
         content = context.getTypeConverter().convertTo(String.class, new 
File("target/marker/out/file2.dat").getAbsoluteFile());
         lines = content.split("\n");
         for (int i = 0; i < 20; i++) {
-            assertEquals("Line " + i, lines[i]);
+            // there may be windows line terminators
+            assertTrue(lines[i].startsWith("Line " + i));
         }
 
         waitUntilCompleted();

Modified: 
camel/branches/camel-2.8.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedReadLockTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedReadLockTest.java?rev=1172748&r1=1172747&r2=1172748&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedReadLockTest.java
 (original)
+++ 
camel/branches/camel-2.8.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedReadLockTest.java
 Mon Sep 19 19:01:02 2011
@@ -50,7 +50,8 @@ public class FtpChangedReadLockTest exte
         String[] lines = content.split("\n");
         assertEquals("There should be 20 lines in the file", 20, lines.length);
         for (int i = 0; i < 20; i++) {
-            assertEquals("Line " + i, lines[i]);
+            // there may be windows line terminators
+            assertTrue(lines[i].startsWith("Line " + i));
         }
     }