Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java?rev=740298&r1=740297&r2=740298&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java Tue Feb 3 13:19:43 2009 @@ -22,7 +22,6 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.file.strategy.NewMarkerFileExclusiveReadLockStrategy; import org.apache.camel.component.mock.MockEndpoint; /** @@ -32,18 +31,16 @@ @Override protected void tearDown() throws Exception { - super.tearDown(); deleteDirectory("target/reports"); + super.tearDown(); } public void testLocked() throws Exception { - deleteDirectory("target/reports"); - MockEndpoint mock = getMockEndpoint("mock:report"); mock.expectedBodiesReceived("Hello Locked"); template.sendBodyAndHeader("newfile:target/reports/locked", "Hello Locked", - FileComponent.HEADER_FILE_NAME, "report.txt"); + NewFileComponent.HEADER_FILE_NAME, "report.txt"); mock.assertIsSatisfied(); @@ -55,13 +52,11 @@ } public void testNotLocked() throws Exception { - deleteDirectory("target/reports"); - MockEndpoint mock = getMockEndpoint("mock:report"); mock.expectedBodiesReceived("Hello Not Locked"); template.sendBodyAndHeader("newfile:target/reports/notlocked", "Hello Not Locked", - FileComponent.HEADER_FILE_NAME, "report.txt"); + NewFileComponent.HEADER_FILE_NAME, "report.txt"); mock.assertIsSatisfied(); @@ -75,7 +70,7 @@ private static void checkLockFile(boolean expected) { String filename = "target/reports/"; filename += expected ? "locked/" : "notlocked/"; - filename += "report.txt" + NewMarkerFileExclusiveReadLockStrategy.DEFAULT_LOCK_FILE_POSTFIX; + filename += "report.txt" + NewFileComponent.DEFAULT_LOCK_FILE_POSTFIX; File file = new File(filename); file = file.getAbsoluteFile();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java?rev=740298&r1=740297&r2=740298&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java Tue Feb 3 13:19:43 2009 @@ -56,8 +56,8 @@ @Override protected void setUp() throws Exception { - super.setUp(); deleteDirectory("target/test-file-append"); + super.setUp(); template.sendBodyAndHeader("file://target/test-file-append", "Hello", FileComponent.HEADER_FILE_NAME, "hello.txt"); template.sendBodyAndHeader("file://target/test-file-append", " World", FileComponent.HEADER_FILE_NAME, "world.txt"); } Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java?rev=740298&r1=740297&r2=740298&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java Tue Feb 3 13:19:43 2009 @@ -32,8 +32,8 @@ @Override protected void setUp() throws Exception { - super.setUp(); deleteDirectory("target/filelanguage"); + super.setUp(); } @Override 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=740298&r1=740297&r2=740298&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 Tue Feb 3 13:19:43 2009 @@ -29,8 +29,8 @@ @Override protected void setUp() throws Exception { - super.setUp(); deleteDirectory("target/filesorter"); + super.setUp(); } private void prepareFolder(String folder) { 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=740298&r1=740297&r2=740298&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 Tue Feb 3 13:19:43 2009 @@ -29,8 +29,8 @@ @Override protected void setUp() throws Exception { - super.setUp(); deleteDirectory("target/filesorter"); + super.setUp(); } private void prepareFolder(String folder) { 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=740298&r1=740297&r2=740298&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 Tue Feb 3 13:19:43 2009 @@ -29,8 +29,8 @@ @Override protected void setUp() throws Exception { - super.setUp(); deleteDirectory("target/filesorter"); + super.setUp(); } private void prepareFolder(String folder) { 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=740298&r1=740297&r2=740298&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 Tue Feb 3 13:19:43 2009 @@ -39,8 +39,8 @@ @Override protected void setUp() throws Exception { - super.setUp(); deleteDirectory("target/filesorter"); + super.setUp(); template.sendBodyAndHeader("newfile:target/filesorter/", "Hello Paris", FileComponent.HEADER_FILE_NAME, "paris.txt"); Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerFileNamesTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerFileNamesTest.java?rev=740298&r1=740297&r2=740298&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerFileNamesTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerFileNamesTest.java Tue Feb 3 13:19:43 2009 @@ -60,7 +60,7 @@ public void configure() throws Exception { from("direct:report").to("newfile:target/reports/report.txt"); - from("direct:report2").to("newfile:target/report2.txt?autoCreate=false"); + from("direct:report2").to("newfile:target/report2.txt?autoCreate=false&directory=false"); from("direct:report3").setHeader(FileComponent.HEADER_FILE_NAME, constant("report-super.txt")).to("newfile:target/"); }
