This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6c770048826e688e0c0e6d5f6929778e6bdeee27
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sun Dec 17 16:50:45 2017 +0100
CAMEL-1202: use the old default of not block for direct in these tests as
they rely on that.
---
.../routepolicy/quartz2/CronScheduledRoutePolicyTest.java | 13 +++++++++++--
.../quartz2/SimpleScheduledCombinedRoutePolicyTest.java | 4 +++-
.../quartz2/SimpleScheduledRoutePolicyTest.java | 15 +++++++++++----
.../org/apache/camel/routepolicy/quartz2/CronPolicies.xml | 4 ++++
.../apache/camel/routepolicy/quartz2/SimplePolicies.xml | 4 ++++
5 files changed, 33 insertions(+), 7 deletions(-)
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
index 73ec425..e8b6b79 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
+++
b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
@@ -24,6 +24,7 @@ import org.apache.camel.Route;
import org.apache.camel.ServiceStatus;
import org.apache.camel.SuspendableService;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.direct.DirectComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.quartz2.QuartzComponent;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -47,6 +48,7 @@ public class CronScheduledRoutePolicyTest extends
CamelTestSupport {
success1.expectedMessageCount(1);
success2.expectedMessageCount(1);
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
@@ -81,6 +83,7 @@ public class CronScheduledRoutePolicyTest extends
CamelTestSupport {
@Test
public void testScheduledStopRoutePolicyWithTwoRoutes() throws Exception {
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -112,7 +115,8 @@ public class CronScheduledRoutePolicyTest extends
CamelTestSupport {
public void testScheduledStartRoutePolicy() throws Exception {
MockEndpoint success = context.getEndpoint("mock:success",
MockEndpoint.class);
success.expectedMessageCount(1);
-
+
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
@@ -139,6 +143,7 @@ public class CronScheduledRoutePolicyTest extends
CamelTestSupport {
@Test
public void testScheduledStopRoutePolicy() throws Exception {
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -167,6 +172,7 @@ public class CronScheduledRoutePolicyTest extends
CamelTestSupport {
final CountDownLatch startedLatch = new CountDownLatch(1);
final CountDownLatch stoppedLatch = new CountDownLatch(1);
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -217,6 +223,7 @@ public class CronScheduledRoutePolicyTest extends
CamelTestSupport {
public void testScheduledStopRoutePolicyWithExtraPolicy() throws Exception
{
final MyRoutePolicy myPolicy = new MyRoutePolicy();
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -242,6 +249,7 @@ public class CronScheduledRoutePolicyTest extends
CamelTestSupport {
@Test
public void testScheduledSuspendRoutePolicy() throws Exception {
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -269,7 +277,8 @@ public class CronScheduledRoutePolicyTest extends
CamelTestSupport {
public void testScheduledResumeRoutePolicy() throws Exception {
MockEndpoint success = context.getEndpoint("mock:success",
MockEndpoint.class);
success.expectedMessageCount(1);
-
+
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledCombinedRoutePolicyTest.java
b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledCombinedRoutePolicyTest.java
index e839274..5b3f623 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledCombinedRoutePolicyTest.java
+++
b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledCombinedRoutePolicyTest.java
@@ -20,6 +20,7 @@ import java.util.Date;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.direct.DirectComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.quartz2.QuartzComponent;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -36,7 +37,8 @@ public class SimpleScheduledCombinedRoutePolicyTest extends
CamelTestSupport {
public void testScheduledStartAndStopRoutePolicy() throws Exception {
MockEndpoint success = context.getEndpoint("mock:success",
MockEndpoint.class);
success.expectedMessageCount(1);
-
+
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
diff --git
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
index c2dcbd6..0527b93 100644
---
a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
+++
b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
@@ -22,6 +22,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.direct.DirectComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.quartz2.QuartzComponent;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -42,7 +43,8 @@ public class SimpleScheduledRoutePolicyTest extends
CamelTestSupport {
public void testScheduledStartRoutePolicy() throws Exception {
MockEndpoint success = context.getEndpoint("mock:success",
MockEndpoint.class);
success.expectedMessageCount(1);
-
+
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -71,6 +73,7 @@ public class SimpleScheduledRoutePolicyTest extends
CamelTestSupport {
@Test
public void testScheduledStopRoutePolicy() throws Exception {
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -104,6 +107,7 @@ public class SimpleScheduledRoutePolicyTest extends
CamelTestSupport {
@Test
public void testScheduledSuspendRoutePolicy() throws Exception {
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -137,7 +141,8 @@ public class SimpleScheduledRoutePolicyTest extends
CamelTestSupport {
public void testScheduledResumeRoutePolicy() throws Exception {
MockEndpoint success = context.getEndpoint("mock:success",
MockEndpoint.class);
success.expectedMessageCount(1);
-
+
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -174,7 +179,8 @@ public class SimpleScheduledRoutePolicyTest extends
CamelTestSupport {
public void testScheduledSuspendAndResumeRoutePolicy() throws Exception {
MockEndpoint success = context.getEndpoint("mock:success",
MockEndpoint.class);
success.expectedMessageCount(1);
-
+
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -215,7 +221,8 @@ public class SimpleScheduledRoutePolicyTest extends
CamelTestSupport {
public void testScheduledSuspendAndRestartPolicy() throws Exception {
MockEndpoint success = context.getEndpoint("mock:success",
MockEndpoint.class);
success.expectedMessageCount(1);
-
+
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz2",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/CronPolicies.xml
b/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/CronPolicies.xml
index 8a69711..23bc973 100644
---
a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/CronPolicies.xml
+++
b/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/CronPolicies.xml
@@ -42,6 +42,10 @@
<property name="routeResumeTime" value="*/3 * * * * ?"/>
</bean>
+ <bean id="direct" class="org.apache.camel.component.direct.DirectComponent">
+ <property name="block" value="false"/>
+ </bean>
+
<routeContext id="testRouteContext"
xmlns="http://camel.apache.org/schema/spring";>
<route id="testRoute">
<from uri="direct:start"/>
diff --git
a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SimplePolicies.xml
b/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SimplePolicies.xml
index 5c716b7..7dc3d8a 100644
---
a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SimplePolicies.xml
+++
b/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SimplePolicies.xml
@@ -54,6 +54,10 @@
<property name="routeResumeRepeatInterval" value="3000"/>
</bean>
+ <bean id="direct" class="org.apache.camel.component.direct.DirectComponent">
+ <property name="block" value="false"/>
+ </bean>
+
<routeContext id="testRouteContext"
xmlns="http://camel.apache.org/schema/spring";>
<route id="testRoute">
<from uri="direct:start"/>
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <commits@camel.apache.org>.
