camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r897120 - in /camel/trunk/camel-core/src/test/java/org/apache/camel: component/file/ issues/
Date Fri, 08 Jan 2010 07:33:49 GMT
Author: davsclaus
Date: Fri Jan  8 07:33:46 2010
New Revision: 897120

URL: http://svn.apache.org/viewvc?rev=897120&view=rev
Log:
Fixing file based tests on other boxes which potentially could have issue to read the file content fast enough

Modified:
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAbsoluteAndRelativeConsumerTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAsyncTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFilesAndDeleteTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMaxMessagesPerPollTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMoveRelativeNameTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMultipleDirectoriesTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentAutoTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentDisabledTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentEnabledTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToAbsoluteTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToRelativeTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToAbsoluteTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToRelativeTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithAbsoluteMoveTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithRelativeMoveTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAutoCreateDirectoryTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameAbsolutePathStrategyTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryNotMatchedTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExcludeNameTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeAndExcludeNameTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveAndMoveFailureTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveFailureTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerNoopTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyStopOnRollbackTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSkipDotFilesTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendAndResumeTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileContentBasedRouterTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileIdempotentReadSameFileAgainTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileMarkerFileDeleteOldLockFilesTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileMarkerFileRecursiveDeleteOldLockFilesTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendNoFileBeforeTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistFailTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistIgnoreTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistOverrideNoFileBeforeTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistOverrideTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByExpressionTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByIgnoreCaseExpressionTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByNestedExpressionTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSorterRefTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileNioLowBufferTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileMoveFileIfProcessFailsTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitPropertiesFileIssueTest.java

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAbsoluteAndRelativeConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAbsoluteAndRelativeConsumerTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAbsoluteAndRelativeConsumerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAbsoluteAndRelativeConsumerTest.java Fri Jan  8 07:33:46 2010
@@ -68,9 +68,9 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("file://target/filerelative?recursive=true").to("mock:relative");
+                from("file://target/filerelative?recursive=true").convertBodyTo(String.class).to("mock:relative");
 
-                from("file://" + base + "?recursive=true").to("mock:absolute");
+                from("file://" + base + "?recursive=true").convertBodyTo(String.class).to("mock:absolute");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAsyncTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAsyncTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAsyncTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAsyncTest.java Fri Jan  8 07:33:46 2010
@@ -60,6 +60,7 @@
         return new RouteBuilder() {
             public void configure() throws Exception {
                 from("file://target/files/?delete=true&delay=10000")
+                    .convertBodyTo(String.class)
                     .threads()
                         .to("mock:before")
                         .delay(3000)

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFilesAndDeleteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFilesAndDeleteTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFilesAndDeleteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFilesAndDeleteTest.java Fri Jan  8 07:33:46 2010
@@ -54,7 +54,7 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("file://target/files/?fileName=report.txt&delete=true").to("mock:result");
+                from("file://target/files/?fileName=report.txt&delete=true").convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMaxMessagesPerPollTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMaxMessagesPerPollTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMaxMessagesPerPollTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMaxMessagesPerPollTest.java Fri Jan  8 07:33:46 2010
@@ -55,7 +55,7 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from(fileUrl).to("mock:result");
+                from(fileUrl).convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMoveRelativeNameTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMoveRelativeNameTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMoveRelativeNameTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMoveRelativeNameTest.java Fri Jan  8 07:33:46 2010
@@ -53,7 +53,7 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from(fileUrl).to("mock:result");
+                from(fileUrl).convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMultipleDirectoriesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMultipleDirectoriesTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMultipleDirectoriesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMultipleDirectoriesTest.java Fri Jan  8 07:33:46 2010
@@ -68,7 +68,7 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from(fileUrl).to("mock:result");
+                from(fileUrl).convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentAutoTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentAutoTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentAutoTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentAutoTest.java Fri Jan  8 07:33:46 2010
@@ -30,7 +30,7 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("file://target/noop?noop=true").to("mock:result");
+                from("file://target/noop?noop=true").convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentDisabledTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentDisabledTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentDisabledTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentDisabledTest.java Fri Jan  8 07:33:46 2010
@@ -46,7 +46,7 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("file://target/noop?noop=true&idempotent=false").to("mock:result");
+                from("file://target/noop?noop=true&idempotent=false").convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentEnabledTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentEnabledTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentEnabledTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentEnabledTest.java Fri Jan  8 07:33:46 2010
@@ -49,7 +49,7 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("file://target/noop?noop=true&idempotent=true").to("mock:result");
+                from("file://target/noop?noop=true&idempotent=true").convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToAbsoluteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToAbsoluteTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToAbsoluteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToAbsoluteTest.java Fri Jan  8 07:33:46 2010
@@ -34,7 +34,7 @@
     @Override
     protected void setUp() throws Exception {
         deleteDirectory("./target/move");
-        // use current dir as base as aboslute path
+        // use current dir as base as absolute path
         base = new File("").getAbsolutePath() + "/target/move";
         super.setUp();
         template.sendBodyAndHeader(fileUrl, "Bye World", Exchange.FILE_NAME, "bye.txt");
@@ -58,7 +58,8 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("file://" + base + "?recursive=true&move=" + base + "/.done").to("mock:result");
+                from("file://" + base + "?recursive=true&move=" + base + "/.done")
+                        .convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToRelativeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToRelativeTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToRelativeTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToRelativeTest.java Fri Jan  8 07:33:46 2010
@@ -34,7 +34,7 @@
     @Override
     protected void setUp() throws Exception {
         deleteDirectory("./target/move");
-        // use current dir as base as aboslute path
+        // use current dir as base as absolute path
         base = new File("").getAbsolutePath() + "/target/move";
         super.setUp();
         template.sendBodyAndHeader(fileUrl, "Bye World", Exchange.FILE_NAME, "bye.txt");
@@ -57,7 +57,8 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("file://" + base + "?recursive=true&move=.done").to("mock:result");
+                from("file://" + base + "?recursive=true&move=.done")
+                        .convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToAbsoluteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToAbsoluteTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToAbsoluteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToAbsoluteTest.java Fri Jan  8 07:33:46 2010
@@ -34,7 +34,7 @@
     @Override
     protected void setUp() throws Exception {
         deleteDirectory("./target/move");
-        // use current dir as base as aboslute path
+        // use current dir as base as absolute path
         base = new File("").getAbsolutePath() + "/target/move";
         super.setUp();
         template.sendBodyAndHeader(fileUrl, "Bye World", Exchange.FILE_NAME, "bye.txt");
@@ -58,7 +58,8 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("file://target/move?recursive=true&move=" + base + "/.done").to("mock:result");
+                from("file://target/move?recursive=true&move=" + base + "/.done")
+                        .convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToRelativeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToRelativeTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToRelativeTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToRelativeTest.java Fri Jan  8 07:33:46 2010
@@ -52,7 +52,8 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("file://target/move?recursive=true&move=.done").to("mock:result");
+                from("file://target/move?recursive=true&move=.done")
+                        .convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java Fri Jan  8 07:33:46 2010
@@ -49,7 +49,8 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("file://target/singledirectoryonly/?recursive=false&delete=true").to("mock:result");
+                from("file://target/singledirectoryonly/?recursive=false&delete=true")
+                        .convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathTest.java Fri Jan  8 07:33:46 2010
@@ -50,7 +50,7 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("file://" + base + "?delete=true").to("mock:report");
+                from("file://" + base + "?delete=true").convertBodyTo(String.class).to("mock:report");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithAbsoluteMoveTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithAbsoluteMoveTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithAbsoluteMoveTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithAbsoluteMoveTest.java Fri Jan  8 07:33:46 2010
@@ -33,7 +33,7 @@
     @Override
     protected void setUp() throws Exception {
         deleteDirectory("target/reports");
-        // use current dir as base as aboslute path
+        // use current dir as base as absolute path
         base = new File("").getAbsolutePath() + "/target/reports";
         super.setUp();
     }
@@ -51,7 +51,7 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("file://" + base + "?move=" + base + "/done/${file:name}").to("mock:report");
+                from("file://" + base + "?move=" + base + "/done/${file:name}").convertBodyTo(String.class).to("mock:report");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithRelativeMoveTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithRelativeMoveTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithRelativeMoveTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithRelativeMoveTest.java Fri Jan  8 07:33:46 2010
@@ -34,7 +34,7 @@
     protected void setUp() throws Exception {
         deleteDirectory("target/reports");
         deleteDirectory("target/done");
-        // use current dir as base as aboslute path
+        // use current dir as base as absolute path
         base = new File("").getAbsolutePath() + "/target/reports";
         super.setUp();
     }
@@ -51,7 +51,7 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("file://" + base + "?move=../done/${file:name}").to("mock:report");
+                from("file://" + base + "?move=../done/${file:name}").convertBodyTo(String.class).to("mock:report");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAutoCreateDirectoryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAutoCreateDirectoryTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAutoCreateDirectoryTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAutoCreateDirectoryTest.java Fri Jan  8 07:33:46 2010
@@ -50,7 +50,7 @@
 
     public void testCreateAbsoluteDirectory() throws Exception {
         deleteDirectory("target/file/foo");
-        // use current dir as base as aboslute path
+        // use current dir as base as absolute path
         String base = new File("").getAbsolutePath() + "/target/file/foo";
 
         Endpoint endpoint = context.getEndpoint("file://" + base);

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java Fri Jan  8 07:33:46 2010
@@ -38,7 +38,7 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("file://target/file-batch?initialDelay=2000").to("mock:result");
+                from("file://target/file-batch?initialDelay=2000").convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameAbsolutePathStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameAbsolutePathStrategyTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameAbsolutePathStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameAbsolutePathStrategyTest.java Fri Jan  8 07:33:46 2010
@@ -52,7 +52,8 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("file://target/reports?move=" + base + "/done/${file:name}&consumer.delay=5000").to("mock:report");
+                from("file://target/reports?move=" + base + "/done/${file:name}&consumer.delay=5000")
+                        .convertBodyTo(String.class).to("mock:report");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java Fri Jan  8 07:33:46 2010
@@ -77,7 +77,8 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("file://target/reports?move=../done/${file:name}&consumer.delay=5000").to("mock:report");
+                from("file://target/reports?move=../done/${file:name}&consumer.delay=5000")
+                        .convertBodyTo(String.class).to("mock:report");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryNotMatchedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryNotMatchedTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryNotMatchedTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryNotMatchedTest.java Fri Jan  8 07:33:46 2010
@@ -56,7 +56,7 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from(fileUrl).to("mock:result");
+                from(fileUrl).convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExcludeNameTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExcludeNameTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExcludeNameTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExcludeNameTest.java Fri Jan  8 07:33:46 2010
@@ -48,7 +48,7 @@
         return new RouteBuilder() {
             public void configure() throws Exception {
                 from("file://target/exclude/?exclude=^secret.*|.*xml$")
-                    .to("mock:result");
+                    .convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java Fri Jan  8 07:33:46 2010
@@ -77,7 +77,7 @@
             public void configure() throws Exception {
                 // START SNIPPET: e1
                 from("file://target/filelanguage/date/"
-                      + "?fileName=myfile-${date:now:yyyyMMdd}.txt").to("mock:result");
+                      + "?fileName=myfile-${date:now:yyyyMMdd}.txt").convertBodyTo(String.class).to("mock:result");
                 // END SNIPPET: e1
             }
         });

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java Fri Jan  8 07:33:46 2010
@@ -70,7 +70,7 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from(fileUrl).to("mock:result");
+                from(fileUrl).convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java Fri Jan  8 07:33:46 2010
@@ -50,7 +50,8 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("file://target/idempotent/?idempotent=true&idempotentRepository=#myRepo&move=done/${file:name}").to("mock:result");
+                from("file://target/idempotent/?idempotent=true&idempotentRepository=#myRepo&move=done/${file:name}")
+                        .convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java Fri Jan  8 07:33:46 2010
@@ -39,7 +39,8 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("file://target/idempotent/?idempotent=true&move=done/${file:name}").to("mock:result");
+                from("file://target/idempotent/?idempotent=true&move=done/${file:name}")
+                        .convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeAndExcludeNameTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeAndExcludeNameTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeAndExcludeNameTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeAndExcludeNameTest.java Fri Jan  8 07:33:46 2010
@@ -48,7 +48,7 @@
         return new RouteBuilder() {
             public void configure() throws Exception {
                 from("file://target/includeexclude/?include=.*txt&exclude=hello.*")
-                    .to("mock:result");
+                    .convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java Fri Jan  8 07:33:46 2010
@@ -48,7 +48,7 @@
         return new RouteBuilder() {
             public void configure() throws Exception {
                 from("file://target/include/?include=^report.*txt$")
-                    .to("mock:result");
+                    .convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveAndMoveFailureTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveAndMoveFailureTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveAndMoveFailureTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveAndMoveFailureTest.java Fri Jan  8 07:33:46 2010
@@ -59,7 +59,7 @@
                                 throw new IllegalArgumentException("Forced");
                             }
                         }
-                    }).to("mock:result");
+                    }).convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java Fri Jan  8 07:33:46 2010
@@ -53,7 +53,7 @@
             @Override
             public void configure() throws Exception {
                 from("file://target/filelanguage/?exclude=.*bak"
-                        + "&move=${id}.bak").to("mock:result");
+                        + "&move=${id}.bak").convertBodyTo(String.class).to("mock:result");
             }
         });
         context.start();
@@ -78,7 +78,7 @@
             @Override
             public void configure() throws Exception {
                 from("file://target/filelanguage/?exclude=.*bak"
-                     + "&move=backup-${id}-${file:name.noext}.bak").to("mock:result");
+                     + "&move=backup-${id}-${file:name.noext}.bak").convertBodyTo(String.class).to("mock:result");
             }
         });
         context.start();
@@ -103,7 +103,7 @@
             @Override
             public void configure() throws Exception {
                 from("file://target/filelanguage/?exclude=.*bak"
-                      + "&move=backup/${bean:myguidgenerator.guid}.txt").to("mock:result");
+                      + "&move=backup/${bean:myguidgenerator.guid}.txt").convertBodyTo(String.class).to("mock:result");
             }
         });
         context.start();

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveFailureTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveFailureTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveFailureTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveFailureTest.java Fri Jan  8 07:33:46 2010
@@ -59,7 +59,7 @@
                                 throw new IllegalArgumentException("Forced");
                             }
                         }
-                    }).to("mock:result");
+                    }).convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerNoopTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerNoopTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerNoopTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerNoopTest.java Fri Jan  8 07:33:46 2010
@@ -56,7 +56,7 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("file://target/filenoop?noop=true").to("mock:result");
+                from("file://target/filenoop?noop=true").convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java Fri Jan  8 07:33:46 2010
@@ -53,7 +53,7 @@
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(0);
 
-        // let it run for a little while since we rethrow the excpetion the consumer
+        // let it run for a little while since we rethrow the exception the consumer
         // will stop scheduling and not poll anymore
         Thread.sleep(2000);
 
@@ -65,7 +65,7 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from(fileUrl).to("mock:result");
+                from(fileUrl).convertBodyTo(String.class).to("mock:result");
             }
         };
     }
@@ -73,7 +73,7 @@
     private class MyPollStrategy implements PollingConsumerPollStrategy {
 
         public void begin(Consumer consumer, Endpoint endpoint) {
-            // start consumer as we simualte the fail in begin
+            // start consumer as we simulate the fail in begin
             // and thus before camel lazy start it itself
             try {
                 consumer.start();

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyStopOnRollbackTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyStopOnRollbackTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyStopOnRollbackTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyStopOnRollbackTest.java Fri Jan  8 07:33:46 2010
@@ -65,7 +65,7 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from(fileUrl).to("mock:result");
+                from(fileUrl).convertBodyTo(String.class).to("mock:result");
             }
         };
     }
@@ -73,7 +73,7 @@
     private class MyPollStrategy implements PollingConsumerPollStrategy {
 
         public void begin(Consumer consumer, Endpoint endpoint) {
-            // start consumer as we simualte the fail in begin
+            // start consumer as we simulate the fail in begin
             // and thus before camel lazy start it itself
             try {
                 consumer.start();

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java Fri Jan  8 07:33:46 2010
@@ -64,7 +64,7 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from(fileUrl).to("mock:result");
+                from(fileUrl).convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSkipDotFilesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSkipDotFilesTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSkipDotFilesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSkipDotFilesTest.java Fri Jan  8 07:33:46 2010
@@ -62,7 +62,7 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from(fileUrl).to("mock:result");
+                from(fileUrl).convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendAndResumeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendAndResumeTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendAndResumeTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendAndResumeTest.java Fri Jan  8 07:33:46 2010
@@ -72,7 +72,7 @@
             public void configure() throws Exception {
                 from("file://target/suspended?maxMessagesPerPoll=1&sortBy=file:name")
                     .routePolicy(myPolicy).id("myRoute")
-                    .to("mock:result");
+                    .convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendTest.java Fri Jan  8 07:33:46 2010
@@ -56,7 +56,7 @@
                 MyPolicy myPolicy = new MyPolicy();
                 from("file://target/suspended?maxMessagesPerPoll=1&sortBy=file:name")
                     .routePolicy(myPolicy).id("myRoute")
-                    .to("mock:result");
+                    .convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileContentBasedRouterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileContentBasedRouterTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileContentBasedRouterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileContentBasedRouterTest.java Fri Jan  8 07:33:46 2010
@@ -67,9 +67,6 @@
         mock.message(0).body().isInstanceOf(GenericFile.class);
 
         assertMockEndpointsSatisfied();
-
-        // okay get the payload to compare
-        assertEquals("Hello Copenhagen", mock.getReceivedExchanges().get(0).getIn().getBody(String.class));
     }
 
     @Override

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=897120&r1=897119&r2=897120&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 Fri Jan  8 07:33:46 2010
@@ -57,7 +57,7 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from(uri).to("mock:result");
+                from(uri).convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileMarkerFileDeleteOldLockFilesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileMarkerFileDeleteOldLockFilesTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileMarkerFileDeleteOldLockFilesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileMarkerFileDeleteOldLockFilesTest.java Fri Jan  8 07:33:46 2010
@@ -51,7 +51,8 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("file:target/oldlock").routeId("foo").noAutoStartup().to("mock:result");
+                from("file:target/oldlock").routeId("foo").noAutoStartup()
+                        .convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileMarkerFileRecursiveDeleteOldLockFilesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileMarkerFileRecursiveDeleteOldLockFilesTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileMarkerFileRecursiveDeleteOldLockFilesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileMarkerFileRecursiveDeleteOldLockFilesTest.java Fri Jan  8 07:33:46 2010
@@ -54,7 +54,8 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("file:target/oldlock?recursive=true&sortBy=file:name").routeId("foo").noAutoStartup().to("mock:result");
+                from("file:target/oldlock?recursive=true&sortBy=file:name").routeId("foo").noAutoStartup()
+                        .convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendNoFileBeforeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendNoFileBeforeTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendNoFileBeforeTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendNoFileBeforeTest.java Fri Jan  8 07:33:46 2010
@@ -28,8 +28,8 @@
 
     @Override
     protected void setUp() throws Exception {
-        super.setUp();
         deleteDirectory("target/file");
+        super.setUp();
     }
 
     public void testAppend() throws Exception {
@@ -47,7 +47,7 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("file://target/file?noop=true&delay=1000").to("mock:result");
+                from("file://target/file?noop=true&delay=1000").convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendTest.java Fri Jan  8 07:33:46 2010
@@ -28,8 +28,8 @@
 
     @Override
     protected void setUp() throws Exception {
-        super.setUp();
         deleteDirectory("target/file");
+        super.setUp();
         template.sendBodyAndHeader("file://target/file", "Hello World\n", Exchange.FILE_NAME, "hello.txt");
     }
 
@@ -48,7 +48,7 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("file://target/file?noop=true&delay=1000").to("mock:result");
+                from("file://target/file?noop=true&delay=1000").convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistFailTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistFailTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistFailTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistFailTest.java Fri Jan  8 07:33:46 2010
@@ -29,8 +29,8 @@
 
     @Override
     protected void setUp() throws Exception {
-        super.setUp();
         deleteDirectory("target/file");
+        super.setUp();
         template.sendBodyAndHeader("file://target/file", "Hello World", Exchange.FILE_NAME, "hello.txt");
     }
 
@@ -54,7 +54,7 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("file://target/file?noop=true&delay=1000").to("mock:result");
+                from("file://target/file?noop=true&delay=1000").convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistIgnoreTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistIgnoreTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistIgnoreTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistIgnoreTest.java Fri Jan  8 07:33:46 2010
@@ -28,8 +28,8 @@
 
     @Override
     protected void setUp() throws Exception {
-        super.setUp();
         deleteDirectory("target/file");
+        super.setUp();
         template.sendBodyAndHeader("file://target/file", "Hello World", Exchange.FILE_NAME, "hello.txt");
     }
 
@@ -48,7 +48,7 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("file://target/file?noop=true&delay=1000").to("mock:result");
+                from("file://target/file?noop=true&delay=1000").convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistOverrideNoFileBeforeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistOverrideNoFileBeforeTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistOverrideNoFileBeforeTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistOverrideNoFileBeforeTest.java Fri Jan  8 07:33:46 2010
@@ -28,8 +28,8 @@
 
     @Override
     protected void setUp() throws Exception {
-        super.setUp();
         deleteDirectory("target/file");
+        super.setUp();
     }
 
     public void testOverride() throws Exception {
@@ -47,7 +47,7 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("file://target/file?noop=true&delay=1000").to("mock:result");
+                from("file://target/file?noop=true&delay=1000").convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistOverrideTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistOverrideTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistOverrideTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistOverrideTest.java Fri Jan  8 07:33:46 2010
@@ -28,8 +28,8 @@
 
     @Override
     protected void setUp() throws Exception {
-        super.setUp();
         deleteDirectory("target/file");
+        super.setUp();
         template.sendBodyAndHeader("file://target/file", "Hello World", Exchange.FILE_NAME, "hello.txt");
         template.sendBodyAndHeader("file://target/file?fileExist=Override", "Bye World", Exchange.FILE_NAME, "hello.txt");
     }
@@ -47,7 +47,7 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("file://target/file?noop=true&delay=1000").to("mock:result");
+                from("file://target/file?noop=true&delay=1000").convertBodyTo(String.class).to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByExpressionTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByExpressionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByExpressionTest.java Fri Jan  8 07:33:46 2010
@@ -73,7 +73,7 @@
         context.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from(fileUrl + "b/?sortBy=reverse:file:ext").to("mock:reverse");
+                from(fileUrl + "b/?sortBy=reverse:file:ext").convertBodyTo(String.class).to("mock:reverse");
             }
         });
         context.start();

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByIgnoreCaseExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByIgnoreCaseExpressionTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByIgnoreCaseExpressionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByIgnoreCaseExpressionTest.java Fri Jan  8 07:33:46 2010
@@ -56,7 +56,8 @@
         context.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from(fileUrl + "a/?sortBy=file:name&initialDelay=250&delay=1000").to("mock:result");
+                from(fileUrl + "a/?sortBy=file:name&initialDelay=250&delay=1000")
+                        .convertBodyTo(String.class).to("mock:result");
             }
         });
         context.start();
@@ -73,7 +74,8 @@
         context.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from(fileUrl + "b/?sortBy=ignoreCase:file:name&initialDelay=500&delay=1000").to("mock:nocase");
+                from(fileUrl + "b/?sortBy=ignoreCase:file:name&initialDelay=500&delay=1000")
+                        .convertBodyTo(String.class).to("mock:nocase");
             }
         });
         context.start();
@@ -90,7 +92,8 @@
         context.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from(fileUrl + "c/?sortBy=reverse:ignoreCase:file:name&initialDelay=750&delay=1000").to("mock:nocasereverse");
+                from(fileUrl + "c/?sortBy=reverse:ignoreCase:file:name&initialDelay=750&delay=1000")
+                        .convertBodyTo(String.class).to("mock:nocasereverse");
             }
         });
         context.start();

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByNestedExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByNestedExpressionTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByNestedExpressionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByNestedExpressionTest.java Fri Jan  8 07:33:46 2010
@@ -59,7 +59,8 @@
         context.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from(fileUrl + "a/?sortBy=file:ext;file:name").to("mock:result");
+                from(fileUrl + "a/?sortBy=file:ext;file:name")
+                        .convertBodyTo(String.class).to("mock:result");
             }
         });
         context.start();
@@ -76,7 +77,8 @@
         context.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from(fileUrl + "b/?sortBy=file:ext;reverse:file:name").to("mock:reverse");
+                from(fileUrl + "b/?sortBy=file:ext;reverse:file:name")
+                        .convertBodyTo(String.class).to("mock:reverse");
             }
         });
         context.start();

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSorterRefTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSorterRefTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSorterRefTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSorterRefTest.java Fri Jan  8 07:33:46 2010
@@ -62,7 +62,7 @@
         context.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from(fileUrl).to("mock:result");
+                from(fileUrl).convertBodyTo(String.class).to("mock:result");
             }
         });
         context.start();

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileNioLowBufferTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileNioLowBufferTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileNioLowBufferTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileNioLowBufferTest.java Fri Jan  8 07:33:46 2010
@@ -26,9 +26,13 @@
  */
 public class FileToFileNioLowBufferTest extends ContextTestSupport {
 
-    public void testFileToFileNioLowBuffer() throws Exception {
+    @Override
+    protected void setUp() throws Exception {
         deleteDirectory("target/nio");
+        super.setUp();
+    }
 
+    public void testFileToFileNioLowBuffer() throws Exception {
         String body = "1234567890123456789012345678901234567890";
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(1);
@@ -44,7 +48,7 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("file://target/nio/in").to("file://target/nio/out?bufferSize=4").to("mock:result");
+                from("file://target/nio/in").convertBodyTo(String.class).to("file://target/nio/out?bufferSize=4").to("mock:result");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileMoveFileIfProcessFailsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileMoveFileIfProcessFailsTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileMoveFileIfProcessFailsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileMoveFileIfProcessFailsTest.java Fri Jan  8 07:33:46 2010
@@ -46,7 +46,8 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("file://target/movefile?moveFailed=error").to("mock:foo").process(new Processor() {
+                from("file://target/movefile?moveFailed=error")
+                        .convertBodyTo(String.class).to("mock:foo").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         throw new IllegalArgumentException("Forced by unittest");
                     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitPropertiesFileIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitPropertiesFileIssueTest.java?rev=897120&r1=897119&r2=897120&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitPropertiesFileIssueTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitPropertiesFileIssueTest.java Fri Jan  8 07:33:46 2010
@@ -96,7 +96,7 @@
                 }
             }
 
-            // as we use the recipeientList afterwards we set the destination
+            // as we use the recipientList afterwards we set the destination
             // as well on our message where we want to route it
 
             // as we are an unit test then just store the list using toString so its easier to test



Mime
View raw message