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 2009/01/06 09:04:46 UTC
svn commit: r731868 - in /activemq/camel/branches/camel-1.x: ./
camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorBatchOptionsTest.java
Author: davsclaus
Date: Tue Jan 6 00:04:46 2009
New Revision: 731868
URL: http://svn.apache.org/viewvc?rev=731868&view=rev
Log:
Merged revisions 731860 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r731860 | davsclaus | 2009-01-06 08:56:42 +0100 (ti, 06 jan 2009) | 1 line
Fixed a unit test failing on other boxes than XP
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorBatchOptionsTest.java
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 6 00:04:46 2009
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264,723314,723325-723327,723409,723835,723966,724122,724619,724681,725040,725309-725320,725340,725351,725569-725572,725612,725652-725660,725715,725883,726339,726640-726645,726932,727113,727375,727377,727624,727713,727946,729401,729892,730069,730132,730154,730157,730275,730299,730504-730505,730508,730571,730599,730759,730903,730916,730923,730936,730992,731126,731168-731169,731488,731492,731799,731824,731836
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264,723314,723325-723327,723409,723835,723966,724122,724619,724681,725040,725309-725320,725340,725351,725569-725572,725612,725652-725660,725715,725883,726339,726640-726645,726932,727113,727375,727377,727624,727713,727946,729401,729892,730069,730132,730154,730157,730275,730299,730504-730505,730508,730571,730599,730759,730903,730916,730923,730936,730992,731126,731168-731169,731488,731492,731799,731824,731836,731860
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorBatchOptionsTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorBatchOptionsTest.java?rev=731868&r1=731867&r2=731868&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorBatchOptionsTest.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorBatchOptionsTest.java Tue Jan 6 00:04:46 2009
@@ -16,8 +16,6 @@
*/
package org.apache.camel.processor.aggregator;
-import java.util.concurrent.TimeUnit;
-
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -57,7 +55,7 @@
// START SNIPPET: e2
MockEndpoint result = getMockEndpoint("mock:result");
- result.expectedMessageCount(4);
+ result.expectedMinimumMessageCount(4);
// then we sent all the message at once
template.sendBodyAndHeader("direct:start", "Message 1a", "id", "1");
@@ -105,7 +103,7 @@
// START SNIPPET: e4
MockEndpoint result = getMockEndpoint("mock:result");
- result.expectedMessageCount(5);
+ result.expectedMinimumMessageCount(5);
// then we sent all the message at once
template.sendBodyAndHeader("direct:start", "Message 1a", "id", "1");
@@ -114,11 +112,8 @@
template.sendBodyAndHeader("direct:start", "Message 2b", "id", "2");
template.sendBodyAndHeader("direct:start", "Message 1c", "id", "1");
- result.await(500L, TimeUnit.MILLISECONDS);
-
// when we sent the next message we have reached the in batch size limit and the current
// aggregated exchanges will be sent
- // wait a while for aggregating in a slower box
template.sendBodyAndHeader("direct:start", "Message 3a", "id", "3");
template.sendBodyAndHeader("direct:start", "Message 4", "id", "4");
template.sendBodyAndHeader("direct:start", "Message 3b", "id", "3");
@@ -158,7 +153,7 @@
// START SNIPPET: e6
MockEndpoint result = getMockEndpoint("mock:result");
- result.expectedMessageCount(6);
+ result.expectedMinimumMessageCount(6);
// then we sent all the message at once
template.sendBodyAndHeader("direct:start", "Message 1a", "id", "1");