Author: bvahdat
Date: Sun Dec 23 08:57:41 2012
New Revision: 1425446
URL: http://svn.apache.org/viewvc?rev=1425446&view=rev
Log:
Merged revisions 1425445 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1425445 | bvahdat | 2012-12-23 09:55:59 +0100 (So, 23 Dez 2012) | 1 line
CAMEL-5900: Clean-up the test being mentioned by the user.
........
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1425445
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java?rev=1425446&r1=1425445&r2=1425446&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
Sun Dec 23 08:57:41 2012
@@ -71,7 +71,7 @@ public class StreamResequencerTest exten
bodies[i] = "msg" + i;
}
-
getMockEndpoint("mock:result").expectedBodiesReceivedInAnyOrder(bodies);
+ getMockEndpoint("mock:result").expectedBodiesReceived(bodies);
getMockEndpoint("mock:result").setResultWaitTime(20000);
assertMockEndpointsSatisfied();