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 790d7cca89e72ff65c517a94f78ecef33cb6490e
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sun Dec 17 18:15:38 2017 +0100
CAMEL-1202: use the old default of not block for direct in these tests as
they rely on that.
---
.../routepolicy/quartz/CronScheduledRoutePolicyTest.java | 12 ++++++++++--
.../routepolicy/quartz/MultiplePoliciesOnRouteTest.java | 4 +++-
.../quartz/SimpleScheduledCombinedRoutePolicyTest.java | 4 +++-
.../quartz/SimpleScheduledRoutePolicyTest.java | 15 +++++++++++----
.../org/apache/camel/routepolicy/quartz/CronPolicies.xml | 4 ++++
.../apache/camel/routepolicy/quartz/SimplePolicies.xml | 8 ++++++--
6 files changed, 37 insertions(+), 10 deletions(-)
diff --git
a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java
index 7f76119..f1f1229 100644
---
a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java
@@ -22,6 +22,7 @@ import org.apache.camel.Consumer;
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.quartz.QuartzComponent;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -45,6 +46,7 @@ public class CronScheduledRoutePolicyTest extends
CamelTestSupport {
success1.expectedMessageCount(1);
success2.expectedMessageCount(1);
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
@@ -79,6 +81,7 @@ public class CronScheduledRoutePolicyTest extends
CamelTestSupport {
@Test
public void testScheduledStopRoutePolicyWithTwoRoutes() throws Exception {
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -110,7 +113,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("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
@@ -137,6 +141,7 @@ public class CronScheduledRoutePolicyTest extends
CamelTestSupport {
@Test
public void testScheduledStopRoutePolicy() throws Exception {
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -161,6 +166,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("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -186,6 +192,7 @@ public class CronScheduledRoutePolicyTest extends
CamelTestSupport {
@Test
public void testScheduledSuspendRoutePolicy() throws Exception {
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -213,7 +220,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("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
diff --git
a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java
index f1a21e8..42e3a80 100644
---
a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.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.quartz.QuartzComponent;
import org.apache.camel.impl.JndiRegistry;
@@ -68,7 +69,8 @@ public class MultiplePoliciesOnRouteTest extends
CamelTestSupport {
public void testMultiplePoliciesOnRoute() throws Exception {
MockEndpoint success = context.getEndpoint("mock:success",
MockEndpoint.class);
success.expectedMinimumMessageCount(size - 10);
-
+
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
diff --git
a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java
index c369eea..62d905d 100644
---
a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/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.quartz.QuartzComponent;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -39,7 +40,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("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
diff --git
a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java
index e87d04f..cfd3e28 100644
---
a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/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.quartz.QuartzComponent;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -45,7 +46,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("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -74,6 +76,7 @@ public class SimpleScheduledRoutePolicyTest extends
CamelTestSupport {
@Test
public void testScheduledStopRoutePolicy() throws Exception {
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -107,6 +110,7 @@ public class SimpleScheduledRoutePolicyTest extends
CamelTestSupport {
@Test
public void testScheduledSuspendRoutePolicy() throws Exception {
+ context.getComponent("direct", DirectComponent.class).setBlock(false);
context.getComponent("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -140,7 +144,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("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -177,7 +182,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("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -217,7 +223,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("quartz",
QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
diff --git
a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/CronPolicies.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/CronPolicies.xml
index d93d3b0..edc91aa 100644
---
a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/CronPolicies.xml
+++
b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/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-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SimplePolicies.xml
b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SimplePolicies.xml
index dfbde4a..0a19340 100644
---
a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SimplePolicies.xml
+++
b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SimplePolicies.xml
@@ -52,8 +52,12 @@
<property name="routeResumeDate" ref="now"/>
<property name="routeResumeRepeatCount" value="1"/>
<property name="routeResumeRepeatInterval" value="3000"/>
- </bean>
-
+ </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>.
