You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2008/11/30 17:03:05 UTC
svn commit: r721837 - in
/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file:
FileSortByExpressionTest.java FileSortByIgnoreCaseExpressionTest.java
FileSortByNestedExpressionTest.java
Author: davsclaus
Date: Sun Nov 30 08:03:05 2008
New Revision: 721837
URL: http://svn.apache.org/viewvc?rev=721837&view=rev
Log:
CAMEL-1112: Fixed unit test that could fail on running full test
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByExpressionTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByIgnoreCaseExpressionTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByNestedExpressionTest.java
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByExpressionTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByExpressionTest.java?rev=721837&r1=721836&r2=721837&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByExpressionTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByExpressionTest.java Sun Nov 30 08:03:05 2008
@@ -25,27 +25,35 @@
*/
public class FileSortByExpressionTest extends ContextTestSupport {
- private String fileUrl = "file://target/filesorter/?noop=true";
+ private String fileUrl = "file://target/filesorter/";
@Override
protected void setUp() throws Exception {
super.setUp();
deleteDirectory("target/filesorter");
+ }
- template.sendBodyAndHeader("file:target/filesorter/", "Hello Paris",
+ private void prepareFolder(String folder) {
+ template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Paris",
FileComponent.HEADER_FILE_NAME, "paris.dat");
- template.sendBodyAndHeader("file:target/filesorter/", "Hello London",
+ template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello London",
FileComponent.HEADER_FILE_NAME, "london.txt");
- template.sendBodyAndHeader("file:target/filesorter/", "Hello Copenhagen",
+ template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Copenhagen",
FileComponent.HEADER_FILE_NAME, "copenhagen.xml");
}
public void testSortFiles() throws Exception {
+ prepareFolder("a");
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello Paris", "Hello London", "Hello Copenhagen");
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testSortFilesReverse() throws Exception {
+ prepareFolder("b");
MockEndpoint reverse = getMockEndpoint("mock:reverse");
reverse.expectedBodiesReceived("Hello Copenhagen", "Hello London", "Hello Paris");
@@ -55,9 +63,9 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(fileUrl + "&sortBy=file:name.ext").to("mock:result");
+ from(fileUrl + "a/?sortBy=file:name.ext").to("mock:result");
- from(fileUrl + "&sortBy=reverse:file:name.ext").to("mock:reverse");
+ from(fileUrl + "b/?sortBy=reverse:file:name.ext").to("mock:reverse");
}
};
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByIgnoreCaseExpressionTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByIgnoreCaseExpressionTest.java?rev=721837&r1=721836&r2=721837&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByIgnoreCaseExpressionTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByIgnoreCaseExpressionTest.java Sun Nov 30 08:03:05 2008
@@ -25,30 +25,43 @@
*/
public class FileSortByIgnoreCaseExpressionTest extends ContextTestSupport {
- private String fileUrl = "file://target/filesorter/?noop=true";
+ private String fileUrl = "file://target/filesorter/";
@Override
protected void setUp() throws Exception {
super.setUp();
deleteDirectory("target/filesorter");
+ }
- template.sendBodyAndHeader("file:target/filesorter/", "Hello Paris",
+ private void prepareFolder(String folder) {
+ template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Paris",
FileComponent.HEADER_FILE_NAME, "report-3.dat");
- template.sendBodyAndHeader("file:target/filesorter/", "Hello London",
+ template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello London",
FileComponent.HEADER_FILE_NAME, "REPORT-2.txt");
- template.sendBodyAndHeader("file:target/filesorter/", "Hello Copenhagen",
+ template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Copenhagen",
FileComponent.HEADER_FILE_NAME, "Report-1.xml");
}
public void testSortFiles() throws Exception {
+ prepareFolder("a");
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello London", "Hello Copenhagen", "Hello Paris");
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testSortFilesNoCase() throws Exception {
+ prepareFolder("b");
MockEndpoint nocase = getMockEndpoint("mock:nocase");
nocase.expectedBodiesReceived("Hello Copenhagen", "Hello London", "Hello Paris");
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testSortFilesNoCaseReverse() throws Exception {
+ prepareFolder("c");
MockEndpoint nocasereverse = getMockEndpoint("mock:nocasereverse");
nocasereverse.expectedBodiesReceived("Hello Paris", "Hello London", "Hello Copenhagen");
@@ -58,11 +71,11 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(fileUrl + "&sortBy=file:name").to("mock:result");
+ from(fileUrl + "a/?sortBy=file:name").to("mock:result");
- from(fileUrl + "&sortBy=ignoreCase:file:name").to("mock:nocase");
+ from(fileUrl + "b/?sortBy=ignoreCase:file:name").to("mock:nocase");
- from(fileUrl + "&sortBy=reverse:ignoreCase:file:name").to("mock:nocasereverse");
+ from(fileUrl + "c/?sortBy=reverse:ignoreCase:file:name").to("mock:nocasereverse");
}
};
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByNestedExpressionTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByNestedExpressionTest.java?rev=721837&r1=721836&r2=721837&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByNestedExpressionTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByNestedExpressionTest.java Sun Nov 30 08:03:05 2008
@@ -25,30 +25,38 @@
*/
public class FileSortByNestedExpressionTest extends ContextTestSupport {
- private String fileUrl = "file://target/filesorter/?noop=true";
+ private String fileUrl = "file://target/filesorter/";
@Override
protected void setUp() throws Exception {
super.setUp();
deleteDirectory("target/filesorter");
+ }
- template.sendBodyAndHeader("file:target/filesorter/", "Hello Paris",
+ private void prepareFolder(String folder) {
+ template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Paris",
FileComponent.HEADER_FILE_NAME, "paris.txt");
- template.sendBodyAndHeader("file:target/filesorter/", "Hello London",
+ template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello London",
FileComponent.HEADER_FILE_NAME, "london.txt");
- template.sendBodyAndHeader("file:target/filesorter/", "Hello Copenhagen",
+ template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Copenhagen",
FileComponent.HEADER_FILE_NAME, "copenhagen.xml");
- template.sendBodyAndHeader("file:target/filesorter/", "Hello Dublin",
+ template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Dublin",
FileComponent.HEADER_FILE_NAME, "dublin.txt");
}
public void testSortNestedFiles() throws Exception {
+ prepareFolder("a");
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello Dublin", "Hello London", "Hello Paris", "Hello Copenhagen");
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testSortNestedFilesReverse() throws Exception {
+ prepareFolder("b");
MockEndpoint reverse = getMockEndpoint("mock:reverse");
reverse.expectedBodiesReceived("Hello Paris", "Hello London", "Hello Dublin", "Hello Copenhagen");
@@ -58,9 +66,9 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(fileUrl + "&sortBy=file:name.ext;file:name").to("mock:result");
+ from(fileUrl + "a/?sortBy=file:name.ext;file:name").to("mock:result");
- from(fileUrl + "&sortBy=file:name.ext;reverse:file:name").to("mock:reverse");
+ from(fileUrl + "b/?sortBy=file:name.ext;reverse:file:name").to("mock:reverse");
}
};
}