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/06/27 09:48:51 UTC
svn commit: r958344 - in /camel/trunk:
camel-core/src/test/java/org/apache/camel/processor/
camel-core/src/test/java/org/apache/camel/processor/aggregator/
components/camel-spring/src/test/resources/org/apache/camel/spring/processor/
Author: davsclaus
Date: Sun Jun 27 07:48:51 2010
New Revision: 958344
URL: http://svn.apache.org/viewvc?rev=958344&view=rev
Log:
Fixed test on other boxes.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MyAggregationStrategy.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorTest.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MyAggregationStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MyAggregationStrategy.java?rev=958344&r1=958343&r2=958344&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MyAggregationStrategy.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MyAggregationStrategy.java Sun Jun 27 07:48:51 2010
@@ -17,7 +17,6 @@
package org.apache.camel.processor;
import org.apache.camel.Exchange;
-import org.apache.camel.Header;
import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
/**
@@ -37,13 +36,4 @@ public class MyAggregationStrategy exten
return result;
}
- /**
- * An expression used to determine if the aggregation is complete
- */
- public boolean isCompleted(@Header("aggregated") Integer aggregated) {
- if (aggregated == null) {
- return false;
- }
- return aggregated == 5;
- }
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorTest.java?rev=958344&r1=958343&r2=958344&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorTest.java Sun Jun 27 07:48:51 2010
@@ -22,14 +22,13 @@ import java.util.Map;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.processor.MyAggregationStrategy;
import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
/**
* @version $Revision$
*/
public class AggregatorTest extends ContextTestSupport {
- protected int messageCount = 50;
+ protected int messageCount = 100;
public void testSendingLotsOfMessagesGetAggregatedToTheLatestMessage() throws Exception {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
@@ -54,29 +53,32 @@ public class AggregatorTest extends Cont
headers.put("bar", "viper bar");
template.sendBodyAndHeaders("direct:predicate", "test", headers);
+
resultEndpoint.assertIsSatisfied();
}
public void testBatchTimeoutExpiry() throws Exception {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(1);
+
template.sendBodyAndHeader("direct:start", "message:1", "cheese", 123);
+
resultEndpoint.assertIsSatisfied();
}
-
public void testAggregatorNotAtStart() throws Exception {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(1);
resultEndpoint.message(0).header("visited").isNotNull();
+
template.sendBodyAndHeader("seda:header", "message:1", "cheese", 123);
+
resultEndpoint.assertIsSatisfied();
}
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
-
// START SNIPPET: ex
// in this route we aggregate all from direct:state based on the header id cheese
from("direct:start")
@@ -87,11 +89,10 @@ public class AggregatorTest extends Cont
.aggregate(header("cheese"), new UseLatestAggregationStrategy()).completionTimeout(1000L)
.to("mock:result");
- // in this sample we aggregate using our own strategy with a completion predicate
+ // in this sample we aggregate with a completion predicate
from("direct:predicate")
- .aggregate(header("cheese"), new MyAggregationStrategy())
- .eagerCheckCompletion()
- .completionPredicate(header("bar").isEqualTo("viper bar"))
+ .aggregate(header("cheese"), new UseLatestAggregationStrategy()).completionTimeout(1000L)
+ .completionPredicate(header("cheese").isEqualTo(123))
.to("mock:result");
// END SNIPPET: ex
}
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml?rev=958344&r1=958343&r2=958344&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml Sun Jun 27 07:48:51 2010
@@ -29,7 +29,7 @@
<from uri="direct:start"/>
<aggregate strategyRef="latestAggregationStrategy" completionTimeout="1000">
<correlationExpression>
- <simple>header.cheese</simple>
+ <header>cheese</header>
</correlationExpression>
<to uri="mock:result"/>
</aggregate>
@@ -42,7 +42,7 @@
</setHeader>
<aggregate strategyRef="latestAggregationStrategy" completionTimeout="1000">
<correlationExpression>
- <simple>header.cheese</simple>
+ <header>cheese</header>
</correlationExpression>
<to uri="mock:result"/>
</aggregate>
@@ -50,12 +50,12 @@
<route>
<from uri="direct:predicate"/>
- <aggregate strategyRef="myAggregatorStrategy" eagerCheckCompletion="true" completionTimeout="1000">
+ <aggregate strategyRef="latestAggregationStrategy" completionTimeout="1000">
<correlationExpression>
- <simple>header.cheese</simple>
+ <header>cheese</header>
</correlationExpression>
<completionPredicate>
- <simple>${header.bar} == 'viper bar'</simple>
+ <header>cheese</header>
</completionPredicate>
<to uri="mock:result"/>
</aggregate>
@@ -67,6 +67,4 @@
<bean id="latestAggregationStrategy" class="org.apache.camel.processor.aggregate.UseLatestAggregationStrategy"/>
- <bean id="myAggregatorStrategy" class="org.apache.camel.processor.MyAggregationStrategy"/>
-
</beans>