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 2010/09/14 17:33:52 UTC
svn commit: r996952 - in /camel/trunk:
camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingUoWIssueTest.java
camel-core/src/test/java/org/apache/camel/processor/SplitterUoWIssueTest.java
parent/pom.xml
Author: davsclaus
Date: Tue Sep 14 15:33:52 2010
New Revision: 996952
URL: http://svn.apache.org/viewvc?rev=996952&view=rev
Log:
CAMEL-3121: More tests for splitter and UoW issue.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterUoWIssueTest.java
- copied, changed from r996907, camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingUoWIssueTest.java
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingUoWIssueTest.java
camel/trunk/parent/pom.xml
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingUoWIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingUoWIssueTest.java?rev=996952&r1=996951&r2=996952&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingUoWIssueTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingUoWIssueTest.java Tue Sep 14 15:33:52 2010
@@ -41,17 +41,27 @@ public class SplitterStreamingUoWIssueTe
assertMockEndpointsSatisfied();
}
+ public void testSplitterTwoFilesStreamingUoWIssue() throws Exception {
+ getMockEndpoint("mock:foo").expectedBodiesReceived("A", "B", "C", "D", "E", "F", "G", "H", "I");
+ getMockEndpoint("mock:result").expectedBodiesReceived("A,B,C,D,E", "F,G,H,I");
+
+ template.sendBodyAndHeader("file:target/splitter", "A,B,C,D,E", Exchange.FILE_NAME, "a.txt");
+ template.sendBodyAndHeader("file:target/splitter", "F,G,H,I", Exchange.FILE_NAME, "b.txt");
+
+ assertMockEndpointsSatisfied();
+ }
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file:target/splitter?delete=true")
- .split(body().tokenize(","))
+ from("file:target/splitter?delete=true&sortBy=file:name")
+ .split(body().tokenize(",")).streaming()
.to("seda:queue")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
- Thread.sleep(500);
+ Thread.sleep(200);
}
})
.end()
Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterUoWIssueTest.java (from r996907, camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingUoWIssueTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterUoWIssueTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterUoWIssueTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingUoWIssueTest.java&r1=996907&r2=996952&rev=996952&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingUoWIssueTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterUoWIssueTest.java Tue Sep 14 15:33:52 2010
@@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBui
/**
* @version $Revision$
*/
-public class SplitterStreamingUoWIssueTest extends ContextTestSupport {
+public class SplitterUoWIssueTest extends ContextTestSupport {
@Override
protected void setUp() throws Exception {
@@ -32,7 +32,7 @@ public class SplitterStreamingUoWIssueTe
super.setUp();
}
- public void testSplitterStreamingUoWIssue() throws Exception {
+ public void testSplitterUoWIssue() throws Exception {
getMockEndpoint("mock:foo").expectedBodiesReceived("A", "B", "C", "D", "E");
getMockEndpoint("mock:result").expectedBodiesReceived("A,B,C,D,E");
@@ -41,17 +41,27 @@ public class SplitterStreamingUoWIssueTe
assertMockEndpointsSatisfied();
}
+ public void testSplitterTwoFilesUoWIssue() throws Exception {
+ getMockEndpoint("mock:foo").expectedBodiesReceived("A", "B", "C", "D", "E", "F", "G", "H", "I");
+ getMockEndpoint("mock:result").expectedBodiesReceived("A,B,C,D,E", "F,G,H,I");
+
+ template.sendBodyAndHeader("file:target/splitter", "A,B,C,D,E", Exchange.FILE_NAME, "a.txt");
+ template.sendBodyAndHeader("file:target/splitter", "F,G,H,I", Exchange.FILE_NAME, "b.txt");
+
+ assertMockEndpointsSatisfied();
+ }
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file:target/splitter?delete=true")
+ from("file:target/splitter?delete=true&sortBy=file:name")
.split(body().tokenize(","))
.to("seda:queue")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
- Thread.sleep(500);
+ Thread.sleep(200);
}
})
.end()
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=996952&r1=996951&r2=996952&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Sep 14 15:33:52 2010
@@ -70,8 +70,8 @@
<groovy-version>1.7.4</groovy-version>
<guiceyfruit-version>2.0</guiceyfruit-version>
<hamcrest-version>1.2-dev1</hamcrest-version>
- <hawtbuf-version>1.1</hawtbuf-version>
- <hawtdb-version>1.3</hawtdb-version>
+ <hawtbuf-version>1.2</hawtbuf-version>
+ <hawtdb-version>1.4</hawtdb-version>
<hibernate-version>3.2.6.ga</hibernate-version>
<hibernate-entitymanager-version>3.2.1.ga</hibernate-entitymanager-version>
<hsqldb-version>1.8.0.7</hsqldb-version>