Author: davsclaus
Date: Fri Jun 5 06:42:31 2009
New Revision: 781923
URL: http://svn.apache.org/viewvc?rev=781923&view=rev
Log:
Added unit test based on user forum trouble with splitter.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitWithCustomAggregationStrategyTest.java
(with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java?rev=781923&r1=781922&r2=781923&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java
Fri Jun 5 06:42:31 2009
@@ -74,5 +74,4 @@
return currentSystemTime();
}
-
}
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitWithCustomAggregationStrategyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitWithCustomAggregationStrategyTest.java?rev=781923&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitWithCustomAggregationStrategyTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitWithCustomAggregationStrategyTest.java
Fri Jun 5 06:42:31 2009
@@ -0,0 +1,83 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.issues;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.processor.aggregate.AggregationStrategy;
+import static org.apache.camel.builder.xml.XPathBuilder.xpath;
+
+/**
+ * @version $Revision$
+ */
+public class SplitWithCustomAggregationStrategyTest extends ContextTestSupport
{
+
+ public void testSplitWithCustomAggregatorStrategy() throws Exception {
+ int files = 10;
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(files);
+ // no duplicates should be received
+ mock.expectsNoDuplicates(body());
+
+ for (int i = 0; i < files; i++) {
+ template.sendBody("direct:start", "");
+ }
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").
+
setBody().simple("<search><key>foo-${id}</key><key>bar-${id}</key><key>baz-${id}</key></search>").
+ to("direct:splitInOut").
+ to("mock:result");
+
+ //
+ // Need an inOut splitter that aggregates all results together.
+ //
+ from("direct:splitInOut").
+ setHeader("com.example.id").simple("${id}").
+ split(xpath("/search/key"), new AggregationStrategy() {
+ public Exchange aggregate(Exchange oldExchange,
Exchange newExchange) {
+ if (oldExchange == null) {
+ return newExchange;
+ }
+
+ String oldBody =
oldExchange.getOut().getBody(String.class);
+ String newBody =
newExchange.getOut().getBody(String.class);
+ oldExchange.getOut().setBody(oldBody +
newBody);
+
+ return oldExchange;
+ }
+ }).parallelProcessing().streaming().
+ to("direct:processLine").
+ end().
+ transform().simple("<results>${in.body}</results>");
+
+ from("direct:processLine").
+ to("log:line").
+
transform().simple("<index>${in.header.CamelSplitIndex}</index>${in.body}");
+ }
+ };
+ }
+}
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitWithCustomAggregationStrategyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitWithCustomAggregationStrategyTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
