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 2017/07/09 10:46:06 UTC
camel git commit: CAMEL-11446: Use awaitility in camel-core for
testing where we otherwise use thread sleep which can be speeded up.
Repository: camel
Updated Branches:
refs/heads/master 25cc73f26 -> d3a4d5965
CAMEL-11446: Use awaitility in camel-core for testing where we otherwise use thread sleep which can be speeded up.
slightly reduce code by using additional awaitility features
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d3a4d596
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d3a4d596
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d3a4d596
Branch: refs/heads/master
Commit: d3a4d59657a311773ad01b6a9b6dd0b0985553d8
Parents: 25cc73f
Author: Pascal Schumacher <pa...@gmx.net>
Authored: Sun Jul 9 12:33:49 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jul 9 12:46:00 2017 +0200
----------------------------------------------------------------------
.../component/file/NewFileConsumerTest.java | 4 +--
.../impl/CamelPostProcessorHelperTest.java | 8 ++----
.../camel/impl/DefaultConsumerTemplateTest.java | 28 ++++++--------------
.../impl/DurationRoutePolicyFactoryTest.java | 9 +++----
.../DurationRoutePolicyMaxMessagesTest.java | 9 +++----
.../impl/DurationRoutePolicyMaxSecondsTest.java | 10 +++----
.../JmxInstrumentationUsingDefaultsTest.java | 10 +++----
.../resequencer/ResequencerEngineTest.java | 2 +-
8 files changed, 24 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d3a4d596/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumerTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumerTest.java b/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumerTest.java
index 9d93cb9..0deacf8 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumerTest.java
@@ -47,9 +47,7 @@ public class NewFileConsumerTest extends ContextTestSupport {
assertMockEndpointsSatisfied();
oneExchangeDone.matchesMockWaitTime();
- await().atMost(1, TimeUnit.SECONDS).until(() -> myFile.isPost());
-
- assertTrue("Should have invoked postPollCheck", myFile.isPost());
+ await("postPollCheck invocation").atMost(1, TimeUnit.SECONDS).until(myFile::isPost);
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/d3a4d596/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperTest.java b/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperTest.java
index 0889f65..48d2353 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperTest.java
@@ -133,9 +133,7 @@ public class CamelPostProcessorHelperTest extends ContextTestSupport {
assertMockEndpointsSatisfied();
// give UoW a bit of time
- await().atMost(1, TimeUnit.SECONDS).until(() -> mySynchronization.isOnDone());
-
- assertTrue("Should have invoked onDone", mySynchronization.isOnDone());
+ await("onDone invokation").atMost(1, TimeUnit.SECONDS).until(mySynchronization::isOnDone);
}
public void testProduceSynchronization() throws Exception {
@@ -153,9 +151,7 @@ public class CamelPostProcessorHelperTest extends ContextTestSupport {
assertMockEndpointsSatisfied();
// give UoW a bit of time
- await().atMost(1, TimeUnit.SECONDS).until(() -> mySynchronization.isOnDone());
-
- assertTrue("Should have invoked onDone", mySynchronization.isOnDone());
+ await("onDone invocation").atMost(1, TimeUnit.SECONDS).until(mySynchronization::isOnDone);
}
public void testEndpointInjectProducerTemplate() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/d3a4d596/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java
index a277c12..8c3e545 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java
@@ -124,12 +124,9 @@ public class DefaultConsumerTemplateTest extends ContextTestSupport {
template.sendBody("seda:foo", "Hello");
- await().atMost(1, TimeUnit.SECONDS).until(() -> {
+ await().atMost(1, TimeUnit.SECONDS).untilAsserted(() -> {
Object foo = consumer.receiveBodyNoWait("seda:foo");
- if (foo != null) {
- assertEquals("Hello", foo);
- }
- return foo != null;
+ assertEquals("Hello", foo);
});
}
@@ -158,12 +155,9 @@ public class DefaultConsumerTemplateTest extends ContextTestSupport {
template.sendBody("seda:foo", "Hello");
- await().atMost(1, TimeUnit.SECONDS).until(() -> {
+ await().atMost(1, TimeUnit.SECONDS).untilAsserted(() -> {
String foo = consumer.receiveBodyNoWait("seda:foo", String.class);
- if (foo != null) {
- assertEquals("Hello", foo);
- }
- return foo != null;
+ assertEquals("Hello", foo);
});
}
@@ -261,12 +255,9 @@ public class DefaultConsumerTemplateTest extends ContextTestSupport {
template.sendBody("seda:foo", "Hello");
- await().atMost(1, TimeUnit.SECONDS).until(() -> {
+ await().atMost(1, TimeUnit.SECONDS).untilAsserted(() -> {
String foo = consumer.receiveBodyNoWait(endpoint, String.class);
- if (foo != null) {
- assertEquals("Hello", foo);
- }
- return foo != null;
+ assertEquals("Hello", foo);
});
}
@@ -279,12 +270,9 @@ public class DefaultConsumerTemplateTest extends ContextTestSupport {
template.sendBody("seda:foo", "Hello");
- await().atMost(1, TimeUnit.SECONDS).until(() -> {
+ await().atMost(1, TimeUnit.SECONDS).untilAsserted(() -> {
Object foo = consumer.receiveBodyNoWait(endpoint);
- if (foo != null) {
- assertEquals("Hello", foo);
- }
- return foo != null;
+ assertEquals("Hello", foo);
});
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d3a4d596/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyFactoryTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyFactoryTest.java b/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyFactoryTest.java
index 7a7649b..cc8070a 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyFactoryTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyFactoryTest.java
@@ -34,13 +34,10 @@ public class DurationRoutePolicyFactoryTest extends ContextTestSupport {
assertMockEndpointsSatisfied();
// need a little time to stop async
- await().atMost(5, TimeUnit.SECONDS).until(() -> {
- boolean started = context.getRouteStatus("foo").isStarted();
- boolean stopped = context.getRouteStatus("foo").isStopped();
- return !started && stopped;
+ await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
+ assertFalse(context.getRouteStatus("foo").isStarted());
+ assertTrue(context.getRouteStatus("foo").isStopped());
});
- assertFalse(context.getRouteStatus("foo").isStarted());
- assertTrue(context.getRouteStatus("foo").isStopped());
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/d3a4d596/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyMaxMessagesTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyMaxMessagesTest.java b/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyMaxMessagesTest.java
index 2c2408e..1e54e6f 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyMaxMessagesTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyMaxMessagesTest.java
@@ -34,13 +34,10 @@ public class DurationRoutePolicyMaxMessagesTest extends ContextTestSupport {
assertMockEndpointsSatisfied();
// need a little time to stop async
- await().atMost(5, TimeUnit.SECONDS).until(() -> {
- boolean started = context.getRouteStatus("foo").isStarted();
- boolean stopped = context.getRouteStatus("foo").isStopped();
- return !started && stopped;
+ await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
+ assertFalse(context.getRouteStatus("foo").isStarted());
+ assertTrue(context.getRouteStatus("foo").isStopped());
});
- assertFalse(context.getRouteStatus("foo").isStarted());
- assertTrue(context.getRouteStatus("foo").isStopped());
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/d3a4d596/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyMaxSecondsTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyMaxSecondsTest.java b/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyMaxSecondsTest.java
index 624feaa..2e2462b 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyMaxSecondsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyMaxSecondsTest.java
@@ -34,14 +34,10 @@ public class DurationRoutePolicyMaxSecondsTest extends ContextTestSupport {
assertMockEndpointsSatisfied();
// need a little time to stop async
- await().atMost(5, TimeUnit.SECONDS).until(() -> {
- boolean started = context.getRouteStatus("foo").isStarted();
- boolean stopped = context.getRouteStatus("foo").isStopped();
- return !started && stopped;
+ await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
+ assertFalse(context.getRouteStatus("foo").isStarted());
+ assertTrue(context.getRouteStatus("foo").isStopped());
});
-
- assertFalse(context.getRouteStatus("foo").isStarted());
- assertTrue(context.getRouteStatus("foo").isStopped());
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/d3a4d596/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java b/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
index a0340fa..9553ffa 100644
--- a/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
@@ -180,13 +180,9 @@ public class JmxInstrumentationUsingDefaultsTest extends ContextTestSupport {
releaseMBeanServers();
super.setUp();
- await().atMost(3, TimeUnit.SECONDS).until(() -> {
- try {
- mbsc = getMBeanConnection();
- return true;
- } catch (Throwable e) {
- return false;
- }
+ await().atMost(3, TimeUnit.SECONDS).ignoreExceptions().until(() -> {
+ mbsc = getMBeanConnection();
+ return true;
});
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d3a4d596/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerEngineTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerEngineTest.java b/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerEngineTest.java
index 6942ec7..621cc1a 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerEngineTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerEngineTest.java
@@ -153,7 +153,7 @@ public class ResequencerEngineTest extends TestSupport {
runner.start();
// wait for runner to run
- await().atMost(1, TimeUnit.SECONDS).until(() -> runner.isRunning());
+ await().atMost(1, TimeUnit.SECONDS).until(runner::isRunning);
}
}