Repository: camel Updated Branches: refs/heads/camel-2.16.x 7045bd7ca -> f467ebf20
Fixed tests Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f467ebf2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f467ebf2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f467ebf2 Branch: refs/heads/camel-2.16.x Commit: f467ebf20554cca4dd845f4eb30b2720580096e8 Parents: 7045bd7 Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Jan 9 10:58:40 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Jan 9 10:58:40 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/camel/component/quartz/BaseQuartzTest.java | 1 - .../camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java | 6 +++--- .../routepolicy/quartz/SimpleScheduledRoutePolicyTest.java | 2 +- .../routepolicy/quartz/SpringScheduledRoutePolicyTest.java | 2 +- .../QuartzComponentCamelContextSharedSchedulerTest.java | 3 --- .../routepolicy/quartz2/CronScheduledRoutePolicyTest.java | 6 +++--- .../routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java | 2 +- .../routepolicy/quartz2/SpringScheduledRoutePolicyTest.java | 2 +- 8 files changed, 10 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f467ebf2/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java ---------------------------------------------------------------------- diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java index 8508e15..849c583 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java @@ -17,7 +17,6 @@ package org.apache.camel.component.quartz; import org.apache.camel.CamelContext; -import org.apache.camel.management.JmxSystemPropertyKeys; import org.apache.camel.test.junit4.CamelTestSupport; public class BaseQuartzTest extends CamelTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/f467ebf2/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java ---------------------------------------------------------------------- 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 d34a9b2..7f76119 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 @@ -64,8 +64,8 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport { } }); context.start(); - context.stopRoute("test1", 0, TimeUnit.MILLISECONDS); - context.stopRoute("test2", 0, TimeUnit.MILLISECONDS); + context.stopRoute("test1", 1000, TimeUnit.MILLISECONDS); + context.stopRoute("test2", 1000, TimeUnit.MILLISECONDS); Thread.sleep(5000); assertTrue(context.getRouteStatus("test1") == ServiceStatus.Started); @@ -125,7 +125,7 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport { } }); context.start(); - context.stopRoute("test", 0, TimeUnit.MILLISECONDS); + context.stopRoute("test", 1000, TimeUnit.MILLISECONDS); Thread.sleep(5000); assertTrue(context.getRouteStatus("test") == ServiceStatus.Started); http://git-wip-us.apache.org/repos/asf/camel/blob/f467ebf2/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java ---------------------------------------------------------------------- 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 92199be..e87d04f 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 @@ -62,7 +62,7 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport { } }); context.start(); - context.stopRoute("test", 0, TimeUnit.MILLISECONDS); + context.stopRoute("test", 1000, TimeUnit.MILLISECONDS); Thread.sleep(5000); assertTrue(context.getRouteStatus("test") == ServiceStatus.Started); http://git-wip-us.apache.org/repos/asf/camel/blob/f467ebf2/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java index 2e87b90..39745ca 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java @@ -47,7 +47,7 @@ public abstract class SpringScheduledRoutePolicyTest extends TestSupport { MockEndpoint mock = context.getEndpoint("mock:success", MockEndpoint.class); mock.expectedMinimumMessageCount(1); - context.stopRoute("testRoute", 0, TimeUnit.MILLISECONDS); + context.stopRoute("testRoute", 1000, TimeUnit.MILLISECONDS); Thread.sleep(4000); assertTrue(context.getRouteStatus("testRoute") == ServiceStatus.Started); http://git-wip-us.apache.org/repos/asf/camel/blob/f467ebf2/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java index a4b0301..f6871a9 100644 --- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java +++ b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.quartz2; -import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; @@ -25,10 +24,8 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.quartz.CronTrigger; import org.quartz.JobDetail; import org.quartz.Scheduler; -import org.quartz.Trigger; public class QuartzComponentCamelContextSharedSchedulerTest { http://git-wip-us.apache.org/repos/asf/camel/blob/f467ebf2/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java ---------------------------------------------------------------------- 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 4fd6876..73ec425 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 @@ -66,8 +66,8 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport { } }); context.start(); - context.stopRoute("test1", 0, TimeUnit.MILLISECONDS); - context.stopRoute("test2", 0, TimeUnit.MILLISECONDS); + context.stopRoute("test1", 1000, TimeUnit.MILLISECONDS); + context.stopRoute("test2", 1000, TimeUnit.MILLISECONDS); Thread.sleep(5000); assertTrue(context.getRouteStatus("test1") == ServiceStatus.Started); @@ -127,7 +127,7 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport { } }); context.start(); - context.stopRoute("test", 0, TimeUnit.MILLISECONDS); + context.stopRoute("test", 1000, TimeUnit.MILLISECONDS); Thread.sleep(5000); assertTrue(context.getRouteStatus("test") == ServiceStatus.Started); http://git-wip-us.apache.org/repos/asf/camel/blob/f467ebf2/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java ---------------------------------------------------------------------- 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 b2b669e..c2dcbd6 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 @@ -59,7 +59,7 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport { } }); context.start(); - context.stopRoute("test", 0, TimeUnit.MILLISECONDS); + context.stopRoute("test", 1000, TimeUnit.MILLISECONDS); Thread.sleep(5000); assertTrue(context.getRouteStatus("test") == ServiceStatus.Started); http://git-wip-us.apache.org/repos/asf/camel/blob/f467ebf2/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java index 2926418..40666e8 100644 --- a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java +++ b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java @@ -45,7 +45,7 @@ public abstract class SpringScheduledRoutePolicyTest extends TestSupport { MockEndpoint mock = context.getEndpoint("mock:success", MockEndpoint.class); mock.expectedMinimumMessageCount(1); - context.stopRoute("testRoute", 0, TimeUnit.MILLISECONDS); + context.stopRoute("testRoute", 1000, TimeUnit.MILLISECONDS); Thread.sleep(4000); assertTrue(context.getRouteStatus("testRoute") == ServiceStatus.Started);
