Repository: camel Updated Branches: refs/heads/master 0fb523a9b -> 46b3eb44b
CAMEL-11446: Use awaitility for testing where we otherwise use thred sleep which can be speeded up. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8ec45503 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8ec45503 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8ec45503 Branch: refs/heads/master Commit: 8ec455033fe8d83fa7364ca9e38df81601420098 Parents: 0fb523a Author: Claus Ibsen <[email protected]> Authored: Sat Jul 15 16:18:12 2017 +0200 Committer: Claus Ibsen <[email protected]> Committed: Sat Jul 15 16:18:12 2017 +0200 ---------------------------------------------------------------------- .../management/ManagedRouteRemoveTest.java | 2 +- .../ManagedRouteShutdownAndStartTest.java | 7 +++-- .../ManagedRouteSuspendAndResumeTest.java | 6 ++--- .../management/ManagedSuspendedServiceTest.java | 27 +++++++++++--------- 4 files changed, 22 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8ec45503/camel-core/src/test/java/org/apache/camel/management/ManagedRouteRemoveTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteRemoveTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteRemoveTest.java index 9587592..0394cbe 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteRemoveTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteRemoveTest.java @@ -86,7 +86,7 @@ public class ManagedRouteRemoveTest extends ManagementTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("file://target/managed").to("mock:result"); + from("file://target/managed?initialDelay=0&delay=10").to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/8ec45503/camel-core/src/test/java/org/apache/camel/management/ManagedRouteShutdownAndStartTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteShutdownAndStartTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteShutdownAndStartTest.java index 8ccd314..262c974 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteShutdownAndStartTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteShutdownAndStartTest.java @@ -64,14 +64,13 @@ public class ManagedRouteShutdownAndStartTest extends ManagementTestSupport { mock.reset(); mock.expectedBodiesReceived("Bye World"); - // wait 3 seconds while route is stopped to verify that file was not consumed - mock.setResultWaitTime(3000); + // wait a bit while route is stopped to verify that file was not consumed + mock.setResultWaitTime(250); template.sendBodyAndHeader("file://target/managed", "Bye World", Exchange.FILE_NAME, "bye.txt"); // route is stopped so we do not get the file mock.assertIsNotSatisfied(); - } static ObjectName getRouteObjectName(MBeanServer mbeanServer) throws Exception { @@ -86,7 +85,7 @@ public class ManagedRouteShutdownAndStartTest extends ManagementTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("file://target/managed").to("mock:result"); + from("file://target/managed?initialDelay=0&delay=10").to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/8ec45503/camel-core/src/test/java/org/apache/camel/management/ManagedRouteSuspendAndResumeTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteSuspendAndResumeTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteSuspendAndResumeTest.java index d6d673c..0c4fce5 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteSuspendAndResumeTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteSuspendAndResumeTest.java @@ -65,8 +65,8 @@ public class ManagedRouteSuspendAndResumeTest extends ManagementTestSupport { mock.reset(); mock.expectedBodiesReceived("Bye World"); - // wait 3 seconds while route is stopped to verify that file was not consumed - mock.setResultWaitTime(3000); + // wait a little bit while route is stopped to verify that file was not consumed + mock.setResultWaitTime(250); template.sendBodyAndHeader("file://target/managed", "Bye World", Exchange.FILE_NAME, "bye.txt"); @@ -104,7 +104,7 @@ public class ManagedRouteSuspendAndResumeTest extends ManagementTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("file://target/managed").routeId("foo").to("mock:result"); + from("file://target/managed?initialDelay=0&delay=10").routeId("foo").to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/8ec45503/camel-core/src/test/java/org/apache/camel/management/ManagedSuspendedServiceTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedSuspendedServiceTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedSuspendedServiceTest.java index 974dc9f..21f41da 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedSuspendedServiceTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedSuspendedServiceTest.java @@ -18,6 +18,7 @@ package org.apache.camel.management; import java.io.File; import java.util.Set; +import java.util.concurrent.TimeUnit; import javax.management.MBeanServer; import javax.management.ObjectName; @@ -27,6 +28,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.RoutePolicySupport; +import static org.awaitility.Awaitility.await; + /** * @version */ @@ -66,11 +69,11 @@ public class ManagedSuspendedServiceTest extends ManagementTestSupport { assertMockEndpointsSatisfied(); - Thread.sleep(1000); - - // now its suspended by the policy - suspended = (Boolean) mbeanServer.getAttribute(on, "Suspended"); - assertEquals(true, suspended.booleanValue()); + await().atMost(2, TimeUnit.SECONDS).untilAsserted(() -> { + // now its suspended by the policy + Boolean bool = (Boolean) mbeanServer.getAttribute(on, "Suspended"); + assertEquals(true, bool.booleanValue()); + }); // the route is suspended by the policy so we should only receive one String[] files = new File("target/suspended/").list(); @@ -89,12 +92,12 @@ public class ManagedSuspendedServiceTest extends ManagementTestSupport { suspended = (Boolean) mbeanServer.getAttribute(on, "Suspended"); assertEquals(false, suspended.booleanValue()); - Thread.sleep(500); - - // and the file is now deleted - files = new File("target/suspended/").list(); - assertNotNull(files); - assertEquals("The file should exists", 0, files.length); + await().atMost(2, TimeUnit.SECONDS).untilAsserted(() -> { + // and the file is now deleted + String[] names = new File("target/suspended/").list(); + assertNotNull(names); + assertEquals("The file should exists", 0, names.length); + }); } @Override @@ -104,7 +107,7 @@ public class ManagedSuspendedServiceTest extends ManagementTestSupport { public void configure() throws Exception { MyPolicy myPolicy = new MyPolicy(); - from("file://target/suspended?maxMessagesPerPoll=1&delete=true") + from("file://target/suspended?initialDelay=0&delay=10&maxMessagesPerPoll=1&delete=true") .routePolicy(myPolicy).id("myRoute") .to("mock:result"); }
