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 2015/05/10 12:49:40 UTC

[2/7] camel git commit: Polished test

Polished test


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f8871a23
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f8871a23
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f8871a23

Branch: refs/heads/master
Commit: f8871a2389104cb71280f18b144f367c7dc78058
Parents: 5af0fe4
Author: Claus Ibsen <da...@apache.org>
Authored: Sun May 10 10:22:13 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun May 10 10:22:13 2015 +0200

----------------------------------------------------------------------
 .../camel/processor/aggregator/AggregateTimeoutTest.java       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/f8871a23/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutTest.java
index 27ad9ec..f07003c 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutTest.java
@@ -42,10 +42,8 @@ public class AggregateTimeoutTest extends ContextTestSupport {
         template.sendBodyAndHeader("direct:start", "A", "id", 123);
         template.sendBodyAndHeader("direct:start", "B", "id", 123);
 
-        // wait 3 seconds so that the timeout kicks in
-        Thread.sleep(3000);
-
-        mock.assertIsSatisfied();
+        // wait about 4 seconds so that the timeout kicks in but it was discarded
+        mock.assertIsSatisfied(4000);
 
         // should invoke the timeout method
         assertEquals(1, invoked.get());