Author: davsclaus Date: Fri Feb 6 06:25:17 2009 New Revision: 741431 URL: http://svn.apache.org/viewvc?rev=741431&view=rev Log: Fixed unit tests failed reported by team city
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExpressionTest.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/FilerProducerFileNamesTest.java Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExpressionTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExpressionTest.java?rev=741431&r1=741430&r2=741431&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExpressionTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExpressionTest.java Fri Feb 6 06:25:17 2009 @@ -36,6 +36,11 @@ } @Override + public boolean isUseRouteBuilder() { + return false; + } + + @Override protected JndiRegistry createRegistry() throws Exception { JndiRegistry jndi = super.createRegistry(); jndi.bind("myguidgenerator", new MyGuidGenerator()); @@ -43,14 +48,23 @@ } public void testRenameToId() throws Exception { + context.addRoutes(new RouteBuilder() { + @Override + public void configure() throws Exception { + from("newfile://target/filelanguage/report.txt?directory=false&autoCreate=false" + + "&expression=${id}.bak").to("mock:result"); + } + }); + context.start(); + MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Hello World"); - template.sendBodyAndHeader("newfile://target/filelanguage/", "Hello World", FileComponent.HEADER_FILE_NAME, "report.txt"); + template.sendBodyAndHeader("newfile://target/filelanguage/", "Hello World", NewFileComponent.HEADER_FILE_NAME, "report.txt"); assertMockEndpointsSatisfied(); // give time for consumer to rename file - Thread.sleep(100); + Thread.sleep(200); String id = mock.getExchanges().get(0).getIn().getMessageId(); File file = new File("target/filelanguage/" + id + ".bak"); @@ -59,14 +73,23 @@ } public void testRenameToComplexWithId() throws Exception { + context.addRoutes(new RouteBuilder() { + @Override + public void configure() throws Exception { + from("newfile://target/filelanguage/report2.txt?directory=false&autoCreate=false" + + "&expression=backup-${id}-${file:name.noext}.bak").to("mock:result"); + } + }); + context.start(); + MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Bye World"); - template.sendBodyAndHeader("newfile://target/filelanguage/", "Bye World", FileComponent.HEADER_FILE_NAME, "report2.txt"); + template.sendBodyAndHeader("newfile://target/filelanguage/", "Bye World", NewFileComponent.HEADER_FILE_NAME, "report2.txt"); assertMockEndpointsSatisfied(); // give time for consumer to rename file - Thread.sleep(100); + Thread.sleep(200); String id = mock.getExchanges().get(0).getIn().getMessageId(); File file = new File("target/filelanguage/backup-" + id + "-report2.bak"); @@ -75,14 +98,23 @@ } public void testRenameToBean() throws Exception { + context.addRoutes(new RouteBuilder() { + @Override + public void configure() throws Exception { + from("newfile://target/filelanguage/report3.txt?directory=false&autoCreate=false" + + "&expression=backup/${bean:myguidgenerator.guid}.txt").to("mock:result"); + } + }); + context.start(); + MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Bye Big World"); - template.sendBodyAndHeader("newfile://target/filelanguage/", "Bye Big World", FileComponent.HEADER_FILE_NAME, "report3.txt"); + template.sendBodyAndHeader("newfile://target/filelanguage/", "Bye Big World", NewFileComponent.HEADER_FILE_NAME, "report3.txt"); assertMockEndpointsSatisfied(); // give time for consumer to rename file - Thread.sleep(100); + Thread.sleep(200); File file = new File("target/filelanguage/backup/123.txt"); file = file.getAbsoluteFile(); @@ -90,14 +122,23 @@ } public void testRenameToSiblingFolder() throws Exception { + context.addRoutes(new RouteBuilder() { + @Override + public void configure() throws Exception { + from("newfile://target/filelanguage/report4.txt?directory=false&autoCreate=false" + + "&expression=../backup/${file:name}.bak").to("mock:result"); + } + }); + context.start(); + MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Hello Big World"); - template.sendBodyAndHeader("newfile://target/filelanguage/", "Hello Big World", FileComponent.HEADER_FILE_NAME, "report4.txt"); + template.sendBodyAndHeader("newfile://target/filelanguage/", "Hello Big World", NewFileComponent.HEADER_FILE_NAME, "report4.txt"); assertMockEndpointsSatisfied(); // give time for consumer to rename file - Thread.sleep(100); + Thread.sleep(200); File file = new File("target/backup/report4.txt.bak"); file = file.getAbsoluteFile(); @@ -105,37 +146,9 @@ } public void testRenameToBeanWithBeanLanguage() throws Exception { - MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedBodiesReceived("Bean Language Rules The World"); - - template.sendBodyAndHeader("newfile://target/filelanguage/", "Bean Language Rules The World", - FileComponent.HEADER_FILE_NAME, "report5.txt"); - assertMockEndpointsSatisfied(); - - // give time for consumer to rename file - Thread.sleep(100); - - File file = new File("target/filelanguage/123"); - file = file.getAbsoluteFile(); - assertTrue("File should have been renamed", file.exists()); - } - - @Override - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { + context.addRoutes(new RouteBuilder() { + @Override public void configure() throws Exception { - from("newfile://target/filelanguage/report.txt?directory=false&autoCreate=false" - + "&expression=${id}.bak").to("mock:result"); - - from("newfile://target/filelanguage/report2.txt?directory=false&autoCreate=false" - + "&expression=backup-${id}-${file:name.noext}.bak").to("mock:result"); - - from("newfile://target/filelanguage/report3.txt?directory=false&autoCreate=false" - + "&expression=backup/${bean:myguidgenerator.guid}.txt").to("mock:result"); - - from("newfile://target/filelanguage/report4.txt?directory=false&autoCreate=false" - + "&expression=../backup/${file:name}.bak").to("mock:result"); - // configured by java using java beans setters NewFileEndpoint endpoint = new NewFileEndpoint(); endpoint.setCamelContext(context); @@ -147,7 +160,22 @@ from(endpoint).to("mock:result"); } - }; + }); + context.start(); + + MockEndpoint mock = getMockEndpoint("mock:result"); + mock.expectedBodiesReceived("Bean Language Rules The World"); + + template.sendBodyAndHeader("newfile://target/filelanguage/", "Bean Language Rules The World", + NewFileComponent.HEADER_FILE_NAME, "report5.txt"); + assertMockEndpointsSatisfied(); + + // give time for consumer to rename file + Thread.sleep(200); + + File file = new File("target/filelanguage/123"); + file = file.getAbsoluteFile(); + assertTrue("File should have been renamed", file.exists()); } public class MyGuidGenerator { 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=741431&r1=741430&r2=741431&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 Feb 6 06:25:17 2009 @@ -21,11 +21,11 @@ import org.apache.camel.component.mock.MockEndpoint; /** - * Unit test for the file sort by expression + * Unit test for the file sort by expression */ public class FileSortByExpressionTest extends ContextTestSupport { - private String fileUrl = "file://target/filesorter/"; + private String fileUrl = "newfile://target/filesorter/"; @Override protected void setUp() throws Exception { @@ -33,19 +33,33 @@ super.setUp(); } + @Override + public boolean isUseRouteBuilder() { + return false; + } + private void prepareFolder(String folder) { - template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Paris", - FileComponent.HEADER_FILE_NAME, "paris.dat"); + template.sendBodyAndHeader("newfile:target/filesorter/" + folder, "Hello Paris", + NewFileComponent.HEADER_FILE_NAME, "paris.dat"); - template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello London", - FileComponent.HEADER_FILE_NAME, "london.txt"); + template.sendBodyAndHeader("newfile:target/filesorter/" + folder, "Hello London", + NewFileComponent.HEADER_FILE_NAME, "london.txt"); - template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Copenhagen", - FileComponent.HEADER_FILE_NAME, "copenhagen.xml"); + template.sendBodyAndHeader("newfile:target/filesorter/" + folder, "Hello Copenhagen", + NewFileComponent.HEADER_FILE_NAME, "copenhagen.xml"); } public void testSortFiles() throws Exception { prepareFolder("a"); + + context.addRoutes(new RouteBuilder() { + @Override + public void configure() throws Exception { + from(fileUrl + "a/?sortBy=file:name.ext").to("mock:result"); + } + }); + context.start(); + MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Hello Paris", "Hello London", "Hello Copenhagen"); @@ -54,20 +68,19 @@ public void testSortFilesReverse() throws Exception { prepareFolder("b"); + + context.addRoutes(new RouteBuilder() { + @Override + public void configure() throws Exception { + from(fileUrl + "b/?sortBy=reverse:file:name.ext").to("mock:reverse"); + } + }); + context.start(); + MockEndpoint reverse = getMockEndpoint("mock:reverse"); reverse.expectedBodiesReceived("Hello Copenhagen", "Hello London", "Hello Paris"); assertMockEndpointsSatisfied(); } - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - public void configure() throws Exception { - from(fileUrl + "a/?sortBy=file:name.ext&initialDelay=1000").to("mock:result"); - - from(fileUrl + "b/?sortBy=reverse:file:name.ext&initialDelay=1000").to("mock:reverse"); - } - }; - } - } \ No newline at end of file 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=741431&r1=741430&r2=741431&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 Feb 6 06:25:17 2009 @@ -25,7 +25,7 @@ */ public class FileSortByIgnoreCaseExpressionTest extends ContextTestSupport { - private String fileUrl = "file://target/filesorter/"; + private String fileUrl = "newfile://target/filesorter/"; @Override protected void setUp() throws Exception { @@ -33,51 +33,71 @@ super.setUp(); } + @Override + public boolean isUseRouteBuilder() { + return false; + } + private void prepareFolder(String folder) { - template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Paris", - FileComponent.HEADER_FILE_NAME, "report-3.dat"); + template.sendBodyAndHeader("newfile:target/filesorter/" + folder, "Hello Paris", + NewFileComponent.HEADER_FILE_NAME, "report-3.dat"); - template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello London", - FileComponent.HEADER_FILE_NAME, "REPORT-2.txt"); + template.sendBodyAndHeader("newfile:target/filesorter/" + folder, "Hello London", + NewFileComponent.HEADER_FILE_NAME, "REPORT-2.txt"); - template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Copenhagen", - FileComponent.HEADER_FILE_NAME, "Report-1.xml"); + template.sendBodyAndHeader("newfile:target/filesorter/" + folder, "Hello Copenhagen", + NewFileComponent.HEADER_FILE_NAME, "Report-1.xml"); } - public void testSortFiles() throws Exception { + public void testSortFilesByNameWithCase() throws Exception { prepareFolder("a"); + + context.addRoutes(new RouteBuilder() { + @Override + public void configure() throws Exception { + from(fileUrl + "a/?sortBy=file:name&initialDelay=250&delay=1000").to("mock:result"); + } + }); + context.start(); + MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Hello London", "Hello Copenhagen", "Hello Paris"); assertMockEndpointsSatisfied(); } - public void testSortFilesNoCase() throws Exception { + public void testSortFilesByNameNoCase() throws Exception { prepareFolder("b"); + + context.addRoutes(new RouteBuilder() { + @Override + public void configure() throws Exception { + from(fileUrl + "b/?sortBy=ignoreCase:file:name&initialDelay=500&delay=1000").to("mock:nocase"); + } + }); + context.start(); + MockEndpoint nocase = getMockEndpoint("mock:nocase"); nocase.expectedBodiesReceived("Hello Copenhagen", "Hello London", "Hello Paris"); assertMockEndpointsSatisfied(); } - public void testSortFilesNoCaseReverse() throws Exception { + public void testSortFilesByNameNoCaseReverse() throws Exception { prepareFolder("c"); - MockEndpoint nocasereverse = getMockEndpoint("mock:nocasereverse"); - nocasereverse.expectedBodiesReceived("Hello Paris", "Hello London", "Hello Copenhagen"); - - assertMockEndpointsSatisfied(); - } - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { + 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 + "b/?sortBy=ignoreCase:file:name&initialDelay=500&delay=1000").to("mock:nocase"); - from(fileUrl + "c/?sortBy=reverse:ignoreCase:file:name&initialDelay=750&delay=1000").to("mock:nocasereverse"); } - }; + }); + context.start(); + + MockEndpoint nocasereverse = getMockEndpoint("mock:nocasereverse"); + nocasereverse.expectedBodiesReceived("Hello Paris", "Hello London", "Hello Copenhagen"); + + assertMockEndpointsSatisfied(); } } \ No newline at end of file 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=741431&r1=741430&r2=741431&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 Feb 6 06:25:17 2009 @@ -21,11 +21,11 @@ import org.apache.camel.component.mock.MockEndpoint; /** - * Unit test for the file sort by expression with nested groups + * Unit test for the file sort by expression with nested groups */ public class FileSortByNestedExpressionTest extends ContextTestSupport { - private String fileUrl = "file://target/filesorter/"; + private String fileUrl = "newfile://target/filesorter/"; @Override protected void setUp() throws Exception { @@ -33,22 +33,36 @@ super.setUp(); } + @Override + public boolean isUseRouteBuilder() { + return false; + } + private void prepareFolder(String folder) { - template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Paris", + template.sendBodyAndHeader("newfile:target/filesorter/" + folder, "Hello Paris", FileComponent.HEADER_FILE_NAME, "paris.txt"); - template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello London", + template.sendBodyAndHeader("newfile:target/filesorter/" + folder, "Hello London", FileComponent.HEADER_FILE_NAME, "london.txt"); - template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Copenhagen", + template.sendBodyAndHeader("newfile:target/filesorter/" + folder, "Hello Copenhagen", FileComponent.HEADER_FILE_NAME, "copenhagen.xml"); - template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Dublin", + template.sendBodyAndHeader("newfile:target/filesorter/" + folder, "Hello Dublin", FileComponent.HEADER_FILE_NAME, "dublin.txt"); } public void testSortNestedFiles() throws Exception { prepareFolder("a"); + + context.addRoutes(new RouteBuilder() { + @Override + public void configure() throws Exception { + from(fileUrl + "a/?sortBy=file:name.ext;file:name").to("mock:result"); + } + }); + context.start(); + MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Hello Dublin", "Hello London", "Hello Paris", "Hello Copenhagen"); @@ -57,20 +71,19 @@ public void testSortNestedFilesReverse() throws Exception { prepareFolder("b"); + + context.addRoutes(new RouteBuilder() { + @Override + public void configure() throws Exception { + from(fileUrl + "b/?sortBy=file:name.ext;reverse:file:name").to("mock:reverse"); + } + }); + context.start(); + MockEndpoint reverse = getMockEndpoint("mock:reverse"); reverse.expectedBodiesReceived("Hello Paris", "Hello London", "Hello Dublin", "Hello Copenhagen"); assertMockEndpointsSatisfied(); } - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - public void configure() throws Exception { - from(fileUrl + "a/?sortBy=file:name.ext;file:name&initialDelay=1000&delay=500").to("mock:result"); - - from(fileUrl + "b/?sortBy=file:name.ext;reverse:file:name&initialDelay=1000&delay=1000").to("mock:reverse"); - } - }; - } - } \ No newline at end of file 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=741431&r1=741430&r2=741431&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 Feb 6 06:25:17 2009 @@ -43,13 +43,13 @@ super.setUp(); template.sendBodyAndHeader("newfile:target/filesorter/", "Hello Paris", - FileComponent.HEADER_FILE_NAME, "paris.txt"); + NewFileComponent.HEADER_FILE_NAME, "paris.txt"); template.sendBodyAndHeader("newfile:target/filesorter/", "Hello London", - FileComponent.HEADER_FILE_NAME, "london.txt"); + NewFileComponent.HEADER_FILE_NAME, "london.txt"); template.sendBodyAndHeader("newfile:target/filesorter/", "Hello Copenhagen", - FileComponent.HEADER_FILE_NAME, "copenhagen.txt"); + NewFileComponent.HEADER_FILE_NAME, "copenhagen.txt"); } public void testSortFiles() throws Exception { 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=741431&r1=741430&r2=741431&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 Fri Feb 6 06:25:17 2009 @@ -39,19 +39,19 @@ template.send("direct:report", exchange); - File file = new File("target/reports/report.txt/" + id); + File file = new File("target/reports/report.txt/" + id).getAbsoluteFile(); assertEquals("File should exists", true, file.exists()); } public void testProducerWithConfiguedFileNameInEndpointURI() throws Exception { template.sendBody("direct:report2", "This is another good report"); - File file = new File("target/report2.txt"); + File file = new File("target/report2.txt").getAbsoluteFile(); assertEquals("File should exists", true, file.exists()); } public void testProducerWithHeaderFileName() throws Exception { template.sendBody("direct:report3", "This is super good report"); - File file = new File("target/report-super.txt"); + File file = new File("target/report-super.txt").getAbsoluteFile(); assertEquals("File should exists", true, file.exists()); }